Diff: scpi-def.cpp

Revision:

30:b463e1f3cae3

Parent:

29:595fd1f5e63c

Child:

31:0475756cede6

--- a/scpi-def.cpp	Tue Jun 08 19:05:30 2021 +0000
+++ b/scpi-def.cpp	Thu Jun 10 12:45:11 2021 +0000
@@ -86,7 +86,8 @@
 
 scpi_result_t get_led1(scpi_t* context)
 {
-    SCPI_ResultInt(context, led1);
+    int led_value = led1;  
+    SCPI_ResultText(context, led_selects[led_value].name);
     return SCPI_RES_OK;
 }
 
@@ -94,6 +95,7 @@
 scpi_result_t read_word(scpi_t* context)
 {
     int address = 0;
+    int value;
   
     /* read first parameter if present */
     if (!SCPI_ParamInt(context, &address, TRUE)) {
@@ -102,12 +104,10 @@
     
     if((address >= 0x1000) && (address < 0x1200)) {
         address = (address - 0x1000) / 2;
+        i2c.i2c_word_read_simple(address, &value);
     } else {
-        return SCPI_RES_ERR;
-    }
-    
-    int value;
-    i2c.i2c_word_read_simple(address, &value);
+        i2c.i2c_word_read_interpreter(address, &value);
+    }   
     
     SCPI_ResultIntBase(context, value, 16);
     return SCPI_RES_OK;