Skip to content

Commit

Permalink
#75
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Nov 20, 2020
1 parent add4d07 commit 808e492
Show file tree
Hide file tree
Showing 7 changed files with 53,452 additions and 53,392 deletions.
45 changes: 34 additions & 11 deletions modular-psu-firmware.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2404,6 +2404,11 @@
"name": "labels_and_colors_page_channel_title",
"type": "string",
"defaultValue": "DCP405 #1"
},
{
"name": "labels_and_colors_is_color_modified",
"type": "boolean",
"defaultValue": "0"
}
],
"actions": [
Expand Down Expand Up @@ -35747,17 +35752,41 @@
"text": "Pick a color"
},
{
"type": "Text",
"type": "Select",
"style": {
"inheritFrom": "status_icon_enabled",
"font": "Oswald14"
"inheritFrom": "default"
},
"action": "pick_default_color",
"data": "labels_and_colors_is_color_modified",
"left": 324,
"top": 0,
"width": 96,
"height": 32,
"text": "Default"
"widgets": [
{
"type": "Rectangle",
"style": {
"inheritFrom": "status_title"
},
"left": 0,
"top": 0,
"width": 96,
"height": 32,
"invertColors": true
},
{
"type": "Text",
"style": {
"inheritFrom": "status_icon_enabled",
"font": "Oswald14"
},
"action": "pick_default_color",
"left": 0,
"top": 0,
"width": 96,
"height": 32,
"text": "Default"
}
]
}
]
}
Expand Down Expand Up @@ -59068,7 +59097,6 @@
"#ff5722",
"#795548",
"#607d8b",

"#404040",
"#404040",
"#404040",
Expand All @@ -59093,7 +59121,6 @@
"#FFFFFF",
"#FFFFFF",
"#FFFFFF",

"#b3b7b7",
"#404040",
"#404040",
Expand Down Expand Up @@ -59179,7 +59206,6 @@
"#ff5722",
"#795548",
"#607d8b",

"#404040",
"#404040",
"#404040",
Expand All @@ -59204,7 +59230,6 @@
"#FFFFFF",
"#FFFFFF",
"#FFFFFF",

"#b3b7b7",
"#404040",
"#404040",
Expand Down Expand Up @@ -59290,7 +59315,6 @@
"#ff5722",
"#795548",
"#607d8b",

"#404040",
"#404040",
"#404040",
Expand All @@ -59315,7 +59339,6 @@
"#FFFFFF",
"#FFFFFF",
"#FFFFFF",

"#187397",
"#d0d0d0",
"#d0d0d0",
Expand Down
66,038 changes: 33,020 additions & 33,018 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

