Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Jun 5, 2021
1 parent aca0277 commit ef49393
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/eez/modules/dib-dcp405/dib-dcp405.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ struct DcpChannel : public Channel {
params.I_LOW_RANGE_CAL_POINTS = I_LOW_RANGE_CAL_POINTS;
params.I_LOW_RANGE_CAL_U_SET = 30.0f;

params.OVP_DEFAULT_STATE = false;
params.OVP_DEFAULT_STATE = true;
params.OVP_MIN_DELAY = 0.0f;
params.OVP_DEFAULT_DELAY = 0.0f;
params.OVP_MAX_DELAY = 10.0f;
Expand Down
2 changes: 1 addition & 1 deletion src/eez/modules/psu/conf_advanced.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
/// greater then width of YT widget.
#define CHANNEL_HISTORY_SIZE 512

#define GUI_YT_VIEW_RATE_DEFAULT 0.1f
#define GUI_YT_VIEW_RATE_DEFAULT 0.005f
#define GUI_YT_VIEW_RATE_MIN 0.005f
#define GUI_YT_VIEW_RATE_MAX 300.0f

Expand Down
7 changes: 6 additions & 1 deletion src/eez/modules/psu/dlog_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,12 @@ void stateManagment() {
openFile(dlog_record::getLatestFilePath());
}
}
}
} else if (isExecuting && !g_wasExecuting) {
if (psu::gui::getActivePageId() == PAGE_ID_MAIN) {
gui::showPage(PAGE_ID_DLOG_VIEW);
openFile(dlog_record::getLatestFilePath());
}
}
g_wasExecuting = isExecuting;

if (g_refreshed) {
Expand Down
4 changes: 2 additions & 2 deletions src/eez/modules/psu/persist_conf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void initDefaultDevConf() {
g_defaultDevConf.dstRule = datetime::DST_RULE_OFF;

// block 3
g_defaultDevConf.profileAutoRecallEnabled = 0;
g_defaultDevConf.profileAutoRecallEnabled = 1;

g_defaultDevConf.outputProtectionCouple = 0;
g_defaultDevConf.shutdownWhenProtectionTripped = 0;
Expand Down Expand Up @@ -180,7 +180,7 @@ void initDefaultDevConf() {
g_defaultDevConf.ytGraphUpdateMethod = YT_GRAPH_UPDATE_METHOD_SCROLL;

// block 7
g_defaultDevConf.userSwitchAction = USER_SWITCH_ACTION_INHIBIT;
g_defaultDevConf.userSwitchAction = USER_SWITCH_ACTION_NONE;
g_defaultDevConf.sortFilesOption = SORT_FILES_BY_TIME_DESC;
g_defaultDevConf.eventQueueFilter = event_queue::EVENT_TYPE_INFO;
g_defaultDevConf.viewFlags.dlogViewLegendViewOption = DLOG_VIEW_LEGEND_VIEW_OPTION_DOCK;
Expand Down

0 comments on commit ef49393

Please sign in to comment.