#38 SCPI

Author: mvladic

modular-psu-firmware.eez-project

@@ -70390,6 +70390,62 @@
               "description": "-1: ERROR\n 0: IDLE\n 1: CONNECTED\n 2: TRANSIENT"
             }
           },
+          {
+            "name": "SYSTem:COMMunicate:USB:MODE",
+            "helpLink": "EEZ BB3 SCPI reference 5.16 - SYSTem.html#syst_comm_ntp",
+            "parameters": [
+              {
+                "name": "mode",
+                "type": [
+                  {
+                    "type": "discrete",
+                    "enumeration": "UsbMode"
+                  }
+                ],
+                "isOptional": false
+              }
+            ],
+            "response": {
+              "type": "numeric"
+            }
+          },
+          {
+            "name": "SYSTem:COMMunicate:USB:MODE?",
+            "helpLink": "EEZ BB3 SCPI reference 5.16 - SYSTem.html#syst_comm_ntp",
+            "parameters": [],
+            "response": {
+              "type": "discrete",
+              "enumeration": "UsbMode"
+            }
+          },
+          {
+            "name": "SYSTem:COMMunicate:USB:CLAss",
+            "helpLink": "EEZ BB3 SCPI reference 5.16 - SYSTem.html#syst_comm_ntp",
+            "parameters": [
+              {
+                "name": "class",
+                "type": [
+                  {
+                    "type": "discrete",
+                    "enumeration": "UsbClass"
+                  }
+                ],
+                "isOptional": false
+              }
+            ],
+            "response": {
+              "type": "numeric"
+            }
+          },
+          {
+            "name": "SYSTem:COMMunicate:USB:CLAss?",
+            "helpLink": "EEZ BB3 SCPI reference 5.16 - SYSTem.html#syst_comm_ntp",
+            "parameters": [],
+            "response": {
+              "type": "discrete",
+              "enumeration": "UsbClass"
+            }
+          },
           {
             "name": "SYSTem:CPU:INFOrmation:ONTime:LAST?",
             "helpLink": "EEZ BB3 SCPI reference 5.16 - SYSTem.html#syst_cpu_ont_last",
@@ -72727,7 +72783,7 @@
         "name": "Interface",
         "members": [
           {
-            "name": "SERial",
+            "name": "USB",
             "value": "1"
           },
           {
@@ -72869,6 +72925,40 @@
             "value": ""
           }
         ]
+      },
+      {
+        "name": "UsbMode",
+        "members": [
+          {
+            "name": "DEVice",
+            "value": "1"
+          },
+          {
+            "name": "HOST",
+            "value": "2"
+          },
+          {
+            "name": "OTG",
+            "value": "3"
+          }
+        ]
+      },
+      {
+        "name": "UsbClass",
+        "members": [
+          {
+            "name": "VCOM",
+            "value": "1"
+          },
+          {
+            "name": "MSTOrage",
+            "value": "2"
+          },
+          {
+            "name": "HID",
+            "value": "3"
+          }
+        ]
       }
     ]
   },

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

@@ -810,6 +810,58 @@ scpi_result_t scpi_cmd_systemCommunicateRlstateQ(scpi_t *context) {
     return SCPI_RES_OK;
 }
 
