changes in scpi commands

eez-open · Mar 27, 2020 · a95a509 · a95a509
1 parent 9d8c8de
commit a95a509
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 21 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -532459,7 +532459,7 @@
             }
           },
           {
-            "name": "DISPlay[:WINdow]:SELEct?",
+            "name": "DISPlay[:WINdow]:SELect?",
             "helpLink": "EEZ BB3 SCPI reference 5.4 - DISPlay.html#disp_text",
             "parameters": [
               {
@@ -532589,7 +532589,7 @@
             "response": {}
           },
           {
-            "name": "DISPlay[:WINdow]:ERROr",
+            "name": "DISPlay[:WINdow]:ERRor",
             "parameters": [
               {
                 "name": "message",
@@ -536118,6 +536118,14 @@
               "type": "numeric"
             }
           },
+          {
+            "name": "SYSTem:CPU:VERSion?",
+            "helpLink": "EEZ BB3 SCPI reference 5.16 - SYSTem.html#syst_cpu_mod",
+            "parameters": [],
+            "response": {
+              "type": "numeric"
+            }
+          },
           {
             "name": "SYSTem:DATE",
             "helpLink": "EEZ BB3 SCPI reference 5.16 - SYSTem.html#syst_date",

diff --git a/src/eez/modules/psu/gui/data.cpp b/src/eez/modules/psu/gui/data.cpp
@@ -3084,7 +3084,7 @@ void data_sys_info_scpi_ver(DataOperationEnum operation, Cursor cursor, Value &v
 
 void data_sys_info_cpu(DataOperationEnum operation, Cursor cursor, Value &value) {
     if (operation == DATA_OPERATION_GET) {
-        value = Value(getCpuModel());
+        value = Value(getCpuModelAndVersion());
     }
 }
 

diff --git a/src/eez/modules/psu/psu.cpp b/src/eez/modules/psu/psu.cpp
@@ -690,7 +690,7 @@ void setOperBits(int bit_mask, bool on) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-const char *getCpuModel() {
+const char *getCpuModelAndVersion() {
 #if defined(EEZ_PLATFORM_SIMULATOR)
     return "Simulator, " FIRMWARE;
 #elif defined(EEZ_PLATFORM_STM32)
@@ -706,6 +706,10 @@ const char *getCpuType() {
 #endif
 }
 
+const char *getCpuVersion() {
+    return FIRMWARE;
+}
+
 bool isMaxCurrentLimited() {
     return g_maxCurrentLimitCause != MAX_CURRENT_LIMIT_CAUSE_NONE;
 }

diff --git a/src/eez/modules/psu/psu.h b/src/eez/modules/psu/psu.h
@@ -105,8 +105,9 @@ void tick();
 void setQuesBits(int bit_mask, bool on);
 void setOperBits(int bit_mask, bool on);
 
-const char *getCpuModel();
+const char *getCpuModelAndVersion();
 const char *getCpuType();
+const char *getCpuVersion();
 
 bool isMaxCurrentLimited();
 MaxCurrentLimitCause getMaxCurrentLimitCause();

diff --git a/src/eez/modules/psu/scpi/diag.cpp b/src/eez/modules/psu/scpi/diag.cpp
@@ -292,22 +292,24 @@ scpi_result_t scpi_cmd_diagnosticInformationProtectionQ(scpi_t *context) {
 
     for (int i = 0; i < temp_sensor::NUM_TEMP_SENSORS; ++i) {
         temp_sensor::TempSensor &sensor = temp_sensor::sensors[i];
-        temperature::TempSensorTemperature &sensorTemperature = temperature::sensors[i];
+        if (sensor.isInstalled()) {
+            temperature::TempSensorTemperature &sensorTemperature = temperature::sensors[i];
 
-        sprintf(buffer, "temp_%s_tripped=%d", sensor.name, (int)sensorTemperature.isTripped());
-        SCPI_ResultText(context, buffer);
+            sprintf(buffer, "temp_%s_tripped=%d", sensor.name, (int)sensorTemperature.isTripped());
+            SCPI_ResultText(context, buffer);
 
-        sprintf(buffer, "temp_%s_state=%d", sensor.name, (int)sensorTemperature.prot_conf.state);
-        SCPI_ResultText(context, buffer);
+            sprintf(buffer, "temp_%s_state=%d", sensor.name, (int)sensorTemperature.prot_conf.state);
+            SCPI_ResultText(context, buffer);
 
-        sprintf(buffer, "temp_%s_delay=", sensor.name);
-        strcatDuration(buffer, sensorTemperature.prot_conf.delay);
-        SCPI_ResultText(context, buffer);
+            sprintf(buffer, "temp_%s_delay=", sensor.name);
+            strcatDuration(buffer, sensorTemperature.prot_conf.delay);
+            SCPI_ResultText(context, buffer);
 
-        sprintf(buffer, "temp_%s_level=", sensor.name);
-        strcatFloat(buffer, sensorTemperature.prot_conf.level);
-        strcat(buffer, " oC");
-        SCPI_ResultText(context, buffer);
+            sprintf(buffer, "temp_%s_level=", sensor.name);
+            strcatFloat(buffer, sensorTemperature.prot_conf.level);
+            strcat(buffer, " oC");
+            SCPI_ResultText(context, buffer);
+        }
     }
 
     return SCPI_RES_OK;

diff --git a/src/eez/modules/psu/scpi/outp.cpp b/src/eez/modules/psu/scpi/outp.cpp
@@ -97,7 +97,7 @@ scpi_result_t scpi_cmd_outputTrackState(scpi_t *context) {
     if (parameter.type == SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA || parameter.type == SCPI_TOKEN_PROGRAM_MNEMONIC) {
         int32_t enable;
         if (
-            parameter.type == SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA && !SCPI_ParamToInt32(context, &parameter, &enable) ||
+            (parameter.type == SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA && !SCPI_ParamToInt32(context, &parameter, &enable)) ||
             !SCPI_ParamToChoice(context, &parameter, scpi_bool_def, &enable)
         ) {
             SCPI_ErrorPush(context, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);

diff --git a/src/eez/modules/psu/scpi/syst.cpp b/src/eez/modules/psu/scpi/syst.cpp
@@ -603,7 +603,12 @@ scpi_result_t scpi_cmd_systemCpuInformationOntimeLastQ(scpi_t *context) {
 }
 
 scpi_result_t scpi_cmd_systemCpuModelQ(scpi_t *context) {
-    SCPI_ResultText(context, getCpuModel());
+    SCPI_ResultText(context, getCpuType());
+    return SCPI_RES_OK;
+}
+
+scpi_result_t scpi_cmd_systemCpuVersionQ(scpi_t *context) {
+    SCPI_ResultText(context, getCpuVersion());
     return SCPI_RES_OK;
 }
 

diff --git a/src/eez/scpi/commands_simulator.h b/src/eez/scpi/commands_simulator.h
@@ -54,7 +54,7 @@
     SCPI_COMMAND("DISPlay[:WINdow]:DIALog:ACTIon?", scpi_cmd_displayWindowDialogActionQ) \
     SCPI_COMMAND("DISPlay[:WINdow]:DIALog:DATA", scpi_cmd_displayWindowDialogData) \
     SCPI_COMMAND("DISPlay[:WINdow]:DIALog:CLOSe", scpi_cmd_displayWindowDialogClose) \
-    SCPI_COMMAND("DISPlay[:WINdow]:ERROr", scpi_cmd_displayWindowError) \
+    SCPI_COMMAND("DISPlay[:WINdow]:ERRor", scpi_cmd_displayWindowError) \
     SCPI_COMMAND("INITiate:CONTinuous", scpi_cmd_initiateContinuous) \
     SCPI_COMMAND("INITiate:CONTinuous?", scpi_cmd_initiateContinuousQ) \
     SCPI_COMMAND("INITiate:DLOG", scpi_cmd_initiateDlog) \
@@ -288,6 +288,7 @@
     SCPI_COMMAND("SYSTem:CPU:INFOrmation:ONTime:LAST?", scpi_cmd_systemCpuInformationOntimeLastQ) \
     SCPI_COMMAND("SYSTem:CPU:INFOrmation:ONTime:TOTal?", scpi_cmd_systemCpuInformationOntimeTotalQ) \
     SCPI_COMMAND("SYSTem:CPU:MODel?", scpi_cmd_systemCpuModelQ) \
+    SCPI_COMMAND("SYSTem:CPU:VERSion?", scpi_cmd_systemCpuVersionQ) \
     SCPI_COMMAND("SYSTem:DATE", scpi_cmd_systemDate) \
     SCPI_COMMAND("SYSTem:DATE?", scpi_cmd_systemDateQ) \
     SCPI_COMMAND("SYSTem:FORMat:DATE", scpi_cmd_systemFormatDate) \

diff --git a/src/eez/scpi/commands_stm32.h b/src/eez/scpi/commands_stm32.h
@@ -54,7 +54,7 @@
     SCPI_COMMAND("DISPlay[:WINdow]:DIALog:ACTIon?", scpi_cmd_displayWindowDialogActionQ) \
     SCPI_COMMAND("DISPlay[:WINdow]:DIALog:DATA", scpi_cmd_displayWindowDialogData) \
     SCPI_COMMAND("DISPlay[:WINdow]:DIALog:CLOSe", scpi_cmd_displayWindowDialogClose) \
-    SCPI_COMMAND("DISPlay[:WINdow]:ERROr", scpi_cmd_displayWindowError) \
+    SCPI_COMMAND("DISPlay[:WINdow]:ERRor", scpi_cmd_displayWindowError) \
     SCPI_COMMAND("INITiate:CONTinuous", scpi_cmd_initiateContinuous) \
     SCPI_COMMAND("INITiate:CONTinuous?", scpi_cmd_initiateContinuousQ) \
     SCPI_COMMAND("INITiate:DLOG", scpi_cmd_initiateDlog) \
@@ -288,6 +288,7 @@
     SCPI_COMMAND("SYSTem:CPU:INFOrmation:ONTime:LAST?", scpi_cmd_systemCpuInformationOntimeLastQ) \
     SCPI_COMMAND("SYSTem:CPU:INFOrmation:ONTime:TOTal?", scpi_cmd_systemCpuInformationOntimeTotalQ) \
     SCPI_COMMAND("SYSTem:CPU:MODel?", scpi_cmd_systemCpuModelQ) \
+    SCPI_COMMAND("SYSTem:CPU:VERSion?", scpi_cmd_systemCpuVersionQ) \
     SCPI_COMMAND("SYSTem:DATE", scpi_cmd_systemDate) \
     SCPI_COMMAND("SYSTem:DATE?", scpi_cmd_systemDateQ) \
     SCPI_COMMAND("SYSTem:FORMat:DATE", scpi_cmd_systemFormatDate) \