Skip to content

Commit

Permalink
mio dlog fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Feb 15, 2021
1 parent b93a11c commit c3129c7
Show file tree
Hide file tree
Showing 9 changed files with 53,801 additions and 53,646 deletions.
66,278 changes: 33,145 additions & 33,133 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

215 changes: 110 additions & 105 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,79 +459,80 @@ enum DataEnum {
DATA_ID_DIB_MIO168_AIN_MODE = 457,
DATA_ID_DIB_MIO168_AIN_RANGE = 458,
DATA_ID_DIB_MIO168_AIN_RANGE_IS_AVAILABLE = 459,
DATA_ID_DIB_MIO168_AIN_MODE_AND_RANGE = 460,
DATA_ID_DIB_MIO168_AIN_RANGE_IS_MULTIPLE_SELECTION_AVAILABLE = 461,
DATA_ID_DIB_MIO168_AIN_FAULT_STATUS = 462,
DATA_ID_DIB_MIO168_AIN_NPLC = 463,
DATA_ID_DIB_MIO168_AIN_APERTURE = 464,
DATA_ID_DIB_MIO168_AOUT_CHANNELS = 465,
DATA_ID_DIB_MIO168_AOUT_LABEL = 466,
DATA_ID_DIB_MIO168_AOUT_LABEL_LABEL = 467,
DATA_ID_DIB_MIO168_AOUT_VALUE = 468,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_ENABLED = 469,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_MODE = 470,
DATA_ID_DIB_MIO168_AOUT_VOLTAGE_RANGE = 471,
DATA_ID_DIB_MIO168_AOUT_CURRENT_RANGE = 472,
DATA_ID_DIB_MIO168_AOUT_CHANNEL_HAS_SETTINGS = 473,
DATA_ID_DIB_MIO168_AOUT_MODE_AND_RANGE = 474,
DATA_ID_DIB_MIO168_PWM_CHANNELS = 475,
DATA_ID_DIB_MIO168_PWM_LABEL = 476,
DATA_ID_DIB_MIO168_PWM_LABEL_LABEL = 477,
DATA_ID_DIB_MIO168_PWM_FREQ = 478,
DATA_ID_DIB_MIO168_PWM_DUTY = 479,
DATA_ID_DIB_MIO168_DIN_HAS_SPEED = 480,
DATA_ID_DIB_MIO168_AFE_VERSION = 481,
DATA_ID_DIB_MIO168_PAGER_LIST = 482,
DATA_ID_DIB_MIO168_PAGER_IS_SELECTED = 483,
DATA_ID_DIB_MIO168_PAGER_SELECTED_PAGE = 484,
DATA_ID_DIB_PREL6_RELAYS = 485,
DATA_ID_DIB_PREL6_RELAY_IS_ON = 486,
DATA_ID_DIB_PREL6_RELAY_LABEL = 487,
DATA_ID_DIB_PREL6_RELAY_CYCLES = 488,
DATA_ID_DIB_PREL6_RELAY_LABEL_LABEL = 489,
DATA_ID_DIB_PREL6_IS_RELAY_1_OR_6 = 490,
DATA_ID_DIB_SMX46_ROUTES = 491,
DATA_ID_DIB_SMX46_ROUTE_OPEN = 492,
DATA_ID_DIB_SMX46_X_LABELS = 493,
DATA_ID_DIB_SMX46_X_LABEL = 494,
DATA_ID_DIB_SMX46_Y_LABELS = 495,
DATA_ID_DIB_SMX46_Y_LABEL = 496,
DATA_ID_DIB_SMX46_DAC1 = 497,
DATA_ID_DIB_SMX46_DAC2 = 498,
DATA_ID_DIB_SMX46_RELAY_ON = 499,
DATA_ID_DIB_SMX46_SIGNAL_RELAY_CYCLES = 500,
DATA_ID_DIB_SMX46_POWER_RELAY_CYCLES = 501,
DATA_ID_DIB_SMX46_ANALOG_OUTPUTS = 502,
DATA_ID_DIB_SMX46_AO_LABEL = 503,
DATA_ID_DIB_SMX46_AO1_LABEL = 504,
DATA_ID_DIB_SMX46_AO2_LABEL = 505,
DATA_ID_DIB_DCM220_SLOT_DEF_2CH_VIEW = 506,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_VIEW = 507,
DATA_ID_DIB_DCM220_SLOT_MIN_2CH_VIEW = 508,
DATA_ID_DIB_DCM220_SLOT_MICRO_2CH_VIEW = 509,
DATA_ID_DIB_DCM220_SLOT_2CH_CH1_INDEX = 510,
DATA_ID_DIB_DCM220_SLOT_2CH_CH2_INDEX = 511,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_MIN_VIEW = 512,
DATA_ID_FRONT_PANEL_SLOT1_VIEW = 513,
DATA_ID_SIMULATOR_LOAD_STATE = 514,
DATA_ID_SIMULATOR_LOAD_STATE2 = 515,
DATA_ID_SIMULATOR_LOAD = 516,
DATA_ID_SIMULATOR_LOAD2 = 517,
DATA_ID_MAIN_APP_VIEW = 518,
DATA_ID_FRONT_PANEL_SLOT2_VIEW = 519,
DATA_ID_FRONT_PANEL_SLOT3_VIEW = 520,
DATA_ID_DIB_DCM224_PWM_FREQUENCY = 521,
DATA_ID_DIB_DCM224_PWM_DUTY = 522,
DATA_ID_DIB_DCM224_COUNTERPHASE_FREQUENCY = 523,
DATA_ID_DIB_DCM224_COUNTERPHASE_DITHERING = 524,
DATA_ID_DIB_DCM224_PWM_ENABLED = 525,
DATA_ID_DIB_DCM224_SLOT_DEF_2CH_VIEW = 526,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_VIEW = 527,
DATA_ID_DIB_DCM224_SLOT_MIN_2CH_VIEW = 528,
DATA_ID_DIB_DCM224_SLOT_MICRO_2CH_VIEW = 529,
DATA_ID_DIB_DCM224_SLOT_2CH_CH1_INDEX = 530,
DATA_ID_DIB_DCM224_SLOT_2CH_CH2_INDEX = 531,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_MIN_VIEW = 532
DATA_ID_DIB_MIO168_AIN_IS_DLOG_ACTIVE = 460,
DATA_ID_DIB_MIO168_AIN_MODE_AND_RANGE = 461,
DATA_ID_DIB_MIO168_AIN_RANGE_IS_MULTIPLE_SELECTION_AVAILABLE = 462,
DATA_ID_DIB_MIO168_AIN_FAULT_STATUS = 463,
DATA_ID_DIB_MIO168_AIN_NPLC = 464,
DATA_ID_DIB_MIO168_AIN_APERTURE = 465,
DATA_ID_DIB_MIO168_AOUT_CHANNELS = 466,
DATA_ID_DIB_MIO168_AOUT_LABEL = 467,
DATA_ID_DIB_MIO168_AOUT_LABEL_LABEL = 468,
DATA_ID_DIB_MIO168_AOUT_VALUE = 469,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_ENABLED = 470,
DATA_ID_DIB_MIO168_AOUT_OUTPUT_MODE = 471,
DATA_ID_DIB_MIO168_AOUT_VOLTAGE_RANGE = 472,
DATA_ID_DIB_MIO168_AOUT_CURRENT_RANGE = 473,
DATA_ID_DIB_MIO168_AOUT_CHANNEL_HAS_SETTINGS = 474,
DATA_ID_DIB_MIO168_AOUT_MODE_AND_RANGE = 475,
DATA_ID_DIB_MIO168_PWM_CHANNELS = 476,
DATA_ID_DIB_MIO168_PWM_LABEL = 477,
DATA_ID_DIB_MIO168_PWM_LABEL_LABEL = 478,
DATA_ID_DIB_MIO168_PWM_FREQ = 479,
DATA_ID_DIB_MIO168_PWM_DUTY = 480,
DATA_ID_DIB_MIO168_DIN_HAS_SPEED = 481,
DATA_ID_DIB_MIO168_AFE_VERSION = 482,
DATA_ID_DIB_MIO168_PAGER_LIST = 483,
DATA_ID_DIB_MIO168_PAGER_IS_SELECTED = 484,
DATA_ID_DIB_MIO168_PAGER_SELECTED_PAGE = 485,
DATA_ID_DIB_PREL6_RELAYS = 486,
DATA_ID_DIB_PREL6_RELAY_IS_ON = 487,
DATA_ID_DIB_PREL6_RELAY_LABEL = 488,
DATA_ID_DIB_PREL6_RELAY_CYCLES = 489,
DATA_ID_DIB_PREL6_RELAY_LABEL_LABEL = 490,
DATA_ID_DIB_PREL6_IS_RELAY_1_OR_6 = 491,
DATA_ID_DIB_SMX46_ROUTES = 492,
DATA_ID_DIB_SMX46_ROUTE_OPEN = 493,
DATA_ID_DIB_SMX46_X_LABELS = 494,
DATA_ID_DIB_SMX46_X_LABEL = 495,
DATA_ID_DIB_SMX46_Y_LABELS = 496,
DATA_ID_DIB_SMX46_Y_LABEL = 497,
DATA_ID_DIB_SMX46_DAC1 = 498,
DATA_ID_DIB_SMX46_DAC2 = 499,
DATA_ID_DIB_SMX46_RELAY_ON = 500,
DATA_ID_DIB_SMX46_SIGNAL_RELAY_CYCLES = 501,
DATA_ID_DIB_SMX46_POWER_RELAY_CYCLES = 502,
DATA_ID_DIB_SMX46_ANALOG_OUTPUTS = 503,
DATA_ID_DIB_SMX46_AO_LABEL = 504,
DATA_ID_DIB_SMX46_AO1_LABEL = 505,
DATA_ID_DIB_SMX46_AO2_LABEL = 506,
DATA_ID_DIB_DCM220_SLOT_DEF_2CH_VIEW = 507,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_VIEW = 508,
DATA_ID_DIB_DCM220_SLOT_MIN_2CH_VIEW = 509,
DATA_ID_DIB_DCM220_SLOT_MICRO_2CH_VIEW = 510,
DATA_ID_DIB_DCM220_SLOT_2CH_CH1_INDEX = 511,
DATA_ID_DIB_DCM220_SLOT_2CH_CH2_INDEX = 512,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_MIN_VIEW = 513,
DATA_ID_FRONT_PANEL_SLOT1_VIEW = 514,
DATA_ID_SIMULATOR_LOAD_STATE = 515,
DATA_ID_SIMULATOR_LOAD_STATE2 = 516,
DATA_ID_SIMULATOR_LOAD = 517,
DATA_ID_SIMULATOR_LOAD2 = 518,
DATA_ID_MAIN_APP_VIEW = 519,
DATA_ID_FRONT_PANEL_SLOT2_VIEW = 520,
DATA_ID_FRONT_PANEL_SLOT3_VIEW = 521,
DATA_ID_DIB_DCM224_PWM_FREQUENCY = 522,
DATA_ID_DIB_DCM224_PWM_DUTY = 523,
DATA_ID_DIB_DCM224_COUNTERPHASE_FREQUENCY = 524,
DATA_ID_DIB_DCM224_COUNTERPHASE_DITHERING = 525,
DATA_ID_DIB_DCM224_PWM_ENABLED = 526,
DATA_ID_DIB_DCM224_SLOT_DEF_2CH_VIEW = 527,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_VIEW = 528,
DATA_ID_DIB_DCM224_SLOT_MIN_2CH_VIEW = 529,
DATA_ID_DIB_DCM224_SLOT_MICRO_2CH_VIEW = 530,
DATA_ID_DIB_DCM224_SLOT_2CH_CH1_INDEX = 531,
DATA_ID_DIB_DCM224_SLOT_2CH_CH2_INDEX = 532,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_MIN_VIEW = 533
};

