#46

eez-open · Sep 16, 2020 · 30ab4ac · 30ab4ac
1 parent 04c6f8c
commit 30ab4ac
Show file tree

Hide file tree

Showing 12 changed files with 12,551 additions and 12,540 deletions.
diff --git a/images/Module MIO168.png b/images/Module MIO168.png
diff --git a/images/Module SMX46.png b/images/Module SMX46.png
diff --git a/src/eez/gui/document_simulator.cpp b/src/eez/gui/document_simulator.cpp
diff --git a/src/eez/gui/document_simulator.h b/src/eez/gui/document_simulator.h
@@ -2081,4 +2081,4 @@ enum PagesEnum {
     PAGE_ID_DIB_DCM224_SLOT_MICRO_2CH_OFF = 244
 };
 
-extern const uint8_t assets[531686];
+extern const uint8_t assets[531519];
diff --git a/src/eez/modules/dib-dcp405/dib-dcp405.cpp b/src/eez/modules/dib-dcp405/dib-dcp405.cpp
@@ -575,14 +575,18 @@ struct DcpChannel : public Channel {
 	}
 
     void setDprogState(DprogState dprogState) override {
-		Channel::setDprogState(dprogState);
-
-		if (dprogState == DPROG_STATE_OFF) {
-			setDpEnable(false);
+		if (!isPsuThread()) {
+			sendMessageToPsu(PSU_MESSAGE_SET_DPROG_STATE, (channelIndex << 8) | dprogState);
 		} else {
-			setDpEnable(isOk() && ioexp.testBit(IOExpander::IO_BIT_OUT_OUTPUT_ENABLE));
+			Channel::setDprogState(dprogState);
+
+			if (dprogState == DPROG_STATE_OFF) {
+				setDpEnable(false);
+			} else {
+				setDpEnable(isOk() && ioexp.testBit(IOExpander::IO_BIT_OUT_OUTPUT_ENABLE));
+			}
+			delayed_dp_off = false;
 		}
-		delayed_dp_off = false;
     }
 
     void setRemoteSense(bool enable) override {

diff --git a/src/eez/modules/dib-mio168/dib-mio168.eez-project b/src/eez/modules/dib-mio168/dib-mio168.eez-project
diff --git a/src/eez/modules/dib-smx46/dib-smx46.eez-project b/src/eez/modules/dib-smx46/dib-smx46.eez-project
diff --git a/src/eez/modules/psu/channel.cpp b/src/eez/modules/psu/channel.cpp
@@ -1173,12 +1173,16 @@ bool Channel::isRemoteSensingEnabled() {
 }
 
 void Channel::remoteProgrammingEnable(bool enable) {
-    if (enable != flags.rprogEnabled) {
-        if (trigger::isActive()) {
-            trigger::abort();
+    if (!isPsuThread()) {
+        sendMessageToPsu(PSU_MESSAGE_REMOTE_PROGRAMMING_ENABLE, (channelIndex << 8) | (enable ? 1 : 0));
+    } else {
+        if (enable != flags.rprogEnabled) {
+            if (trigger::isActive()) {
+                trigger::abort();
+            }
+            doRemoteProgrammingEnable(enable);
+            event_queue::pushChannelEvent((enable ? event_queue::EVENT_INFO_CH_REMOTE_PROG_ENABLED : event_queue::EVENT_INFO_CH_REMOTE_PROG_DISABLED), channelIndex);
         }
-        doRemoteProgrammingEnable(enable);
-        event_queue::pushChannelEvent((enable ? event_queue::EVENT_INFO_CH_REMOTE_PROG_ENABLED : event_queue::EVENT_INFO_CH_REMOTE_PROG_DISABLED), channelIndex);
     }
 }
 

diff --git a/src/eez/modules/psu/channel_dispatcher.cpp b/src/eez/modules/psu/channel_dispatcher.cpp
@@ -1345,7 +1345,7 @@ void disableOutputForAllTrackingChannels() {
 
 void remoteSensingEnable(Channel &channel, bool enable) {
     if (!isPsuThread()) {
-        sendMessageToPsu(PSU_MESSAGE_REMOTE_SENSING_EANBLE, (channel.channelIndex << 8) | (enable ? 1 : 0) );
+        sendMessageToPsu(PSU_MESSAGE_REMOTE_SENSING_EANBLE, (channel.channelIndex << 8) | (enable ? 1 : 0));
     } else {
         if (channel.channelIndex < 2 && (g_couplingType == COUPLING_TYPE_SERIES || g_couplingType == COUPLING_TYPE_PARALLEL)) {
             Channel::get(0).remoteSensingEnable(enable);

diff --git a/src/eez/modules/psu/psu.cpp b/src/eez/modules/psu/psu.cpp
@@ -590,6 +590,12 @@ void onThreadMessage(uint8_t type, uint32_t param) {
     } else if (type == PSU_MESSAGE_READ_CHANNEL_TEMPERATURE) {
         Channel &channel = Channel::get(param);
         channel.readTemperature();
+    } else if (type == PSU_MESSAGE_REMOTE_PROGRAMMING_ENABLE) {
+        Channel &channel = Channel::get((param >> 8) & 0xFF);
+        channel.remoteProgrammingEnable(param & 0xFF);
+    } else if (type == PSU_MESSAGE_SET_DPROG_STATE) {
+        Channel &channel = Channel::get((param >> 8) & 0xFF);
+        channel.setDprogState((DprogState)(param & 0xFF));
     }
 }
 

diff --git a/src/eez/modules/psu/scpi/debug.cpp b/src/eez/modules/psu/scpi/debug.cpp
@@ -108,6 +108,12 @@ scpi_result_t scpi_cmd_debug(scpi_t *context) {
             taskEXIT_CRITICAL();
             restart();
 #endif
+        } else if (cmd == 30) {
+            int32_t delayMs;
+            if (!SCPI_ParamInt32(context, &delayMs, false)) {
+                return SCPI_RES_ERR;
+            }
+            osDelay(delayMs);
         } else {
             SCPI_ErrorPush(context, SCPI_ERROR_HARDWARE_MISSING);
             return SCPI_RES_ERR;

diff --git a/src/eez/tasks.h b/src/eez/tasks.h
@@ -52,7 +52,9 @@ enum HighPriorityThreadMessage {
     PSU_MESSAGE_SLOT_SET_ENABLED,
     PSU_MESSAGE_SET_CURRENT_RANGE_SELECTION_MODE,
     PSU_MESSAGE_REMOTE_SENSING_EANBLE,
-    PSU_MESSAGE_READ_CHANNEL_TEMPERATURE
+    PSU_MESSAGE_READ_CHANNEL_TEMPERATURE,
+    PSU_MESSAGE_REMOTE_PROGRAMMING_ENABLE,
+    PSU_MESSAGE_SET_DPROG_STATE
 };
 
 enum LowPriorityThreadMessage {