Skip to content

Commit

Permalink
default slot settings page
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Jan 15, 2021
1 parent 096ff6f commit 62b523d
Show file tree
Hide file tree
Showing 14 changed files with 55,626 additions and 55,657 deletions.
99 changes: 10 additions & 89 deletions modular-psu-firmware.eez-project
Original file line number Diff line number Diff line change
Expand Up @@ -1837,11 +1837,6 @@
"type": "boolean",
"defaultValue": "1"
},
{
"name": "channel_settings_page",
"type": "string",
"defaultValue": "ch_settings_ok"
},
{
"name": "is_reset_by_iwdg",
"type": "boolean",
Expand Down Expand Up @@ -10129,28 +10124,6 @@
"name": "ch_settings",
"description": "Clear, disable and define channel's protection parameters",
"style": "default",
"widgets": [
{
"type": "LayoutView",
"style": {
"inheritFrom": "default"
},
"data": "channel_settings_page",
"left": 0,
"top": 0,
"width": 480,
"height": 272
}
],
"left": 0,
"top": 0,
"width": 480,
"height": 272
},
{
"name": "ch_settings_ok",
"description": "Clear, disable and define channel's protection parameters",
"style": "default",
"widgets": [
{
"type": "Container",
Expand Down Expand Up @@ -10907,68 +10880,6 @@
"width": 480,
"height": 272
},
{
"name": "ch_settings_error",
"description": "Clear, disable and define channel's protection parameters",
"style": "default",
"widgets": [
{
"type": "Container",
"style": {
"inheritFrom": "default"
},
"left": 0,
"top": 240,
"width": 480,
"height": 32,
"name": "Status line",
"widgets": [
{
"type": "Text",
"style": {
"inheritFrom": "channel1",
"font": "Heydings14"
},
"action": "show_main_page",
"left": 0,
"top": 0,
"width": 41,
"height": 32,
"text": "H"
},
{
"type": "Text",
"style": {
"inheritFrom": "channel1",
"alignHorizontal": "left"
},
"data": "channel_short_label",
"left": 41,
"top": 0,
"width": 36,
"height": 32,
"text": ""
},
{
"type": "Text",
"style": {
"inheritFrom": "channel1",
"alignHorizontal": "left"
},
"left": 77,
"top": 0,
"width": 403,
"height": 32,
"text": "Settings (Error)"
}
]
}
],
"left": 0,
"top": 0,
"width": 480,
"height": 272
},
{
"name": "ch_settings_prot_clear",
"description": "Clear and/or disable selected channel's protection(s)",
Expand Down Expand Up @@ -68922,6 +68833,16 @@
]
}
},
{
"name": "DEBUg:DOWNload:FIRMware?",
"description": "Is firmware download in progress?",
"parameters": [],
"response": {
"type": [
{}
]
}
},
{
"name": "DEBUg:EVENt",
"parameters": [
Expand Down
9 changes: 2 additions & 7 deletions src/eez/action_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,17 +304,12 @@ void action_show_edit_mode_slider_help() {

void action_show_slot_settings() {
hmi::selectSlot(getFoundWidgetAtDown().cursor);

showPage(
g_slots[hmi::g_selectedSlotIndex]->getTestResult() == TEST_OK ?
g_slots[hmi::g_selectedSlotIndex]->getSlotSettingsPageId() :
PAGE_ID_SLOT_SETTINGS
);
showPage(g_slots[hmi::g_selectedSlotIndex]->getSlotSettingsPageId());
}

void action_show_ch_settings() {
selectChannelByCursor();
showPage(g_slots[g_channel->slotIndex]->getChannelSettingsPageId());
showPage(g_slots[g_channel->slotIndex]->getSlotSettingsPageId());
}

void action_show_ch_settings_prot_clear() {
Expand Down
67,242 changes: 33,618 additions & 33,624 deletions src/eez/gui/document_simulator.cpp

Large diffs are not rendered by default.

Loading

0 comments on commit 62b523d

Please sign in to comment.