178 changes: 91 additions & 87 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,74 +430,75 @@ enum DataEnum {
DATA_ID_KEYPAD_CAN_SET_DEFAULT = 428,
DATA_ID_LABELS_AND_COLORS_PAGE_SLOT_TITLE = 429,
DATA_ID_LABELS_AND_COLORS_PAGE_CHANNEL_TITLE = 430,
DATA_ID_DIB_MIO168_DIN_PINS = 431,
DATA_ID_DIB_MIO168_DIN_PINS_1_4 = 432,
DATA_ID_DIB_MIO168_DIN_PINS_5_8 = 433,
DATA_ID_DIB_MIO168_DIN_NO = 434,
DATA_ID_DIB_MIO168_DIN_STATE = 435,
DATA_ID_DIB_MIO168_DIN_RANGE = 436,
DATA_ID_DIB_MIO168_DIN_SPEED = 437,
DATA_ID_DIB_MIO168_DOUT_PINS = 438,
DATA_ID_DIB_MIO168_DOUT_NO = 439,
DATA_ID_DIB_MIO168_DOUT_STATE = 440,
DATA_ID_DIB_MIO168_AIN_CHANNELS = 441,
DATA_ID_DIB_MIO168_AIN_LABEL = 442,
DATA_ID_DIB_MIO168_AIN_VALUE = 443,
DATA_ID_DIB_MIO168_AIN_MODE = 444,
DATA_ID_DIB_MIO168_AIN_RANGE = 445,
DATA_ID_DIB_MIO168_AIN_HAS_TEMP_SENSOR_BIAS_FEATURE = 446,
DATA_ID_DIB_MIO168_AIN_TEMP_SENSOR_BIAS = 447,
DATA_ID_DIB_MIO168_AOUT_CHANNELS = 448,
DATA_ID_DIB_MIO168_AOUT_LABEL = 449,
DATA_ID_DIB_MIO168_AOUT_VALUE = 450,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_ENABLED = 451,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_MODE = 452,
DATA_ID_DIB_MIO168_AOUT_VOLTAGE_RANGE = 453,
DATA_ID_DIB_MIO168_AOUT_CURRENT_RANGE = 454,
DATA_ID_DIB_MIO168_AOUT_CHANNEL_HAS_SETTINGS = 455,
DATA_ID_DIB_MIO168_PWM_CHANNELS = 456,
DATA_ID_DIB_MIO168_PWM_LABEL = 457,
DATA_ID_DIB_MIO168_PWM_FREQ = 458,
DATA_ID_DIB_MIO168_PWM_DUTY = 459,
DATA_ID_DIB_MIO168_DIN_HAS_SPEED = 460,
DATA_ID_DIB_SMX46_ROUTES = 461,
DATA_ID_DIB_SMX46_ROUTE_OPEN = 462,
DATA_ID_DIB_SMX46_X_LABELS = 463,
DATA_ID_DIB_SMX46_X_LABEL = 464,
DATA_ID_DIB_SMX46_Y_LABELS = 465,
DATA_ID_DIB_SMX46_Y_LABEL = 466,
DATA_ID_DIB_SMX46_DAC1 = 467,
DATA_ID_DIB_SMX46_DAC2 = 468,
DATA_ID_DIB_SMX46_RELAY_ON = 469,
DATA_ID_DIB_SMX46_SIGNAL_RELAY_CYCLES = 470,
DATA_ID_DIB_SMX46_POWER_RELAY_CYCLES = 471,
DATA_ID_DIB_DCM220_SLOT_DEF_2CH_VIEW = 472,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_VIEW = 473,
DATA_ID_DIB_DCM220_SLOT_MIN_2CH_VIEW = 474,
DATA_ID_DIB_DCM220_SLOT_MICRO_2CH_VIEW = 475,
DATA_ID_DIB_DCM220_SLOT_2CH_CH1_INDEX = 476,
DATA_ID_DIB_DCM220_SLOT_2CH_CH2_INDEX = 477,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_MIN_VIEW = 478,
DATA_ID_FRONT_PANEL_SLOT1_VIEW = 479,
DATA_ID_SIMULATOR_LOAD_STATE = 480,
DATA_ID_SIMULATOR_LOAD_STATE2 = 481,
DATA_ID_SIMULATOR_LOAD = 482,
DATA_ID_SIMULATOR_LOAD2 = 483,
DATA_ID_MAIN_APP_VIEW = 484,
DATA_ID_FRONT_PANEL_SLOT2_VIEW = 485,
DATA_ID_FRONT_PANEL_SLOT3_VIEW = 486,
DATA_ID_DIB_DCM224_PWM_FREQUENCY = 487,
DATA_ID_DIB_DCM224_PWM_DUTY = 488,
DATA_ID_DIB_DCM224_COUNTERPHASE_FREQUENCY = 489,
DATA_ID_DIB_DCM224_COUNTERPHASE_DITHERING = 490,
DATA_ID_DIB_DCM224_PWM_ENABLED = 491,
DATA_ID_DIB_DCM224_SLOT_DEF_2CH_VIEW = 492,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_VIEW = 493,
DATA_ID_DIB_DCM224_SLOT_MIN_2CH_VIEW = 494,
DATA_ID_DIB_DCM224_SLOT_MICRO_2CH_VIEW = 495,
DATA_ID_DIB_DCM224_SLOT_2CH_CH1_INDEX = 496,
DATA_ID_DIB_DCM224_SLOT_2CH_CH2_INDEX = 497,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_MIN_VIEW = 498
DATA_ID_LABELS_AND_COLORS_IS_COLOR_MODIFIED = 431,
DATA_ID_DIB_MIO168_DIN_PINS = 432,
DATA_ID_DIB_MIO168_DIN_PINS_1_4 = 433,
DATA_ID_DIB_MIO168_DIN_PINS_5_8 = 434,
DATA_ID_DIB_MIO168_DIN_NO = 435,
DATA_ID_DIB_MIO168_DIN_STATE = 436,
DATA_ID_DIB_MIO168_DIN_RANGE = 437,
DATA_ID_DIB_MIO168_DIN_SPEED = 438,
DATA_ID_DIB_MIO168_DOUT_PINS = 439,
DATA_ID_DIB_MIO168_DOUT_NO = 440,
DATA_ID_DIB_MIO168_DOUT_STATE = 441,
DATA_ID_DIB_MIO168_AIN_CHANNELS = 442,
DATA_ID_DIB_MIO168_AIN_LABEL = 443,
DATA_ID_DIB_MIO168_AIN_VALUE = 444,
DATA_ID_DIB_MIO168_AIN_MODE = 445,
DATA_ID_DIB_MIO168_AIN_RANGE = 446,
DATA_ID_DIB_MIO168_AIN_HAS_TEMP_SENSOR_BIAS_FEATURE = 447,
DATA_ID_DIB_MIO168_AIN_TEMP_SENSOR_BIAS = 448,
DATA_ID_DIB_MIO168_AOUT_CHANNELS = 449,
DATA_ID_DIB_MIO168_AOUT_LABEL = 450,
DATA_ID_DIB_MIO168_AOUT_VALUE = 451,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_ENABLED = 452,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_MODE = 453,
DATA_ID_DIB_MIO168_AOUT_VOLTAGE_RANGE = 454,
DATA_ID_DIB_MIO168_AOUT_CURRENT_RANGE = 455,
DATA_ID_DIB_MIO168_AOUT_CHANNEL_HAS_SETTINGS = 456,
DATA_ID_DIB_MIO168_PWM_CHANNELS = 457,
DATA_ID_DIB_MIO168_PWM_LABEL = 458,
DATA_ID_DIB_MIO168_PWM_FREQ = 459,
DATA_ID_DIB_MIO168_PWM_DUTY = 460,
DATA_ID_DIB_MIO168_DIN_HAS_SPEED = 461,
DATA_ID_DIB_SMX46_ROUTES = 462,
DATA_ID_DIB_SMX46_ROUTE_OPEN = 463,
DATA_ID_DIB_SMX46_X_LABELS = 464,
DATA_ID_DIB_SMX46_X_LABEL = 465,
DATA_ID_DIB_SMX46_Y_LABELS = 466,
DATA_ID_DIB_SMX46_Y_LABEL = 467,
DATA_ID_DIB_SMX46_DAC1 = 468,
DATA_ID_DIB_SMX46_DAC2 = 469,
DATA_ID_DIB_SMX46_RELAY_ON = 470,
DATA_ID_DIB_SMX46_SIGNAL_RELAY_CYCLES = 471,
DATA_ID_DIB_SMX46_POWER_RELAY_CYCLES = 472,
DATA_ID_DIB_DCM220_SLOT_DEF_2CH_VIEW = 473,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_VIEW = 474,
DATA_ID_DIB_DCM220_SLOT_MIN_2CH_VIEW = 475,
DATA_ID_DIB_DCM220_SLOT_MICRO_2CH_VIEW = 476,
DATA_ID_DIB_DCM220_SLOT_2CH_CH1_INDEX = 477,
DATA_ID_DIB_DCM220_SLOT_2CH_CH2_INDEX = 478,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_MIN_VIEW = 479,
DATA_ID_FRONT_PANEL_SLOT1_VIEW = 480,
DATA_ID_SIMULATOR_LOAD_STATE = 481,
DATA_ID_SIMULATOR_LOAD_STATE2 = 482,
DATA_ID_SIMULATOR_LOAD = 483,
DATA_ID_SIMULATOR_LOAD2 = 484,
DATA_ID_MAIN_APP_VIEW = 485,
DATA_ID_FRONT_PANEL_SLOT2_VIEW = 486,
DATA_ID_FRONT_PANEL_SLOT3_VIEW = 487,
DATA_ID_DIB_DCM224_PWM_FREQUENCY = 488,
DATA_ID_DIB_DCM224_PWM_DUTY = 489,
DATA_ID_DIB_DCM224_COUNTERPHASE_FREQUENCY = 490,
DATA_ID_DIB_DCM224_COUNTERPHASE_DITHERING = 491,
DATA_ID_DIB_DCM224_PWM_ENABLED = 492,
DATA_ID_DIB_DCM224_SLOT_DEF_2CH_VIEW = 493,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_VIEW = 494,
DATA_ID_DIB_DCM224_SLOT_MIN_2CH_VIEW = 495,
DATA_ID_DIB_DCM224_SLOT_MICRO_2CH_VIEW = 496,
DATA_ID_DIB_DCM224_SLOT_2CH_CH1_INDEX = 497,
DATA_ID_DIB_DCM224_SLOT_2CH_CH2_INDEX = 498,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_MIN_VIEW = 499
};

