DP AUTO mode removed

eez-open · Dec 16, 2019 · b2bb882 · b2bb882
1 parent 139c262
commit b2bb882
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/eez/index.h b/src/eez/index.h
@@ -49,8 +49,7 @@ enum AdcDataType {
 
 enum DprogState {
     DPROG_STATE_OFF = 0,
-    DPROG_STATE_ON = 1,
-    DPROG_STATE_AUTO = 2
+    DPROG_STATE_ON = 1
 };
 
 enum ChannelFeatures {

diff --git a/src/eez/modules/dcpX05/channel.cpp b/src/eez/modules/dcpX05/channel.cpp
@@ -177,15 +177,15 @@ struct Channel : ChannelInterface {
 		adc.init();
 		dac.init();
 
-        dprogState = DPROG_STATE_AUTO;
+        dprogState = DPROG_STATE_ON;
 	}
 
 	void onPowerDown(int subchannelIndex) {
 	}
 
 	void reset(int subchannelIndex) {
 		uSet = 0;
-        dprogState = DPROG_STATE_AUTO;
+        dprogState = DPROG_STATE_ON;
         dpOn = false;
 		uBeforeBalancing = NAN;
 		iBeforeBalancing = NAN;
@@ -239,9 +239,9 @@ struct Channel : ChannelInterface {
 		}
 
 		if (channel.params.features & CH_FEATURE_DPROG) {
-			if (dprogState == DPROG_STATE_AUTO) {
+			if (dprogState == DPROG_STATE_ON) {
 				// turn off DP after delay
-				if (delayed_dp_off && (micros() - delayed_dp_off_start) >= DP_OFF_DELAY_PERIOD * 1000000L) {
+				if (delayed_dp_off && (millis() - delayed_dp_off_start) >= DP_OFF_DELAY_PERIOD) {
 					delayed_dp_off = false;
 					setDpEnable(false);
 				}
@@ -422,7 +422,7 @@ struct Channel : ChannelInterface {
 
 		if (enable) {
 			if (channel.params.features & CH_FEATURE_DPROG) {			
-				if (dprogState == DPROG_STATE_AUTO) {
+				if (dprogState == DPROG_STATE_ON) {
 					// enable DP
 					dpNegMonitoringTime = micros();
 					delayed_dp_off = false;
@@ -464,10 +464,10 @@ struct Channel : ChannelInterface {
 			setCurrentRange(subchannelIndex);
 
 			if (channel.params.features & CH_FEATURE_DPROG) {			
-				if (dprogState == DPROG_STATE_AUTO) {
+				if (dprogState == DPROG_STATE_ON) {
 					// turn off DP after some delay
 					delayed_dp_off = true;
-					delayed_dp_off_start = micros();
+					delayed_dp_off_start = millis();
 				}
 			}
 		}
@@ -515,8 +515,6 @@ struct Channel : ChannelInterface {
 
 			if (dprogState == DPROG_STATE_OFF) {
 				setDpEnable(false);
-			} else if (dprogState == DPROG_STATE_ON) {
-				setDpEnable(true);
 			} else {
 				setDpEnable(channel.isOutputEnabled());
 			}

diff --git a/src/eez/modules/psu/conf_advanced.h b/src/eez/modules/psu/conf_advanced.h
@@ -122,8 +122,8 @@
 
 /// This is the delay period, after the channel output went OFF,
 /// after which we shall turn DP off.
-/// Value is given in seconds.
-#define DP_OFF_DELAY_PERIOD 1
+/// Value is given in milliseconds.
+#define DP_OFF_DELAY_PERIOD 10
 
 /// Text returned by the SYStem:CAPability command
 #define STR_SYST_CAP "DCSUPPLY WITH (MEASURE|MULTIPLE|TRIGGER)"

diff --git a/src/eez/modules/psu/gui/page_ch_settings_adv.cpp b/src/eez/modules/psu/gui/page_ch_settings_adv.cpp
@@ -47,8 +47,6 @@ void ChSettingsAdvOptionsPage::toggleProgramming() {
 void ChSettingsAdvOptionsPage::toggleDprog() {
     if (g_channel->getDprogState() == DPROG_STATE_OFF) {
         g_channel->setDprogState(DPROG_STATE_ON);
-    } else if (g_channel->getDprogState() == DPROG_STATE_ON) {
-        g_channel->setDprogState(DPROG_STATE_AUTO);
     } else {
         g_channel->setDprogState(DPROG_STATE_OFF);
     }

diff --git a/src/eez/modules/psu/profile.cpp b/src/eez/modules/psu/profile.cpp
@@ -221,7 +221,13 @@ void recallChannelsFromProfile(Parameters *profile, int location) {
             channel.flags.currentRangeSelectionMode = profile->channels[i].flags.currentRangeSelectionMode;
             channel.flags.autoSelectCurrentRange = profile->channels[i].flags.autoSelectCurrentRange;
 
-            channel.setDprogState((DprogState)profile->channels[i].flags.dprogState);
+            DprogState dprogState = (DprogState)profile->channels[i].flags.dprogState;
+            if (dprogState == DPROG_STATE_OFF) {
+                channel.setDprogState(DPROG_STATE_OFF);
+            } else {
+                channel.setDprogState(DPROG_STATE_ON);
+            }
+
             channel.flags.trackingEnabled = profile->channels[i].flags.trackingEnabled;
 
 #if OPTION_SD_CARD

diff --git a/src/eez/modules/psu/scpi/outp.cpp b/src/eez/modules/psu/scpi/outp.cpp
@@ -209,7 +209,6 @@ scpi_result_t scpi_cmd_outputStateTriggeredQ(scpi_t *context) {
 scpi_choice_def_t dprogStateChoice[] = {
     { "ON", DPROG_STATE_ON },
     { "OFF", DPROG_STATE_OFF },
-    { "AUTO", DPROG_STATE_AUTO },
     SCPI_CHOICE_LIST_END /* termination of option list */
 };