Skip to content

Commit

Permalink
coupling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Jan 16, 2020
1 parent 2b1e485 commit fb3c838
Show file tree
Hide file tree
Showing 9 changed files with 327 additions and 176 deletions.
223 changes: 159 additions & 64 deletions modular-psu-firmware.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2068,6 +2068,16 @@
"name": "dlog_view_show_labels",
"type": "boolean",
"defaultValue": "1"
},
{
"name": "is_any_coupling_allowed",
"type": "boolean",
"defaultValue": "1"
},
{
"name": "is_coupling_split_rails_allowed",
"type": "boolean",
"defaultValue": "1"
}
],
"actions": [
Expand Down Expand Up @@ -26872,8 +26882,7 @@
"style": {
"inheritFrom": "default"
},
"data": "coupling_type",
"action": "show_sys_settings_coupling",
"data": "is_any_coupling_allowed",
"left": 334,
"top": 35,
"width": 130,
Expand All @@ -26882,7 +26891,7 @@
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
"inheritFrom": "default_M"
},
"left": 0,
"top": 0,
Expand All @@ -26892,52 +26901,78 @@
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Parallel",
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Series",
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Common Gnd",
"focusStyle": {}
},
{
"type": "Text",
"type": "Select",
"style": {
"inheritFrom": "edit_value_active_M_center"
"inheritFrom": "default"
},
"data": "coupling_type",
"action": "show_sys_settings_coupling",
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Split rails",
"focusStyle": {}
"widgets": [
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Uncoupled",
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Parallel",
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Series",
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Common Gnd",
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"left": 0,
"top": 0,
"width": 130,
"height": 36,
"text": "Split rails",
"focusStyle": {}
}
]
}
]
}
Expand Down Expand Up @@ -27444,32 +27479,35 @@
]
},
{
"type": "Container",
"type": "Select",
"style": {
"inheritFrom": "default"
},
"action": "set_coupling_split_rails",
"data": "is_coupling_split_rails_allowed",
"left": 5,
"top": 160,
"width": 189,
"height": 36,
"widgets": [
{
"type": "Select",
"type": "Container",
"style": {
"inheritFrom": "default"
},
"data": "is_coupling_type_split_rails",
"action": "set_coupling_split_rails",
"left": 0,
"top": 0,
"width": 38,
"width": 189,
"height": 36,
"widgets": [
{
"type": "Text",
"style": {
"inheritFrom": "option_toggle_L_center",
"inheritFrom": "default",
"font": "Oswald17",
"alignHorizontal": "center",
"backgroundColor": "Background",
"activeColor": "Background",
"padding": "0 0 0 6"
},
"action": "",
Expand All @@ -27483,35 +27521,92 @@
{
"type": "Text",
"style": {
"inheritFrom": "option_toggle_L_center",
"inheritFrom": "default",
"font": "Oswald17",
"padding": "0 0 0 6"
"alignHorizontal": "left",
"padding": "0 0 0 "
},
"action": "",
"left": 0,
"left": 38,
"top": 0,
"width": 38,
"width": 150,
"height": 36,
"text": "\\u008e",
"text": "Split rails",
"focusStyle": {}
}
]
},
{
"type": "Text",
"type": "Container",
"style": {
"inheritFrom": "option_toggle_L_center",
"font": "Oswald17",
"alignHorizontal": "left",
"padding": "0 0 0 "
"inheritFrom": "default"
},
"action": "",
"left": 38,
"action": "set_coupling_split_rails",
"left": 0,
"top": 0,
"width": 150,
"width": 189,
"height": 36,
"text": "Split rails",
"focusStyle": {}
"widgets": [
{
"type": "Select",
"style": {
"inheritFrom": "default"
},
"data": "is_coupling_type_split_rails",
"left": 0,
"top": 0,
"width": 38,
"height": 36,
"widgets": [
{
"type": "Text",
"style": {
"inheritFrom": "option_toggle_L_center",
"font": "Oswald17",
"padding": "0 0 0 6"
},
"action": "",
"left": 0,
"top": 0,
"width": 38,
"height": 36,
"text": "\\u008d",
"focusStyle": {}
},
{
"type": "Text",
"style": {
"inheritFrom": "option_toggle_L_center",
"font": "Oswald17",
"padding": "0 0 0 6"
},
"action": "",
"left": 0,
"top": 0,
"width": 38,
"height": 36,
"text": "\\u008e",
"focusStyle": {}
}
]
},
{
"type": "Text",
"style": {
"inheritFrom": "option_toggle_L_center",
"font": "Oswald17",
"alignHorizontal": "left",
"padding": "0 0 0 "
},
"action": "",
"left": 38,
"top": 0,
"width": 150,
"height": 36,
"text": "Split rails",
"focusStyle": {}
}
]
}
]
},
Expand Down
4 changes: 1 addition & 3 deletions src/eez/gui/widgets/list_graph.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,7 @@ void ListGraphWidget_onTouch(const WidgetCursor &widgetCursor, Event &touchEvent
}

if (iCursor >= 0) {
data::set(widgetCursor.cursor, listGraphWidget->cursorData, data::Value(iCursor),
0);

data::set(widgetCursor.cursor, listGraphWidget->cursorData, data::Value(iCursor), 0);
if (touchEvent.type == EVENT_TYPE_TOUCH_DOWN) {
sound::playClick();
}
Expand Down
Loading

0 comments on commit fb3c838

Please sign in to comment.