void data_none(DataOperationEnum operation, Cursor cursor, Value &value);
Expand Down Expand Up @@ -994,6 +995,7 @@ void data_dib_mio168_ain_value(DataOperationEnum operation, Cursor cursor, Value
void data_dib_mio168_ain_mode(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_ain_range(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_ain_range_is_available(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_ain_is_dlog_active(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_ain_mode_and_range(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_ain_range_is_multiple_selection_available(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_ain_fault_status(DataOperationEnum operation, Cursor cursor, Value &value);
Expand Down Expand Up @@ -1993,38 +1995,38 @@ enum StylesEnum {
STYLE_ID_INLINE304 = 304,
STYLE_ID_INLINE305 = 305,
STYLE_ID_INLINE306 = 306,
STYLE_ID_MON_VALUE_48_RIGHT = 307,
STYLE_ID_INLINE307 = 307,
STYLE_ID_INLINE308 = 308,
STYLE_ID_MON_VALUE_20_LEFT = 309,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 310,
STYLE_ID_BAR_GRAPH_TEXT = 311,
STYLE_ID_BAR_GRAPH_SET_LINE = 312,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 313,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 314,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 315,
STYLE_ID_INLINE316 = 316,
STYLE_ID_TRIGGER_BUTTON_24 = 317,
STYLE_ID_INLINE318 = 318,
STYLE_ID_INLINE309 = 309,
STYLE_ID_MON_VALUE_48_RIGHT = 310,
STYLE_ID_INLINE311 = 311,
STYLE_ID_MON_VALUE_20_LEFT = 312,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 313,
STYLE_ID_BAR_GRAPH_TEXT = 314,
STYLE_ID_BAR_GRAPH_SET_LINE = 315,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 316,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 317,
STYLE_ID_LABELS_AND_COLORS_CHANNEL = 318,
STYLE_ID_INLINE319 = 319,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 320,
STYLE_ID_TRIGGER_BUTTON_14 = 321,
STYLE_ID_MON_VALUE_38_RIGHT = 322,
STYLE_ID_INLINE323 = 323,
STYLE_ID_CH_PROT_OFF = 324,
STYLE_ID_CH_PROT_ON = 325,
STYLE_ID_CH_PROT_TRIPPED = 326,
STYLE_ID_INLINE327 = 327,
STYLE_ID_MON_VALUE_20_RIGHT = 328,
STYLE_ID_MON_VALUE_14_LEFT = 329,
STYLE_ID_MON_VALUE_14_CENTER = 330,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 331,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 332,
STYLE_ID_MON_VALUE_14_RIGHT = 333,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 334,
STYLE_ID_MON_VALUE_24_RIGHT = 335,
STYLE_ID_INLINE336 = 336,
STYLE_ID_INLINE337 = 337,
STYLE_ID_INLINE338 = 338,
STYLE_ID_TRIGGER_BUTTON_24 = 320,
STYLE_ID_INLINE321 = 321,
STYLE_ID_INLINE322 = 322,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 323,
STYLE_ID_TRIGGER_BUTTON_14 = 324,
STYLE_ID_MON_VALUE_38_RIGHT = 325,
STYLE_ID_INLINE326 = 326,
STYLE_ID_CH_PROT_OFF = 327,
STYLE_ID_CH_PROT_ON = 328,
STYLE_ID_CH_PROT_TRIPPED = 329,
STYLE_ID_INLINE330 = 330,
STYLE_ID_MON_VALUE_20_RIGHT = 331,
STYLE_ID_MON_VALUE_14_LEFT = 332,
STYLE_ID_MON_VALUE_14_CENTER = 333,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 334,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 335,
STYLE_ID_MON_VALUE_14_RIGHT = 336,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 337,
STYLE_ID_MON_VALUE_24_RIGHT = 338,
STYLE_ID_INLINE339 = 339,
STYLE_ID_INLINE340 = 340,
STYLE_ID_INLINE341 = 341,
Expand All @@ -2033,7 +2035,10 @@ enum StylesEnum {
STYLE_ID_INLINE344 = 344,
STYLE_ID_INLINE345 = 345,
STYLE_ID_INLINE346 = 346,
STYLE_ID_INLINE347 = 347
STYLE_ID_INLINE347 = 347,
STYLE_ID_INLINE348 = 348,
STYLE_ID_INLINE349 = 349,
STYLE_ID_INLINE350 = 350
};

enum ThemesEnum {
Expand Down Expand Up @@ -2433,4 +2438,4 @@ enum PagesEnum {
PAGE_ID_DIB_DCM224_LABELS_AND_COLORS_CH = 285
};

extern const uint8_t assets[548975];
extern const uint8_t assets[549147];
Loading

0 comments on commit c3129c7

Please sign in to comment.