remember inhibit by user flag

eez-open · Feb 20, 2020 · dc661ba · dc661ba
1 parent 2415c2b
commit dc661ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/eez/modules/psu/io_pins.cpp b/src/eez/modules/psu/io_pins.cpp
@@ -53,8 +53,6 @@ static uint32_t g_toutputPulseStartTickCount;
 
 static bool g_pinState[NUM_IO_PINS] = { false, false, false, false };
 
-static bool g_isInhibitedByUser;
-
 #if defined EEZ_PLATFORM_STM32
 
 int ioPinRead(int pin) {
@@ -181,7 +179,7 @@ void tick(uint32_t tickCount) {
     int inputPin2Value = ioPinRead(EXT_TRIG2);
     bool inputPin2State = (inputPin2Value && inputPin2.polarity == io_pins::POLARITY_POSITIVE) || (!inputPin2Value && inputPin2.polarity == io_pins::POLARITY_NEGATIVE);
 
-    unsigned inhibited = g_isInhibitedByUser;
+    unsigned inhibited = persist_conf::devConf.isInhibitedByUser;
 
     if (!inhibited) {
         if (inputPin1.function == io_pins::FUNCTION_INHIBIT) {
@@ -295,11 +293,11 @@ void refresh() {
 }
 
 bool getIsInhibitedByUser() {
-    return g_isInhibitedByUser;
+    return persist_conf::devConf.isInhibitedByUser;
 }
 
 void setIsInhibitedByUser(bool isInhibitedByUser) {
-    g_isInhibitedByUser = isInhibitedByUser;
+    persist_conf::setIsInhibitedByUser(isInhibitedByUser);
 }
 
 bool isInhibited() {

diff --git a/src/eez/modules/psu/persist_conf.cpp b/src/eez/modules/psu/persist_conf.cpp
@@ -1212,6 +1212,10 @@ void setEventQueueFilter(int eventQueueFilter) {
     g_devConf.eventQueueFilter = eventQueueFilter;
 }
 
+void setIsInhibitedByUser(int isInhibitedByUser) {
+    g_devConf.isInhibitedByUser = isInhibitedByUser;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 static const uint16_t MODULE_PERSIST_CONF_BLOCK_MODULE_CONFIGURATION_ADDRESS = 64;

diff --git a/src/eez/modules/psu/persist_conf.h b/src/eez/modules/psu/persist_conf.h
@@ -162,6 +162,7 @@ struct DeviceConfiguration {
     unsigned channelsViewMode : 3;
     unsigned maxChannel : 3; // 0: default view, 1: Ch1 maxed, 2: Ch2 maxed, ...
     unsigned channelsViewModeInMax : 3;
+    unsigned isInhibitedByUser : 1;
 
     // block 7
     UserSwitchAction userSwitchAction;
@@ -315,6 +316,8 @@ void setSortFilesOption(SortFilesOption sortFilesOption);
 
 void setEventQueueFilter(int eventQueueFilter);
 
+void setIsInhibitedByUser(int isInhibitedByUser);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 struct ModuleConfiguration {