Skip to content

Commit

Permalink
HW OVP for step trigger
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Apr 6, 2020
1 parent 06e4922 commit c86c1d3
Show file tree
Hide file tree
Showing 16 changed files with 44,493 additions and 44,550 deletions.
440 changes: 127 additions & 313 deletions modular-psu-firmware.eez-project
View file

Large diffs are not rendered by default.

49,913 changes: 24,954 additions & 24,959 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

231 changes: 117 additions & 114 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1329,117 +1329,118 @@ enum StylesEnum {
STYLE_ID_STATUS_BGND = 11,
STYLE_ID_BUTTON_M = 12,
STYLE_ID_BUTTON_M_DISABLED = 13,
STYLE_ID_ERROR_ALERT = 14,
STYLE_ID_ERROR_ALERT_BUTTON = 15,
STYLE_ID_YT_GRAPH_U_DEFAULT = 16,
STYLE_ID_YT_GRAPH_I_DEFAULT = 17,
STYLE_ID_YT_GRAPH_P_DEFAULT = 18,
STYLE_ID_YT_GRAPH_UNREGULATED = 19,
STYLE_ID_YT_GRAPH_Y1 = 20,
STYLE_ID_YT_GRAPH_Y2 = 21,
STYLE_ID_YT_GRAPH_Y3 = 22,
STYLE_ID_YT_GRAPH_Y4 = 23,
STYLE_ID_YT_GRAPH_Y5 = 24,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER = 25,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER_S = 26,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM = 27,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM_S = 28,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM = 29,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM_S = 30,
STYLE_ID_ENCODER_CURSOR_14_DISABLED = 31,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 32,
STYLE_ID_INFO_ALERT = 33,
STYLE_ID_MENU_WITH_BUTTONS_MESSAGE = 34,
STYLE_ID_MENU_WITH_BUTTONS_CONTAINER = 35,
STYLE_ID_MENU_WITH_BUTTONS_BUTTON = 36,
STYLE_ID_CHANNEL1 = 37,
STYLE_ID_CHANNEL2 = 38,
STYLE_ID_CHANNEL3 = 39,
STYLE_ID_CHANNEL4 = 40,
STYLE_ID_CHANNEL5 = 41,
STYLE_ID_CHANNEL6 = 42,
STYLE_ID_CHANNEL1_INVERSE = 43,
STYLE_ID_CHANNEL2_INVERSE = 44,
STYLE_ID_CHANNEL3_INVERSE = 45,
STYLE_ID_CHANNEL4_INVERSE = 46,
STYLE_ID_CHANNEL5_INVERSE = 47,
STYLE_ID_CHANNEL6_INVERSE = 48,
STYLE_ID_STATUS_ICON_ENABLED_AND_ERROR = 82,
STYLE_ID_TOUCH_CALIBRATION = 101,
STYLE_ID_STATUS_ICON_ENABLED_WITH_NEED_ATTENTION = 106,
STYLE_ID_STATUS_ICON_ENABLED_AND_ACTIVE = 108,
STYLE_ID_STATUS_ICON_ENABLED_BLINK = 110,
STYLE_ID_STATUS_ICON_DISABLED = 111,
STYLE_ID_STATUS_ICON_DISABLED_BLINK = 112,
STYLE_ID_OVERLAY = 113,
STYLE_ID_EDIT_VALUE_S_LEFT = 116,
STYLE_ID_BOTTOM_BUTTON_BACKGROUND = 117,
STYLE_ID_BOTTOM_BUTTON = 118,
STYLE_ID_VALUE_S = 119,
STYLE_ID_EDIT_VALUE_M_LEFT = 120,
STYLE_ID_KEY_ICONS = 121,
STYLE_ID_KEY = 122,
STYLE_ID_TAB_PAGE_SELECTED = 125,
STYLE_ID_TAB_PAGE = 126,
STYLE_ID_DEFAULT_INVERSE = 133,
STYLE_ID_BUTTON_S = 134,
STYLE_ID_SLIDER_SHADE_1 = 135,
STYLE_ID_SLIDER_SHADE_2 = 136,
STYLE_ID_SLIDER_SHADE_3 = 137,
STYLE_ID_SLIDER_SHADE_4 = 138,
STYLE_ID_SLIDER_SHADE_5 = 139,
STYLE_ID_YES_NO = 140,
STYLE_ID_YES_NO_BUTTON = 141,
STYLE_ID_YES_NO_MESSAGE = 142,
STYLE_ID_TEXT_MESSAGE = 144,
STYLE_ID_ASYNC_OPERATION = 147,
STYLE_ID_PROGRESS = 148,
STYLE_ID_SCROLLBAR_THUMB = 158,
STYLE_ID_SCROLLBAR_BUTTON = 159,
STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 160,
STYLE_ID_KEY_SPEC_ICONS = 163,
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 165,
STYLE_ID_KEY_DISABLED = 166,
STYLE_ID_EDIT_VALUE_S_CENTERED = 167,
STYLE_ID_VALUE_M = 175,
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 178,
STYLE_ID_ENCODER_CURSOR_17_ENABLED = 180,
STYLE_ID_YT_GRAPH = 182,
STYLE_ID_LIST_GRAPH_CURSOR = 183,
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 184,
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 185,
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 186,
STYLE_ID_VALUE = 190,
STYLE_ID_DEFAULT_M = 194,
STYLE_ID_OPTION_TOGGLE_L_CENTER = 195,
STYLE_ID_EVENT_ERROR = 196,
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 197,
STYLE_ID_ICON_AND_TEXT_S = 199,
STYLE_ID_ICON_AND_TEXT_S_DISABLED = 200,
STYLE_ID_DEFAULT_DISABLED = 206,
STYLE_ID_EDIT_VALUE_M_CENTERED = 209,
STYLE_ID_EDIT_S = 210,
STYLE_ID_EVENT_WARNING = 231,
STYLE_ID_DISPLAY_OFF = 232,
STYLE_ID_DISPLAY_OFF_S = 233,
STYLE_ID_MON_VALUE_48_RIGHT = 236,
STYLE_ID_MON_VALUE_20_LEFT = 238,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 239,
STYLE_ID_BAR_GRAPH_TEXT = 240,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 242,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 243,
STYLE_ID_TRIGGER_BUTTON_24 = 246,
STYLE_ID_MON_VALUE_14_RIGHT = 248,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 249,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 250,
STYLE_ID_TRIGGER_BUTTON_14 = 251,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 257,
STYLE_ID_INST_SELECTED = 258,
STYLE_ID_MON_VALUE_38_RIGHT = 259,
STYLE_ID_CH_PROT_OFF = 261,
STYLE_ID_CH_PROT_ON = 262,
STYLE_ID_CH_PROT_TRIPPED = 263,
STYLE_ID_BUTTON_BGND = 264,
STYLE_ID_STATUS_ACTION = 14,
STYLE_ID_ERROR_ALERT = 15,
STYLE_ID_ERROR_ALERT_BUTTON = 16,
STYLE_ID_YT_GRAPH_U_DEFAULT = 17,
STYLE_ID_YT_GRAPH_I_DEFAULT = 18,
STYLE_ID_YT_GRAPH_P_DEFAULT = 19,
STYLE_ID_YT_GRAPH_UNREGULATED = 20,
STYLE_ID_YT_GRAPH_Y1 = 21,
STYLE_ID_YT_GRAPH_Y2 = 22,
STYLE_ID_YT_GRAPH_Y3 = 23,
STYLE_ID_YT_GRAPH_Y4 = 24,
STYLE_ID_YT_GRAPH_Y5 = 25,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER = 26,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER_S = 27,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM = 28,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM_S = 29,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM = 30,
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM_S = 31,
STYLE_ID_ENCODER_CURSOR_14_DISABLED = 32,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 33,
STYLE_ID_INFO_ALERT = 34,
STYLE_ID_MENU_WITH_BUTTONS_MESSAGE = 35,
STYLE_ID_MENU_WITH_BUTTONS_CONTAINER = 36,
STYLE_ID_MENU_WITH_BUTTONS_BUTTON = 37,
STYLE_ID_CHANNEL1 = 38,
STYLE_ID_CHANNEL2 = 39,
STYLE_ID_CHANNEL3 = 40,
STYLE_ID_CHANNEL4 = 41,
STYLE_ID_CHANNEL5 = 42,
STYLE_ID_CHANNEL6 = 43,
STYLE_ID_CHANNEL1_INVERSE = 44,
STYLE_ID_CHANNEL2_INVERSE = 45,
STYLE_ID_CHANNEL3_INVERSE = 46,
STYLE_ID_CHANNEL4_INVERSE = 47,
STYLE_ID_CHANNEL5_INVERSE = 48,
STYLE_ID_CHANNEL6_INVERSE = 49,
STYLE_ID_STATUS_ICON_ENABLED_AND_ERROR = 83,
STYLE_ID_TOUCH_CALIBRATION = 102,
STYLE_ID_STATUS_ICON_ENABLED_WITH_NEED_ATTENTION = 107,
STYLE_ID_STATUS_ICON_ENABLED_AND_ACTIVE = 109,
STYLE_ID_STATUS_ICON_ENABLED_BLINK = 111,
STYLE_ID_STATUS_ICON_DISABLED = 112,
STYLE_ID_STATUS_ICON_DISABLED_BLINK = 113,
STYLE_ID_OVERLAY = 114,
STYLE_ID_EDIT_VALUE_S_LEFT = 117,
STYLE_ID_BOTTOM_BUTTON_BACKGROUND = 118,
STYLE_ID_BOTTOM_BUTTON = 119,
STYLE_ID_VALUE_S = 120,
STYLE_ID_EDIT_VALUE_M_LEFT = 121,
STYLE_ID_KEY_ICONS = 122,
STYLE_ID_KEY = 123,
STYLE_ID_TAB_PAGE_SELECTED = 126,
STYLE_ID_TAB_PAGE = 127,
STYLE_ID_DEFAULT_INVERSE = 134,
STYLE_ID_BUTTON_S = 135,
STYLE_ID_SLIDER_SHADE_1 = 136,
STYLE_ID_SLIDER_SHADE_2 = 137,
STYLE_ID_SLIDER_SHADE_3 = 138,
STYLE_ID_SLIDER_SHADE_4 = 139,
STYLE_ID_SLIDER_SHADE_5 = 140,
STYLE_ID_YES_NO = 141,
STYLE_ID_YES_NO_BUTTON = 142,
STYLE_ID_YES_NO_MESSAGE = 143,
STYLE_ID_TEXT_MESSAGE = 145,
STYLE_ID_ASYNC_OPERATION = 148,
STYLE_ID_PROGRESS = 149,
STYLE_ID_ASYNC_OPERATION_ACTION = 150,
STYLE_ID_SCROLLBAR_THUMB = 159,
STYLE_ID_SCROLLBAR_BUTTON = 160,
STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 161,
STYLE_ID_KEY_SPEC_ICONS = 164,
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 166,
STYLE_ID_KEY_DISABLED = 167,
STYLE_ID_EDIT_VALUE_S_CENTERED = 168,
STYLE_ID_VALUE_M = 176,
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 179,
STYLE_ID_ENCODER_CURSOR_17_ENABLED = 181,
STYLE_ID_YT_GRAPH = 183,
STYLE_ID_LIST_GRAPH_CURSOR = 184,
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 185,
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 186,
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 187,
STYLE_ID_VALUE = 191,
STYLE_ID_DEFAULT_M = 195,
STYLE_ID_OPTION_TOGGLE_L_CENTER = 196,
STYLE_ID_EVENT_ERROR = 197,
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 198,
STYLE_ID_ICON_AND_TEXT_S = 200,
STYLE_ID_ICON_AND_TEXT_S_DISABLED = 201,
STYLE_ID_DEFAULT_DISABLED = 207,
STYLE_ID_EDIT_VALUE_M_CENTERED = 210,
STYLE_ID_EDIT_S = 211,
STYLE_ID_EVENT_WARNING = 232,
STYLE_ID_DISPLAY_OFF = 233,
STYLE_ID_DISPLAY_OFF_S = 234,
STYLE_ID_MON_VALUE_48_RIGHT = 237,
STYLE_ID_MON_VALUE_20_LEFT = 239,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 240,
STYLE_ID_BAR_GRAPH_TEXT = 241,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 243,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 244,
STYLE_ID_TRIGGER_BUTTON_24 = 247,
STYLE_ID_MON_VALUE_14_RIGHT = 249,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 250,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 251,
STYLE_ID_TRIGGER_BUTTON_14 = 252,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 258,
STYLE_ID_INST_SELECTED = 259,
STYLE_ID_MON_VALUE_38_RIGHT = 260,
STYLE_ID_CH_PROT_OFF = 262,
STYLE_ID_CH_PROT_ON = 263,
STYLE_ID_CH_PROT_TRIPPED = 264,
STYLE_ID_MON_VALUE_24_RIGHT = 266,
STYLE_ID_MON_VALUE_14_CENTER = 267,
STYLE_ID_MON_VALUE_20_RIGHT = 273,
Expand All @@ -1448,7 +1449,8 @@ enum StylesEnum {
STYLE_ID_STATUS_LINE_SMALL_TITLE = 279,
STYLE_ID_EDIT_VALUE_S_CENTERED_STATUS_LINE = 280,
STYLE_ID_SCROLLBAR_TRACK = 281,
STYLE_ID_BUTTON_S_DISABLED = 293
STYLE_ID_BUTTON_S_DISABLED = 293,
STYLE_ID_BUTTON_BGND = 344
};

enum ThemesEnum {
Expand Down Expand Up @@ -1685,7 +1687,8 @@ enum PagesEnum {
PAGE_ID_FILE_MANAGER_LARGE_ICONS_VIEW = 164,
PAGE_ID_TOUCH_TEST = 165,
PAGE_ID_DEBUG_VARIABLES = 166,
PAGE_ID_FOCUS_VALUE_OVERLAY = 167
PAGE_ID_FOCUS_VALUE_OVERLAY = 167,
PAGE_ID_OVP_TYPE = 168
};

extern const uint8_t assets[404004];
extern const uint8_t assets[403931];
Loading

0 comments on commit c86c1d3

Please sign in to comment.