void data_none(DataOperationEnum operation, Cursor cursor, Value &value);
Expand Down Expand Up @@ -931,6 +932,7 @@ void data_colors(DataOperationEnum operation, Cursor cursor, Value &value);
void data_keypad_can_set_default(DataOperationEnum operation, Cursor cursor, Value &value);
void data_labels_and_colors_page_slot_title(DataOperationEnum operation, Cursor cursor, Value &value);
void data_labels_and_colors_page_channel_title(DataOperationEnum operation, Cursor cursor, Value &value);
void data_labels_and_colors_is_color_modified(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_din_pins(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_din_pins_1_4(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_din_pins_5_8(DataOperationEnum operation, Cursor cursor, Value &value);
Expand Down Expand Up @@ -1686,7 +1688,7 @@ enum StylesEnum {
STYLE_ID_INLINE95 = 95,
STYLE_ID_ASYNC_OPERATION = 96,
STYLE_ID_PROGRESS = 97,
STYLE_ID_ASYNC_OPERATION_ACTION = 98,
STYLE_ID_INLINE98 = 98,
STYLE_ID_INLINE99 = 99,
STYLE_ID_INLINE100 = 100,
STYLE_ID_INLINE101 = 101,
Expand Down Expand Up @@ -1898,22 +1900,22 @@ enum StylesEnum {
STYLE_ID_INLINE307 = 307,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 308,
STYLE_ID_TRIGGER_BUTTON_14 = 309,
STYLE_ID_INST_SELECTED = 310,
STYLE_ID_MON_VALUE_38_RIGHT = 311,
STYLE_ID_INLINE312 = 312,
STYLE_ID_CH_PROT_OFF = 313,
STYLE_ID_CH_PROT_ON = 314,
STYLE_ID_CH_PROT_TRIPPED = 315,
STYLE_ID_INLINE316 = 316,
STYLE_ID_MON_VALUE_20_RIGHT = 317,
STYLE_ID_MON_VALUE_14_LEFT = 318,
STYLE_ID_MON_VALUE_14_CENTER = 319,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 320,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 321,
STYLE_ID_MON_VALUE_14_RIGHT = 322,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 323,
STYLE_ID_MON_VALUE_24_RIGHT = 324,
STYLE_ID_INLINE325 = 325,
STYLE_ID_INLINE310 = 310,
STYLE_ID_INST_SELECTED = 311,
STYLE_ID_MON_VALUE_38_RIGHT = 312,
STYLE_ID_INLINE313 = 313,
STYLE_ID_CH_PROT_OFF = 314,
STYLE_ID_CH_PROT_ON = 315,
STYLE_ID_CH_PROT_TRIPPED = 316,
STYLE_ID_INLINE317 = 317,
STYLE_ID_MON_VALUE_20_RIGHT = 318,
STYLE_ID_MON_VALUE_14_LEFT = 319,
STYLE_ID_MON_VALUE_14_CENTER = 320,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 321,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 322,
STYLE_ID_MON_VALUE_14_RIGHT = 323,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 324,
STYLE_ID_MON_VALUE_24_RIGHT = 325,
STYLE_ID_INLINE326 = 326,
STYLE_ID_INLINE327 = 327,
STYLE_ID_INLINE328 = 328,
Expand All @@ -1924,7 +1926,9 @@ enum StylesEnum {
STYLE_ID_INLINE333 = 333,
STYLE_ID_INLINE334 = 334,
STYLE_ID_INLINE335 = 335,
STYLE_ID_INLINE336 = 336
STYLE_ID_INLINE336 = 336,
STYLE_ID_INLINE337 = 337,
STYLE_ID_INLINE338 = 338
};

enum ThemesEnum {
Expand Down Expand Up @@ -2306,4 +2310,4 @@ enum PagesEnum {
PAGE_ID_DIB_DCM224_LABELS_AND_COLORS_CH = 262
};

extern const uint8_t assets[540521];
extern const uint8_t assets[540544];
Loading

0 comments on commit 808e492

Please sign in to comment.