scpi meas temp

Author: mvladic

src/eez/firmware.cpp

@@ -171,6 +171,10 @@ void boot() {
         }
     }
 
+    for (int i = psu::CH_NUM; i < CH_MAX; i++) {
+        psu::Channel::get(i).slotIndex = INVALID_SLOT_INDEX;
+    }
+
     psu::persist_conf::init();
 
 #if OPTION_DISPLAY

src/eez/index.cpp

@@ -135,13 +135,17 @@ ModuleInfo *getModuleInfo(uint16_t moduleType) {
     return &g_modules[0];
 }
 
-SlotInfo g_slots[NUM_SLOTS] = {
+SlotInfo g_slots[NUM_SLOTS + 1] = {
     {
         &g_modules[0]
     },
     {
         &g_modules[0]
     },
+    {
+        &g_modules[0]
+    },
+    // invalid slot
     {
         &g_modules[0]
     }

src/eez/index.h

@@ -218,6 +218,7 @@ struct SlotInfo {
 };
 
 static const int NUM_SLOTS = 3;
-extern SlotInfo g_slots[NUM_SLOTS];
+static const int INVALID_SLOT_INDEX = NUM_SLOTS;
+extern SlotInfo g_slots[NUM_SLOTS + 1]; // one more for invalid slot
 
 } // namespace eez

src/eez/modules/psu/profile.cpp

@@ -636,8 +636,7 @@ static void saveState(Parameters &profile, List *lists) {
         if (i < temp_sensor::NUM_TEMP_SENSORS) {
             memcpy(profile.tempProt + i, &temperature::sensors[i].prot_conf, sizeof(temperature::ProtectionConfiguration));
         } else {
-            profile.tempProt[i].sensor = i;
-            if (profile.tempProt[i].sensor == temp_sensor::AUX) {
+            if (i == temp_sensor::AUX) {
                 profile.tempProt[i].delay = OTP_AUX_DEFAULT_DELAY;
                 profile.tempProt[i].level = OTP_AUX_DEFAULT_LEVEL;
                 profile.tempProt[i].state = OTP_AUX_DEFAULT_STATE;
@@ -1002,10 +1001,11 @@ static bool profileWrite(WriteContext &ctx, const Parameters &parameters, List *
     }
 
     for (int i = 0; i < temp_sensor::NUM_TEMP_SENSORS; ++i) {
-        auto &tempSensorProt = parameters.tempProt[i];
-        auto &sensor = temperature::sensors[tempSensorProt.sensor];
+        auto &sensor = temperature::sensors[i];
         if (sensor.isInstalled()) {
-            ctx.group("tempsensor", tempSensorProt.sensor + 1);
+            auto &tempSensorProt = parameters.tempProt[i];
+
+            ctx.group("tempsensor", i + 1);
 
             ctx.property("name", sensor.getName());
             ctx.property("delay", tempSensorProt.delay);
@@ -1388,8 +1388,6 @@ static bool profileReadCallback(ReadContext &ctx, Parameters &parameters, List *
 
         auto &tempSensorProt = parameters.tempProt[tempSensorIndex];
 
-        tempSensorProt.sensor = tempSensorIndex;
-
         READ_PROPERTY(delay, tempSensorProt.delay);
         READ_PROPERTY(level, tempSensorProt.level);
         READ_PROPERTY(state, tempSensorProt.state);

src/eez/modules/psu/psu.cpp

@@ -387,8 +387,7 @@ bool psuReset() {
     // TEMP:PROT:STAT[AUX]
     for (int i = 0; i < temp_sensor::NUM_TEMP_SENSORS; ++i) {
         temperature::ProtectionConfiguration &temp_prot = temperature::sensors[i].prot_conf;
-        temp_prot.sensor = i;
-        if (temp_prot.sensor == temp_sensor::AUX) {
+        if (i == temp_sensor::AUX) {
             temp_prot.delay = OTP_AUX_DEFAULT_DELAY;
             temp_prot.level = OTP_AUX_DEFAULT_LEVEL;
             temp_prot.state = OTP_AUX_DEFAULT_STATE;

src/eez/modules/psu/scpi/meas.cpp

@@ -20,7 +20,6 @@
 
 #include <eez/modules/psu/channel_dispatcher.h>
 #include <eez/modules/psu/scpi/psu.h>
-#include <eez/modules/psu/temperature.h>
 
 namespace eez {
 namespace psu {
@@ -67,19 +66,6 @@ scpi_result_t scpi_cmd_measureScalarVoltageDcQ(scpi_t *context) {
     return SCPI_RES_OK;
 }
 
-scpi_result_t scpi_cmd_measureScalarTemperatureThermistorDcQ(scpi_t *context) {
-    int32_t sensor;
-    if (!param_temp_sensor(context, sensor)) {
-        return SCPI_RES_ERR;
-    }
-
-    char buffer[256] = { 0 };
-    strcatFloat(buffer, temperature::sensors[sensor].measure());
-    SCPI_ResultCharacters(context, buffer, strlen(buffer));
-
-    return SCPI_RES_OK;
-}
-
 } // namespace scpi
 } // namespace psu
 } // namespace eez

src/eez/modules/psu/scpi/syst.cpp

@@ -39,7 +39,9 @@
 #endif
 #include <eez/modules/psu/io_pins.h>
 #include <eez/modules/psu/ontime.h>
+#include <eez/modules/psu/temperature.h>
 
+#include <eez/modules/aux_ps/fan.h>
 #include <eez/modules/mcu/battery.h>
 
 namespace eez {
@@ -1750,6 +1752,39 @@ scpi_result_t scpi_cmd_systemTimeFormatQ(scpi_t *context) {
     return SCPI_RES_OK;
 }
 
+scpi_result_t scpi_cmd_systemFanStatusQ(scpi_t *context) {
+    SCPI_ResultInt(context, aux_ps::fan::getStatus());
+    return SCPI_RES_OK;
+}
+
+scpi_result_t scpi_cmd_systemFanSpeedQ(scpi_t *context) {
+    SCPI_ResultInt(context, aux_ps::fan::g_rpm);
+    return SCPI_RES_OK;
+}
+
+scpi_result_t scpi_cmd_systemMeasureScalarTemperatureThermistorDcQ(scpi_t *context) {
+    int32_t sensor;
+    if (!param_temp_sensor(context, sensor)) {
+        return SCPI_RES_ERR;
+    }
+
+    if (!temperature::sensors[sensor].isInstalled()) {
+        SCPI_ErrorPush(context, SCPI_ERROR_HARDWARE_MISSING);
+        return SCPI_RES_ERR;
+    }
+
+    if (!temperature::sensors[sensor].isTestOK()) {
+        SCPI_ErrorPush(context, SCPI_ERROR_HARDWARE_ERROR);
+        return SCPI_RES_ERR;
+    }
+
+    char buffer[256] = { 0 };
+    strcatFloat(buffer, temperature::sensors[sensor].measure());
+    SCPI_ResultCharacters(context, buffer, strlen(buffer));
+
+    return SCPI_RES_OK;
+}
+
 } // namespace scpi
 } // namespace psu
 } // namespace eez

src/eez/modules/psu/temperature.h

@@ -30,7 +30,6 @@ namespace temperature {
 
 /// Configuration data for the temperature protection.
 struct ProtectionConfiguration {
-    int8_t sensor;
     float delay;
     float level;
     bool state;