+static scpi_choice_def_t usbModeChoice[] = {
+    { "DEVice", USB_MODE_DEVICE }, 
+    { "HOST", USB_MODE_HOST }, 
+    { "OTG", USB_MODE_OTG }, 
+    SCPI_CHOICE_LIST_END
+};
+
+scpi_result_t scpi_cmd_systemCommunicateUsbMode(scpi_t *context) {
+    int32_t usbMode;
+    if (!SCPI_ParamChoice(context, usbModeChoice, &usbMode, true)) {
+        return SCPI_RES_ERR;
+    }
+
+    usb::selectUsbMode(usbMode, usb::g_otgMode);
+
+    return SCPI_RES_OK;
+}
+
+scpi_result_t scpi_cmd_systemCommunicateUsbModeQ(scpi_t *context) {
+    resultChoiceName(context, usbModeChoice, usb::g_usbMode);
+    return SCPI_RES_OK;
+}
+
+static scpi_choice_def_t usbClassChoice[] = {
+    { "VCOM", USB_DEVICE_CLASS_VIRTUAL_COM_PORT }, 
+    { "MSTOrage", USB_DEVICE_CLASS_MASS_STORAGE_CLIENT }, 
+    { "HID", USB_HOST_CLASS_HID }, 
+    SCPI_CHOICE_LIST_END
+};
+
+scpi_result_t scpi_cmd_systemCommunicateUsbClass(scpi_t *context) {
+    int32_t usbClass;
+    if (!SCPI_ParamChoice(context, usbClassChoice, &usbClass, true)) {
+        return SCPI_RES_ERR;
+    }
+
+    if (usbClass < USB_HOST_CLASS_HID) {
+        usb::selectUsbDeviceClass(usbClass);
+    }
+
+    return SCPI_RES_OK;
+}
+
+scpi_result_t scpi_cmd_systemCommunicateUsbClassQ(scpi_t *context) {
+    resultChoiceName(context, usbClassChoice, 
+        usb::isVirtualComPortActive() ? USB_DEVICE_CLASS_VIRTUAL_COM_PORT : 
+        usb::isMassStorageActive() ? USB_DEVICE_CLASS_MASS_STORAGE_CLIENT :
+        USB_HOST_CLASS_HID);
+        
+    return SCPI_RES_OK;
+}
+
 scpi_result_t scpi_cmd_systemLocal(scpi_t *context) {
     g_rlState = RL_STATE_LOCAL;
 
@@ -840,9 +892,8 @@ scpi_result_t scpi_cmd_systemRwlock(scpi_t *context) {
     return SCPI_RES_OK;
 }
 
-// NONE|ODD|EVEN
 static scpi_choice_def_t commInterfaceChoice[] = {
-    { "SERial", 1 }, 
+    { "USB", 1 }, 
     { "ETHernet", 2 }, 
     { "NTP", 3 }, 
     { "MQTT", 4 }, 
@@ -861,7 +912,15 @@ scpi_result_t scpi_cmd_systemCommunicateEnable(scpi_t *context) {
     }
 
     if (commInterface == 1) {
-        persist_conf::setUsbMode(enable ? USB_MODE_DEVICE : USB_MODE_DISABLED);
+        if (enable) {
+            if (usb::g_usbMode == USB_MODE_DISABLED) {
+                usb::selectUsbMode(USB_MODE_DEVICE, usb::g_otgMode);
+            }
+        } else {
+            if (usb::g_usbMode != USB_MODE_DISABLED) {
+                usb::selectUsbMode(USB_MODE_DISABLED, usb::g_otgMode);
+            }
+        }
     } else if (commInterface == 2) {
 #if OPTION_ETHERNET
         persist_conf::enableEthernet(enable);
@@ -885,7 +944,7 @@ scpi_result_t scpi_cmd_systemCommunicateEnableQ(scpi_t *context) {
     }
 
     if (commInterface == 1) {
-        SCPI_ResultBool(context, persist_conf::getUsbMode() != USB_MODE_DISABLED);
+        SCPI_ResultBool(context, usb::g_usbMode != USB_MODE_DISABLED);
     } else if (commInterface == 2) {
 #if OPTION_ETHERNET
         SCPI_ResultBool(context, persist_conf::isEthernetEnabled());

src/eez/scpi/commands_simulator.h

@@ -295,6 +295,10 @@
     SCPI_COMMAND("SYSTem:COMMunicate:RLSTate?", scpi_cmd_systemCommunicateRlstateQ) \
     SCPI_COMMAND("SYSTem:COMMunicate:MQTT:SETTings", scpi_cmd_systemCommunicateMqttSettings) \
     SCPI_COMMAND("SYSTem:COMMunicate:MQTT:STATe?", scpi_cmd_systemCommunicateMqttStateQ) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:MODE", scpi_cmd_systemCommunicateUsbMode) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:MODE?", scpi_cmd_systemCommunicateUsbModeQ) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:CLAss", scpi_cmd_systemCommunicateUsbClass) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:CLAss?", scpi_cmd_systemCommunicateUsbClassQ) \
     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) \

src/eez/scpi/commands_stm32.h

@@ -295,6 +295,10 @@
     SCPI_COMMAND("SYSTem:COMMunicate:RLSTate?", scpi_cmd_systemCommunicateRlstateQ) \
     SCPI_COMMAND("SYSTem:COMMunicate:MQTT:SETTings", scpi_cmd_systemCommunicateMqttSettings) \
     SCPI_COMMAND("SYSTem:COMMunicate:MQTT:STATe?", scpi_cmd_systemCommunicateMqttStateQ) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:MODE", scpi_cmd_systemCommunicateUsbMode) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:MODE?", scpi_cmd_systemCommunicateUsbModeQ) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:CLAss", scpi_cmd_systemCommunicateUsbClass) \
+    SCPI_COMMAND("SYSTem:COMMunicate:USB:CLAss?", scpi_cmd_systemCommunicateUsbClassQ) \
     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) \

src/eez/usb.h

@@ -45,5 +45,6 @@ bool isMassStorageActive();
 
 #define USB_DEVICE_CLASS_VIRTUAL_COM_PORT 0
 #define USB_DEVICE_CLASS_MASS_STORAGE_CLIENT 1
+#define USB_HOST_CLASS_HID 2
 
 extern "C" int g_usbDeviceClass;