#57

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

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -64260,6 +64260,24 @@
                 }
               ]
             }
+          },
+          {
+            "name": "SYSTem:DELay",
+            "parameters": [
+              {
+                "name": "time_ms",
+                "type": [
+                  {
+                    "type": "nr1"
+                  }
+                ]
+              }
+            ],
+            "response": {
+              "type": [
+                {}
+              ]
+            }
           }
         ]
       },

diff --git a/src/eez/modules/psu/scpi/debug.cpp b/src/eez/modules/psu/scpi/debug.cpp
@@ -108,12 +108,6 @@ 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/modules/psu/scpi/syst.cpp b/src/eez/modules/psu/scpi/syst.cpp
@@ -1966,6 +1966,17 @@ scpi_result_t scpi_cmd_systemMeasureScalarVoltageDcQ(scpi_t *context) {
 #endif
 }
 
+scpi_result_t scpi_cmd_systemDelay(scpi_t *context) {
+    int32_t delayMs;
+    if (!SCPI_ParamInt32(context, &delayMs, false)) {
+        return SCPI_RES_ERR;
+    }
+
+    osDelay(delayMs);
+
+    return SCPI_RES_OK;
+}
+
 } // namespace scpi
 } // namespace psu
 } // namespace eez
diff --git a/src/eez/scpi/commands_simulator.h b/src/eez/scpi/commands_simulator.h
@@ -369,6 +369,7 @@
     SCPI_COMMAND("SYSTem:MEASure[:SCALar]:TEMPerature[:THERmistor][:DC]?", scpi_cmd_systemMeasureScalarTemperatureThermistorDcQ) \
     SCPI_COMMAND("SYSTem:MEASure[:SCALar][:VOLTage][:DC]?", scpi_cmd_systemMeasureScalarVoltageDcQ) \
     SCPI_COMMAND("SYSTem:CPU:SNO?", scpi_cmd_systemCpuSnoQ) \
+    SCPI_COMMAND("SYSTem:DELay", scpi_cmd_systemDelay) \
     SCPI_COMMAND("TRIGger:DLOG:SOURce", scpi_cmd_triggerDlogSource) \
     SCPI_COMMAND("TRIGger:DLOG:SOURce?", scpi_cmd_triggerDlogSourceQ) \
     SCPI_COMMAND("TRIGger:DLOG[:IMMediate]", scpi_cmd_triggerDlogImmediate) \

diff --git a/src/eez/scpi/commands_stm32.h b/src/eez/scpi/commands_stm32.h
@@ -369,6 +369,7 @@
     SCPI_COMMAND("SYSTem:MEASure[:SCALar]:TEMPerature[:THERmistor][:DC]?", scpi_cmd_systemMeasureScalarTemperatureThermistorDcQ) \
     SCPI_COMMAND("SYSTem:MEASure[:SCALar][:VOLTage][:DC]?", scpi_cmd_systemMeasureScalarVoltageDcQ) \
     SCPI_COMMAND("SYSTem:CPU:SNO?", scpi_cmd_systemCpuSnoQ) \
+    SCPI_COMMAND("SYSTem:DELay", scpi_cmd_systemDelay) \
     SCPI_COMMAND("TRIGger:DLOG:SOURce", scpi_cmd_triggerDlogSource) \
     SCPI_COMMAND("TRIGger:DLOG:SOURce?", scpi_cmd_triggerDlogSourceQ) \
     SCPI_COMMAND("TRIGger:DLOG[:IMMediate]", scpi_cmd_triggerDlogImmediate) \