Skip to content

Commit

Permalink
#46
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Sep 2, 2020
1 parent b6832ae commit 09bbc6a
Show file tree
Hide file tree
Showing 67 changed files with 54,709 additions and 53,870 deletions.
4 changes: 2 additions & 2 deletions src/eez/action_impl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ void action_show_slot_settings() {

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

void action_show_ch_settings_prot_clear() {
Expand Down Expand Up @@ -1182,7 +1182,7 @@ void onSetModuleType(uint16_t moduleType) {

void selectSlotModuleType(int slotIndex) {
hmi::selectSlot(slotIndex);
pushSelectFromEnumPage(&g_frontPanelAppContext, ENUM_DEFINITION_MODULE_TYPE, g_slots[slotIndex]->moduleInfo->moduleType, NULL, onSetModuleType);
pushSelectFromEnumPage(&g_frontPanelAppContext, ENUM_DEFINITION_MODULE_TYPE, g_slots[slotIndex]->moduleType, NULL, onSetModuleType);
}

void action_front_panel_select_slot1() {
Expand Down
15 changes: 9 additions & 6 deletions src/eez/firmware.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,13 @@ void boot() {
uint16_t moduleRevision = value[1];
bool firmwareInstalled = value[2] == 0xA5A5;

g_slots[slotIndex] = getModuleInfo(moduleType)->createModule(slotIndex, moduleRevision, firmwareInstalled);
g_slots[slotIndex] = getModule(moduleType)->createModule();
g_slots[slotIndex]->slotIndex = slotIndex;
g_slots[slotIndex]->moduleRevision = moduleRevision;
g_slots[slotIndex]->firmwareInstalled = firmwareInstalled;
g_slots[slotIndex]->boot();

if (g_slots[slotIndex]->moduleInfo->moduleType != MODULE_TYPE_NONE) {
if (g_slots[slotIndex]->moduleType != MODULE_TYPE_NONE) {
psu::persist_conf::loadModuleConf(slotIndex);
psu::ontime::g_moduleCounters[slotIndex].init();

Expand All @@ -151,10 +154,10 @@ void boot() {
if (numInstalledModules == 1) {
g_isCol2Mode = true;

if (g_slots[0]->moduleInfo->moduleType == MODULE_TYPE_NONE) {
if (g_slots[0]->moduleType == MODULE_TYPE_NONE) {
int i;
for (i = 1; i < NUM_SLOTS; i++) {
if (g_slots[i]->moduleInfo->moduleType != MODULE_TYPE_NONE) {
if (g_slots[i]->moduleType != MODULE_TYPE_NONE) {
g_slotIndexes[0] = i - 1;
g_slotIndexes[1] = i;
break;
Expand All @@ -174,7 +177,7 @@ void boot() {

int j = 0;
for (int i = 0; i < NUM_SLOTS; i++) {
if (g_slots[i]->moduleInfo->moduleType != MODULE_TYPE_NONE) {
if (g_slots[i]->moduleType != MODULE_TYPE_NONE) {
g_slotIndexes[j++] = i;
} else {
g_slotIndexes[2] = i;
Expand Down Expand Up @@ -388,7 +391,7 @@ void shutdown() {
// save on-time counters
persist_conf::writeTotalOnTime(ontime::g_mcuCounter.getType(), ontime::g_mcuCounter.getTotalTime());
for (int slotIndex = 0; slotIndex < NUM_SLOTS; slotIndex++) {
if (g_slots[slotIndex]->moduleInfo->moduleType != MODULE_TYPE_NONE) {
if (g_slots[slotIndex]->moduleType != MODULE_TYPE_NONE) {
persist_conf::writeTotalOnTime(ontime::g_moduleCounters[slotIndex].getType(), ontime::g_moduleCounters[slotIndex].getTotalTime());
}
}
Expand Down
64,884 changes: 32,466 additions & 32,418 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

153 changes: 86 additions & 67 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,34 +419,41 @@ enum DataEnum {
DATA_ID_DIB_MIO168_OUTPUT_STATE = 417,
DATA_ID_DIB_MIO168_ANALOG_INPUTS = 418,
DATA_ID_DIB_MIO168_ANALOG_INPUT_VALUE = 419,
DATA_ID_DIB_SMX46_OUTPUTS = 420,
DATA_ID_DIB_DCM220_SLOT_DEF_2CH_VIEW = 421,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_VIEW = 422,
DATA_ID_DIB_DCM220_SLOT_MIN_2CH_VIEW = 423,
DATA_ID_DIB_DCM220_SLOT_MICRO_2CH_VIEW = 424,
DATA_ID_DIB_DCM220_SLOT_2CH_CH1_INDEX = 425,
DATA_ID_DIB_DCM220_SLOT_2CH_CH2_INDEX = 426,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_MIN_VIEW = 427,
DATA_ID_FRONT_PANEL_SLOT1_VIEW = 428,
DATA_ID_SIMULATOR_LOAD_STATE = 429,
DATA_ID_SIMULATOR_LOAD_STATE2 = 430,
DATA_ID_SIMULATOR_LOAD = 431,
DATA_ID_SIMULATOR_LOAD2 = 432,
DATA_ID_MAIN_APP_VIEW = 433,
DATA_ID_FRONT_PANEL_SLOT2_VIEW = 434,
DATA_ID_FRONT_PANEL_SLOT3_VIEW = 435,
DATA_ID_DIB_DCM224_PWM_FREQUENCY = 436,
DATA_ID_DIB_DCM224_PWM_DUTY = 437,
DATA_ID_DIB_DCM224_COUNTERPHASE_FREQUENCY = 438,
DATA_ID_DIB_DCM224_COUNTERPHASE_DITHERING = 439,
DATA_ID_DIB_DCM224_PWM_ENABLED = 440,
DATA_ID_DIB_DCM224_SLOT_DEF_2CH_VIEW = 441,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_VIEW = 442,
DATA_ID_DIB_DCM224_SLOT_MIN_2CH_VIEW = 443,
DATA_ID_DIB_DCM224_SLOT_MICRO_2CH_VIEW = 444,
DATA_ID_DIB_DCM224_SLOT_2CH_CH1_INDEX = 445,
DATA_ID_DIB_DCM224_SLOT_2CH_CH2_INDEX = 446,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_MIN_VIEW = 447
DATA_ID_DIB_SMX46_ROUTES = 420,
DATA_ID_DIB_SMX46_ROUTE_OPEN = 421,
DATA_ID_DIB_SMX46_X_LABELS = 422,
DATA_ID_DIB_SMX46_X_LABEL = 423,
DATA_ID_DIB_SMX46_Y_LABELS = 424,
DATA_ID_DIB_SMX46_Y_LABEL = 425,
DATA_ID_DIB_SMX46_DAC1 = 426,
DATA_ID_DIB_SMX46_DAC2 = 427,
DATA_ID_DIB_DCM220_SLOT_DEF_2CH_VIEW = 428,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_VIEW = 429,
DATA_ID_DIB_DCM220_SLOT_MIN_2CH_VIEW = 430,
DATA_ID_DIB_DCM220_SLOT_MICRO_2CH_VIEW = 431,
DATA_ID_DIB_DCM220_SLOT_2CH_CH1_INDEX = 432,
DATA_ID_DIB_DCM220_SLOT_2CH_CH2_INDEX = 433,
DATA_ID_DIB_DCM220_SLOT_MAX_2CH_MIN_VIEW = 434,
DATA_ID_FRONT_PANEL_SLOT1_VIEW = 435,
DATA_ID_SIMULATOR_LOAD_STATE = 436,
DATA_ID_SIMULATOR_LOAD_STATE2 = 437,
DATA_ID_SIMULATOR_LOAD = 438,
DATA_ID_SIMULATOR_LOAD2 = 439,
DATA_ID_MAIN_APP_VIEW = 440,
DATA_ID_FRONT_PANEL_SLOT2_VIEW = 441,
DATA_ID_FRONT_PANEL_SLOT3_VIEW = 442,
DATA_ID_DIB_DCM224_PWM_FREQUENCY = 443,
DATA_ID_DIB_DCM224_PWM_DUTY = 444,
DATA_ID_DIB_DCM224_COUNTERPHASE_FREQUENCY = 445,
DATA_ID_DIB_DCM224_COUNTERPHASE_DITHERING = 446,
DATA_ID_DIB_DCM224_PWM_ENABLED = 447,
DATA_ID_DIB_DCM224_SLOT_DEF_2CH_VIEW = 448,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_VIEW = 449,
DATA_ID_DIB_DCM224_SLOT_MIN_2CH_VIEW = 450,
DATA_ID_DIB_DCM224_SLOT_MICRO_2CH_VIEW = 451,
DATA_ID_DIB_DCM224_SLOT_2CH_CH1_INDEX = 452,
DATA_ID_DIB_DCM224_SLOT_2CH_CH2_INDEX = 453,
DATA_ID_DIB_DCM224_SLOT_MAX_2CH_MIN_VIEW = 454
};

void data_none(DataOperationEnum operation, Cursor cursor, Value &value);
Expand Down Expand Up @@ -869,7 +876,14 @@ void data_dib_mio168_output_no(DataOperationEnum operation, Cursor cursor, Value
void data_dib_mio168_output_state(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_analog_inputs(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_mio168_analog_input_value(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_outputs(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_routes(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_route_open(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_x_labels(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_x_label(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_y_labels(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_y_label(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_dac1(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_smx46_dac2(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_dcm220_slot_def_2ch_view(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_dcm220_slot_max_2ch_view(DataOperationEnum operation, Cursor cursor, Value &value);
void data_dib_dcm220_slot_min_2ch_view(DataOperationEnum operation, Cursor cursor, Value &value);
Expand Down Expand Up @@ -1131,12 +1145,13 @@ enum ActionsEnum {
ACTION_ID_TOGGLE_DISPLAY_TEST_COLOR_INDEX = 225,
ACTION_ID_SHOW_DISPLAY_TEST_PAGE = 226,
ACTION_ID_DIB_MIO168_TOGGLE_OUTPUT_STATE = 227,
ACTION_ID_FRONT_PANEL_SELECT_SLOT1 = 228,
ACTION_ID_FRONT_PANEL_SELECT_SLOT2 = 229,
ACTION_ID_FRONT_PANEL_SELECT_SLOT3 = 230,
ACTION_ID_SIMULATOR_LOAD = 231,
ACTION_ID_DIB_DCM224_CH_SETTINGS_ADV_TOGGLE_COUNTERPHASE_DITHERING = 232,
ACTION_ID_DIB_DCM224_CH_SETTINGS_ADV_TOGGLE_PWM_ENABLED = 233
ACTION_ID_DIB_SMX46_TOGGLE_ROUTE = 228,
ACTION_ID_FRONT_PANEL_SELECT_SLOT1 = 229,
ACTION_ID_FRONT_PANEL_SELECT_SLOT2 = 230,
ACTION_ID_FRONT_PANEL_SELECT_SLOT3 = 231,
ACTION_ID_SIMULATOR_LOAD = 232,
ACTION_ID_DIB_DCM224_CH_SETTINGS_ADV_TOGGLE_COUNTERPHASE_DITHERING = 233,
ACTION_ID_DIB_DCM224_CH_SETTINGS_ADV_TOGGLE_PWM_ENABLED = 234
};

void action_channel_toggle_output();
Expand Down Expand Up @@ -1366,6 +1381,7 @@ void action_select_usb_device_class();
void action_toggle_display_test_color_index();
void action_show_display_test_page();
void action_dib_mio168_toggle_output_state();
void action_dib_smx46_toggle_route();
void action_front_panel_select_slot1();
void action_front_panel_select_slot2();
void action_front_panel_select_slot3();
Expand Down Expand Up @@ -1688,47 +1704,50 @@ enum StylesEnum {
STYLE_ID_INLINE269 = 269,
STYLE_ID_INLINE270 = 270,
STYLE_ID_INLINE271 = 271,
STYLE_ID_MON_VALUE_48_RIGHT = 272,
STYLE_ID_INLINE272 = 272,
STYLE_ID_INLINE273 = 273,
STYLE_ID_MON_VALUE_20_LEFT = 274,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 275,
STYLE_ID_BAR_GRAPH_TEXT = 276,
STYLE_ID_BAR_GRAPH_SET_LINE = 277,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 278,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 279,
STYLE_ID_INLINE280 = 280,
STYLE_ID_INLINE281 = 281,
STYLE_ID_TRIGGER_BUTTON_24 = 282,
STYLE_ID_INLINE274 = 274,
STYLE_ID_MON_VALUE_48_RIGHT = 275,
STYLE_ID_INLINE276 = 276,
STYLE_ID_MON_VALUE_20_LEFT = 277,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 278,
STYLE_ID_BAR_GRAPH_TEXT = 279,
STYLE_ID_BAR_GRAPH_SET_LINE = 280,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 281,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 282,
STYLE_ID_INLINE283 = 283,
STYLE_ID_INLINE284 = 284,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 285,
STYLE_ID_TRIGGER_BUTTON_14 = 286,
STYLE_ID_INST_SELECTED = 287,
STYLE_ID_MON_VALUE_38_RIGHT = 288,
STYLE_ID_INLINE289 = 289,
STYLE_ID_CH_PROT_OFF = 290,
STYLE_ID_CH_PROT_ON = 291,
STYLE_ID_CH_PROT_TRIPPED = 292,
STYLE_ID_INLINE293 = 293,
STYLE_ID_MON_VALUE_20_RIGHT = 294,
STYLE_ID_MON_VALUE_14_LEFT = 295,
STYLE_ID_MON_VALUE_14_CENTER = 296,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 297,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 298,
STYLE_ID_MON_VALUE_14_RIGHT = 299,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 300,
STYLE_ID_MON_VALUE_24_RIGHT = 301,
STYLE_ID_INLINE302 = 302,
STYLE_ID_INLINE303 = 303,
STYLE_ID_INLINE304 = 304,
STYLE_ID_TRIGGER_BUTTON_24 = 285,
STYLE_ID_INLINE286 = 286,
STYLE_ID_INLINE287 = 287,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 288,
STYLE_ID_TRIGGER_BUTTON_14 = 289,
STYLE_ID_INST_SELECTED = 290,
STYLE_ID_MON_VALUE_38_RIGHT = 291,
STYLE_ID_INLINE292 = 292,
STYLE_ID_CH_PROT_OFF = 293,
STYLE_ID_CH_PROT_ON = 294,
STYLE_ID_CH_PROT_TRIPPED = 295,
STYLE_ID_INLINE296 = 296,
STYLE_ID_MON_VALUE_20_RIGHT = 297,
STYLE_ID_MON_VALUE_14_LEFT = 298,
STYLE_ID_MON_VALUE_14_CENTER = 299,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 300,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 301,
STYLE_ID_MON_VALUE_14_RIGHT = 302,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 303,
STYLE_ID_MON_VALUE_24_RIGHT = 304,
STYLE_ID_INLINE305 = 305,
STYLE_ID_INLINE306 = 306,
STYLE_ID_INLINE307 = 307,
STYLE_ID_INLINE308 = 308,
STYLE_ID_INLINE309 = 309,
STYLE_ID_INLINE310 = 310,
STYLE_ID_INLINE311 = 311,
STYLE_ID_INLINE312 = 312
STYLE_ID_INLINE312 = 312,
STYLE_ID_INLINE313 = 313,
STYLE_ID_INLINE314 = 314,
STYLE_ID_INLINE315 = 315
};

enum ThemesEnum {
Expand Down Expand Up @@ -2043,4 +2062,4 @@ enum PagesEnum {
PAGE_ID_DIB_DCM224_SLOT_MICRO_2CH_OFF = 242
};

extern const uint8_t assets[530079];
extern const uint8_t assets[530710];
Loading

0 comments on commit 09bbc6a

Please sign in to comment.