Skip to content

Commit

Permalink
mp
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Dec 10, 2019
1 parent 5c5f564 commit 39a2333
Show file tree
Hide file tree
Showing 39 changed files with 1,637 additions and 1,008 deletions.
169 changes: 143 additions & 26 deletions modular-psu-firmware.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2653,16 +2653,16 @@
"image": "images\\bb3_front_panel.png",
"extensionName": "eez_bb3",
"idn": "Envox,EEZ BB3 (STM32)",
"idfName": "EEZ BB3 R6B1",
"idfShortName": "BB3-R6B1",
"idfName": "EEZ BB3 R1B6",
"idfShortName": "BB3-R1B6",
"idfFirmwareVersion": "1.0",
"idfGuid": "687b6dee-2093-4c36-afb7-cfc7ea2bf262",
"idfRevisionNumber": "1.0.2",
"idfRevisionNumber": "1.0.3",
"idfDescription": "EEZ Bench box 3-module T&M chassis",
"idfSupportedModels": "BB3 R6B1",
"idfSupportedModels": "BB3 R1B6",
"idfRevisionComments": "Initial version",
"idfAuthor": "Envox",
"sdlFriendlyName": "EEZ BB3 R6B1"
"sdlFriendlyName": "EEZ BB3 R1B6"
},
{
"name": "EEZ Bench Box 3 Simulator",
Expand All @@ -2677,9 +2677,9 @@
"idfShortName": "BB3-simulator",
"idfFirmwareVersion": "1.0",
"idfGuid": "7cab6860-e593-4ba2-ee68-57fe84460fa4",
"idfRevisionNumber": "1.0.2",
"idfRevisionNumber": "1.0.3",
"idfDescription": "EEZ Bench box 3-module T&M chassis firmware simulator",
"idfSupportedModels": "BB3 R6B1",
"idfSupportedModels": "BB3 R1B6",
"idfRevisionComments": "Initial version",
"idfAuthor": "Envox",
"sdlFriendlyName": "EEZ BB3 Simulator"
Expand Down Expand Up @@ -11699,9 +11699,9 @@
},
"left": 0,
"top": 0,
"width": 150,
"width": 120,
"height": 32,
"text": "Output voltage:",
"text": "Output:",
"focusStyle": {}
},
{
Expand All @@ -11710,9 +11710,9 @@
"inheritFrom": "default"
},
"data": "channel_output_state",
"left": 150,
"left": 120,
"top": 0,
"width": 78,
"width": 108,
"height": 32,
"widgets": [
{
Expand All @@ -11722,7 +11722,7 @@
},
"left": 0,
"top": 0,
"width": 78,
"width": 108,
"height": 32,
"text": "OFF",
"focusStyle": {}
Expand All @@ -11735,7 +11735,7 @@
"data": "channel_u_mon",
"left": 0,
"top": 0,
"width": 78,
"width": 108,
"height": 32,
"focusStyle": {
"inheritFrom": "default",
Expand Down Expand Up @@ -12771,9 +12771,9 @@
},
"left": 0,
"top": 0,
"width": 150,
"width": 119,
"height": 32,
"text": "Output current:",
"text": "Output:",
"focusStyle": {}
},
{
Expand All @@ -12782,9 +12782,9 @@
"inheritFrom": "default"
},
"data": "channel_output_state",
"left": 150,
"left": 119,
"top": 0,
"width": 78,
"width": 106,
"height": 32,
"widgets": [
{
Expand All @@ -12794,7 +12794,7 @@
},
"left": 0,
"top": 0,
"width": 78,
"width": 106,
"height": 32,
"text": "OFF",
"focusStyle": {}
Expand All @@ -12807,7 +12807,7 @@
"data": "channel_i_mon",
"left": 0,
"top": 0,
"width": 78,
"width": 106,
"height": 32,
"focusStyle": {
"inheritFrom": "default",
Expand Down Expand Up @@ -13440,9 +13440,9 @@
},
"left": 0,
"top": 0,
"width": 140,
"width": 119,
"height": 32,
"text": "Output power:",
"text": "Output:",
"focusStyle": {}
},
{
Expand All @@ -13451,9 +13451,9 @@
"inheritFrom": "default"
},
"data": "channel_output_state",
"left": 140,
"left": 119,
"top": 0,
"width": 100,
"width": 111,
"height": 32,
"widgets": [
{
Expand All @@ -13463,7 +13463,7 @@
},
"left": 0,
"top": 0,
"width": 100,
"width": 111,
"height": 32,
"text": "OFF",
"focusStyle": {}
Expand All @@ -13476,7 +13476,7 @@
"data": "channel_p_mon",
"left": 0,
"top": 0,
"width": 100,
"width": 111,
"height": 32,
"focusStyle": {
"inheritFrom": "default",
Expand Down Expand Up @@ -48182,6 +48182,44 @@
"margin": "20",
"alwaysBuild": true
},
{
"name": "menu_with_buttons_message",
"inheritFrom": "default_S",
"font": "Oswald17",
"alignVertical": "top",
"color": "text_regular",
"backgroundColor": "popup_background_info",
"activeColor": "popup_background_info",
"activeBackgroundColor": "text_regular",
"padding": "0 0 10 0",
"margin": "0",
"alwaysBuild": true
},
{
"name": "menu_with_buttons_container",
"inheritFrom": "default_S",
"font": "Oswald17",
"color": "text_regular",
"backgroundColor": "popup_background_info",
"activeColor": "popup_background_info",
"activeBackgroundColor": "text_regular",
"padding": "20",
"margin": "20",
"alwaysBuild": true
},
{
"name": "menu_with_buttons_button",
"inheritFrom": "default_S",
"font": "Oswald17",
"alignVertical": "bottom",
"color": "text_enabled",
"backgroundColor": "popup_background_info",
"activeColor": "popup_background_info",
"activeBackgroundColor": "text_enabled",
"padding": "0 4",
"margin": "0",
"alwaysBuild": true
},
{
"name": "ch_prot_on",
"inheritFrom": "default",
Expand Down Expand Up @@ -441471,6 +441509,68 @@
"name": "DISPlay[:WINdow]:DLOG",
"parameters": [],
"response": {}
},
{
"name": "DISPlay[:WINdow]:INPUt?",
"helpLink": "EEZ BB3 SCPI reference 5.4 - DISPlay.html#disp_text",
"parameters": [
{
"name": "label",
"type": [
{
"type": "quoted-string"
}
],
"isOptional": false
},
{
"name": "type",
"type": [
{
"type": "discrete",
"enumeration": "InputDataType"
}
]
},
{
"name": "unit",
"type": [
{
"type": "discrete",
"enumeration": "Unit"
}
],
"isOptional": false
},
{
"name": "min",
"type": [
{
"type": "nr2"
}
],
"isOptional": false
},
{
"name": "max",
"type": [
{
"type": "nr2"
}
]
},
{
"name": "value",
"type": [
{
"type": "nr2"
}
]
}
],
"response": {
"type": "any"
}
}
]
},
Expand Down Expand Up @@ -446782,14 +446882,31 @@
"value": "3"
},
{
"name": "JOUL",
"name": "JOULe",
"value": "4"
},
{
"name": "SECOnd",
"value": "5"
}
]
},
{
"name": "InputDataType",
"members": [
{
"name": "TEXT",
"value": "1"
},
{
"name": "NUMBer",
"value": "2"
},
{
"name": "MENU",
"value": "3"
}
]
}
]
},
Expand Down
62 changes: 0 additions & 62 deletions scripts/diode-tester-fast.py
View file

This file was deleted.

Loading

0 comments on commit 39a2333

Please sign in to comment.