standby fixed

eez-open · Nov 6, 2019 · b53a650 · b53a650
1 parent 47f0aaa
commit b53a650
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/src/eez/apps/psu/channel.cpp b/src/eez/apps/psu/channel.cpp
@@ -361,6 +361,8 @@ void Channel::onPowerDown() {
 
     clearProtection(false);
 
+    channelInterface->onPowerDown(subchannelIndex);
+
     profile::enableSave(last_save_enabled);
 }
 

diff --git a/src/eez/apps/psu/scpi/syst.cpp b/src/eez/apps/psu/scpi/syst.cpp
@@ -88,7 +88,7 @@ scpi_result_t scpi_cmd_systemPower(scpi_t *context) {
 
     osDelay(1000);
 
-    if (!isPowerUp()) {
+    if (up != isPowerUp()) {
         SCPI_ErrorPush(context, SCPI_ERROR_EXECUTION_ERROR);
         return SCPI_RES_ERR;
     }

diff --git a/src/eez/index.h b/src/eez/index.h
@@ -141,6 +141,7 @@ struct ChannelInterface {
     virtual void getParams(int subchannelIndex, ChannelParams &params) = 0;
 
     virtual void init(int subchannelIndex) = 0;
+    virtual void onPowerDown(int subchannelIndex) = 0;
     virtual void reset(int subchannelIndex) = 0;
     virtual void test(int subchannelIndex) = 0;
     virtual void tick(int subchannelIndex, uint32_t tickCount) = 0;

diff --git a/src/eez/modules/dcm220/channel.cpp b/src/eez/modules/dcm220/channel.cpp
@@ -247,6 +247,12 @@ struct Channel : ChannelInterface {
 #endif
 	}
 
+	void onPowerDown(int subchannelIndex) {
+#if defined(EEZ_PLATFORM_STM32)
+		synchronized = false;
+#endif
+	}
+
 	void reset(int subchannelIndex) {
 	}
 

diff --git a/src/eez/modules/dcpX05/channel.cpp b/src/eez/modules/dcpX05/channel.cpp
@@ -180,6 +180,9 @@ struct Channel : ChannelInterface {
         dprogState = DPROG_STATE_AUTO;
 	}
 
+	void onPowerDown(int subchannelIndex) {
+	}
+
 	void reset(int subchannelIndex) {
 		uSet = 0;
         dprogState = DPROG_STATE_AUTO;