Skip to content

Commit 477d8b0

Browse files
committed
#118 unfinished
1 parent 9d6674a commit 477d8b0

15 files changed

+55957
-55205
lines changed

modular-psu-firmware.eez-project

+516-59
Large diffs are not rendered by default.

src/eez/action_impl.cpp

+1-71
Original file line numberDiff line numberDiff line change
@@ -1151,19 +1151,7 @@ void action_drag_overlay() {
11511151
}
11521152

11531153
void action_show_dlog_params() {
1154-
pushPage(PAGE_ID_DLOG_PARAMS);
1155-
}
1156-
1157-
void action_dlog_voltage_toggle() {
1158-
dlog_record::g_guiParameters.logVoltage[getFoundWidgetAtDown().cursor] = !dlog_record::g_guiParameters.logVoltage[getFoundWidgetAtDown().cursor];
1159-
}
1160-
1161-
void action_dlog_current_toggle() {
1162-
dlog_record::g_guiParameters.logCurrent[getFoundWidgetAtDown().cursor] = !dlog_record::g_guiParameters.logCurrent[getFoundWidgetAtDown().cursor];
1163-
}
1164-
1165-
void action_dlog_power_toggle() {
1166-
dlog_record::g_guiParameters.logPower[getFoundWidgetAtDown().cursor] = !dlog_record::g_guiParameters.logPower[getFoundWidgetAtDown().cursor];
1154+
pushPage(PAGE_ID_DLOG_PARAMS_OLD);
11671155
}
11681156

11691157
void action_dlog_edit_period() {
@@ -1178,10 +1166,6 @@ void action_dlog_edit_file_name() {
11781166
editValue(DATA_ID_DLOG_FILE_NAME);
11791167
}
11801168

1181-
void action_dlog_toggle() {
1182-
dlog_record::toggleStop();
1183-
}
1184-
11851169
void action_show_dlog_view() {
11861170
dlog_view::g_showLatest = true;
11871171
if (!dlog_record::isExecuting()) {
@@ -1190,64 +1174,10 @@ void action_show_dlog_view() {
11901174
showPage(PAGE_ID_DLOG_VIEW);
11911175
}
11921176

1193-
void action_dlog_start_recording() {
1194-
popPage();
1195-
1196-
char filePath[MAX_PATH_LENGTH + 50];
1197-
1198-
if (isStringEmpty(dlog_record::g_guiParameters.filePath)) {
1199-
uint8_t year, month, day, hour, minute, second;
1200-
datetime::getDateTime(year, month, day, hour, minute, second);
1201-
1202-
if (persist_conf::devConf.dateTimeFormat == datetime::FORMAT_DMY_24) {
1203-
snprintf(filePath, sizeof(filePath), "%s/%s%02d_%02d_%02d-%02d_%02d_%02d.dlog",
1204-
RECORDINGS_DIR,
1205-
dlog_record::g_guiParameters.filePath,
1206-
(int)day, (int)month, (int)year,
1207-
(int)hour, (int)minute, (int)second);
1208-
} else if (persist_conf::devConf.dateTimeFormat == datetime::FORMAT_MDY_24) {
1209-
snprintf(filePath, sizeof(filePath), "%s/%s%02d_%02d_%02d-%02d_%02d_%02d.dlog",
1210-
RECORDINGS_DIR,
1211-
dlog_record::g_guiParameters.filePath,
1212-
(int)month, (int)day, (int)year,
1213-
(int)hour, (int)minute, (int)second);
1214-
} else if (persist_conf::devConf.dateTimeFormat == datetime::FORMAT_DMY_12) {
1215-
bool am;
1216-
datetime::convertTime24to12(hour, am);
1217-
snprintf(filePath, sizeof(filePath), "%s/%s%02d_%02d_%02d-%02d_%02d_%02d_%s.dlog",
1218-
RECORDINGS_DIR,
1219-
dlog_record::g_guiParameters.filePath,
1220-
(int)day, (int)month, (int)year,
1221-
(int)hour, (int)minute, (int)second, am ? "AM" : "PM");
1222-
} else if (persist_conf::devConf.dateTimeFormat == datetime::FORMAT_MDY_12) {
1223-
bool am;
1224-
datetime::convertTime24to12(hour, am);
1225-
snprintf(filePath, sizeof(filePath), "%s/%s%02d_%02d_%02d-%02d_%02d_%02d_%s.dlog",
1226-
RECORDINGS_DIR,
1227-
dlog_record::g_guiParameters.filePath,
1228-
(int)month, (int)day, (int)year,
1229-
(int)hour, (int)minute, (int)second, am ? "AM" : "PM");
1230-
}
1231-
} else {
1232-
snprintf(filePath, sizeof(filePath), "%s/%s.dlog", RECORDINGS_DIR, dlog_record::g_guiParameters.filePath);
1233-
}
1234-
1235-
memcpy(&dlog_record::g_parameters, &dlog_record::g_guiParameters, sizeof(dlog_record::g_guiParameters));
1236-
strcpy(dlog_record::g_parameters.filePath, filePath);
1237-
1238-
dlog_record::toggleStart();
1239-
}
1240-
12411177
void action_dlog_view_show_overlay_options() {
12421178
pushPage(PAGE_ID_DLOG_VIEW_OVERLAY_OPTIONS);
12431179
}
12441180

1245-
void action_dlog_value_toggle() {
1246-
dlog_view::Recording &recording = dlog_view::getRecording();
1247-
int dlogValueIndex = getFoundWidgetAtDown().cursor;
1248-
recording.dlogValues[dlogValueIndex].isVisible = !recording.dlogValues[dlogValueIndex].isVisible;
1249-
}
1250-
12511181
void onSelectDlogViewLegendViewOption(uint16_t value) {
12521182
popPage();
12531183
persist_conf::setDlogViewLegendViewOption((persist_conf::DlogViewLegendViewOption)value);

src/eez/gui/document_simulator.cpp

+33,391-33,336
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)