#75

Author: mvladic

src/eez/index.cpp

@@ -241,22 +241,34 @@ const char *Module::getDefaultLabel() {
     return moduleName;
 }
 
-void Module::setLabel(const char *value, int length) {
+eez_err_t Module::getLabel(const char *&label) {
+    label = this->label;
+    return SCPI_RES_OK;
+}
+
+eez_err_t Module::setLabel(const char *value, int length) {
     if (length == -1) {
         length = strlen(value);
     }
     if (length > (int)SLOT_LABEL_MAX_LENGTH) {
         length = SLOT_LABEL_MAX_LENGTH;
     }
 	stringCopy(label, length + 1, value);
+    return SCPI_RES_OK;
 }
 
 uint8_t Module::getColor() {
     return color;
 }
 
-void Module::setColor(uint8_t value) {
+eez_err_t Module::getColor(uint8_t &color) {
+    color = this->color;
+    return SCPI_RES_OK;
+}
+
+eez_err_t Module::setColor(uint8_t value) {
     color = value;
+    return SCPI_RES_OK;
 }
 
 size_t Module::getChannelLabelMaxLength(int subchannelIndex) {

src/eez/index.h

@@ -263,12 +263,14 @@ struct Module {
     virtual bool isValidSubchannelIndex(int subchannelIndex);
     virtual int getSubchannelIndexFromRelativeChannelIndex(int relativeChannelIndex);
 
-    const char * getLabel();
+    const char *getLabel();
     const char *getDefaultLabel();
     const char *getLabelOrDefault() {return *label ? label : getDefaultLabel(); }
-    void setLabel(const char *label, int length = -1);
+    virtual eez_err_t getLabel(const char *&label);
+    virtual eez_err_t setLabel(const char *label, int length = -1);
     uint8_t getColor();
-    void setColor(uint8_t color);
+    virtual eez_err_t getColor(uint8_t &color);
+    virtual eez_err_t setColor(uint8_t color);
 
     virtual size_t getChannelLabelMaxLength(int subchannelIndex);
     virtual const char *getChannelLabel(int subchannelIndex);

src/eez/modules/psu/psu.cpp

@@ -628,6 +628,22 @@ bool PsuModule::testAutoRecallValuesMatch(uint8_t *bufferRecall, uint8_t *buffer
         recallParameters->i_set == defaultParameters->i_set;
 }
 
+eez_err_t PsuModule::getLabel(const char *&label) {
+    return SCPI_ERROR_HARDWARE_MISSING;
+}
+
+eez_err_t PsuModule::setLabel(const char *label, int length) {
+    return SCPI_ERROR_HARDWARE_MISSING;
+}
+
+eez_err_t PsuModule::getColor(uint8_t &color) {
+    return SCPI_ERROR_HARDWARE_MISSING;
+}
+
+eez_err_t PsuModule::setColor(uint8_t color) {
+    return SCPI_ERROR_HARDWARE_MISSING;
+}
+
 size_t PsuModule::getChannelLabelMaxLength(int subchannelIndex) {
     return Channel::CHANNEL_LABEL_MAX_LENGTH;
 }

src/eez/modules/psu/psu.h

@@ -78,6 +78,11 @@ struct PsuModule : public Module {
     float getProfileISet(uint8_t *buffer) override;
     bool testAutoRecallValuesMatch(uint8_t *bufferRecall, uint8_t *bufferDefault) override;
 
+    eez_err_t getLabel(const char *&label) override;
+    eez_err_t setLabel(const char *label, int length = -1) override;
+    eez_err_t getColor(uint8_t &color) override;
+    eez_err_t setColor(uint8_t color) override;
+
     size_t getChannelLabelMaxLength(int subchannelIndex) override;
     const char *getChannelLabel(int subchannelIndex) override;
     const char *getDefaultChannelLabel(int subchannelIndex) override;

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

@@ -2086,7 +2086,11 @@ scpi_result_t scpi_cmd_systemSlotLabel(scpi_t *context) {
         return SCPI_RES_ERR;
     }
 
-    module->setLabel(label, labelLength);
+    auto err = module->setLabel(label, labelLength);
+    if (err != SCPI_RES_OK) {
+        SCPI_ErrorPush(context, err);
+        return SCPI_RES_ERR;
+    }
 
 #if OPTION_DISPLAY
     refreshScreen();
@@ -2101,8 +2105,18 @@ scpi_result_t scpi_cmd_systemSlotLabelQ(scpi_t *context) {
         return SCPI_RES_ERR;
     }
 
-    const char *label = module->getLabelOrDefault();
-    SCPI_ResultText(context, label);
+    const char *label;
+    auto err = module->getLabel(label);
+    if (err != SCPI_RES_OK) {
+        SCPI_ErrorPush(context, err);
+        return SCPI_RES_ERR;
+    }
+
+    if (*label) {
+        SCPI_ResultText(context, label);
+    } else {
+        SCPI_ResultText(context, module->getDefaultLabel());
+    }
 
     return SCPI_RES_OK;
 }
@@ -2131,7 +2145,11 @@ scpi_result_t scpi_cmd_systemSlotColor(scpi_t *context) {
         return SCPI_RES_ERR;
     }
 
-    module->setColor(color);
+    auto err = module->setColor(color);
+    if (err != SCPI_RES_OK) {
+        SCPI_ErrorPush(context, err);
+        return SCPI_RES_ERR;
+    }
 
 #if OPTION_DISPLAY
     refreshScreen();
@@ -2146,7 +2164,14 @@ scpi_result_t scpi_cmd_systemSlotColorQ(scpi_t *context) {
         return SCPI_RES_ERR;
     }
 
-    SCPI_ResultUInt8(context, module->getColor());
+    uint8_t color;
+    auto err = module->getColor(color);
+    if (err != SCPI_RES_OK) {
+        SCPI_ErrorPush(context, err);
+        return SCPI_RES_ERR;
+    }
+
+    SCPI_ResultUInt8(context, color);
 
     return SCPI_RES_OK;
 }