add support for simple modes

Author: chrisruk

include/cmd.h

@@ -87,7 +87,7 @@ extern PyObject *cmd_get_hardware_version(void);
  * (and the device->values entry will be updated) or -1 on error (when
  * an exception will already be raised).
  */
-extern int cmd_get_port_value(uint8_t port_id);
+extern int cmd_get_port_value(uint8_t port_id, uint8_t selindex);
 
 /* Sends a Hub Port Info Request command for the mode info of the
  * given port.  Fills in the port_modes_t structure with the returned

src/cmd.c

@@ -337,10 +337,10 @@ PyObject *cmd_get_firmware_version(void)
 }
 
 
-int cmd_get_port_value(uint8_t port_id)
+int cmd_get_port_value(uint8_t port_id, uint8_t selindex)
 {
     char buf[100];
-    sprintf(buf, "port %d ; selonce 0\r", port_id);
+    sprintf(buf, "port %d ; selonce %d\r", port_id, selindex);
     make_request_uart(false, TYPE_PORT_OUTPUT, port_id, buf);
     return 0;
 }
@@ -947,86 +947,12 @@ int cmd_write_mode_data(uint8_t port_id,
 
 int cmd_set_mode(uint8_t port_id, uint8_t mode, uint8_t notifications)
 {
-    uint8_t *response;
-
-    /* Mode zero appears to be a legacy */
-    response = make_request(false, 10, TYPE_PORT_FORMAT_SETUP_SINGLE,
-                            port_id,
-                            mode,
-                            1, 0, 0, 0, /* Delta = 1 */
-                            notifications);
-    if (response == NULL)
-        return -1;
-
-    if (response[0] != 10 ||
-        response[2] != TYPE_PORT_FORMAT_SINGLE ||
-        response[3] != port_id ||
-        response[4] != mode ||
-        response[5] != 1 ||
-        response[6] != 0 ||
-        response[7] != 0 ||
-        response[8] != 0 ||
-        response[9] != notifications)
-    {
-        free(response);
-        PyErr_SetString(hub_protocol_error,
-                        "Unexpected reply to Port Format Setup");
-        return -1;
-    }
-
-    free(response);
-    if (mode == 0)
-        return 0;
-
-    /* Non-legacy modes go through an unexplained dance to change
-     * mode.  First the mode is set as for mode 0 above, then
-     * issue a device reset, then set the mode again.
-     */
-    response = make_request(false, 5, TYPE_PORT_FORMAT_SETUP_COMBINED,
-                            port_id,
-                            INFO_FORMAT_RESET);
-    if (response == NULL)
-        return -1;
-
-    /* The documentation is unclear as to what response to expect.
-     * The code shows a TYPE_PORT_FORMAT_SINGLE for the current mode.
-     */
-    if (response[0] != 10 ||
-        response[2] != TYPE_PORT_FORMAT_SINGLE ||
-        response[3] != port_id)
-    {
-        free(response);
-        PyErr_SetString(hub_protocol_error,
-                        "Unexpected reply to Port CombiFormat (Reset)");
-        return -1;
-    }
-
-    /* Now set the mode again */
-    response = make_request(false, 10, TYPE_PORT_FORMAT_SETUP_SINGLE,
-                            port_id,
-                            mode,
-                            1, 0, 0, 0, /* Delta = 1 */
-                            notifications); 
-    if (response == NULL)
-        return -1;
-
-    if (response[0] != 10 ||
-        response[2] != TYPE_PORT_FORMAT_SINGLE ||
-        response[3] != port_id ||
-        response[4] != mode ||
-        response[5] != 1 ||
-        response[6] != 0 ||
-        response[7] != 0 ||
-        response[8] != 0 ||
-        response[9] != notifications)
-    {
-        free(response);
-        PyErr_SetString(hub_protocol_error,
-                        "Unexpected reply to Port Format Setup");
-        return -1;
-    }
-
-    free(response);
+    char buf[200];
+    if(notifications)
+        sprintf(buf, "port %u ; combi %d; select %d\r", port_id, mode, mode);
+    else
+        sprintf(buf, "port %u ; combi %d; selonce %d\r", port_id, mode, mode);
+    make_request_uart(false, TYPE_PORT_OUTPUT, port_id, buf);
     return 0;
 }
 

src/device.c

@@ -805,93 +805,15 @@ Device_mode(PyObject *self, PyObject *args)
 }
 
 
-static float rescale_float(float value,
-                           min_max_t *inrange,
-                           min_max_t *outrange)
-{
-    float in_interval = inrange->max - inrange->min;
-    float out_interval = outrange->max - outrange->min;
-
-    return  ((value - inrange->min) *
-             out_interval / in_interval) + outrange->min;
-}
-
-
-static long rescale_long(long value, min_max_t *inrange, min_max_t *outrange)
-{
-    return (long)(rescale_float((float)value, inrange, outrange) + 0.5);
-}
-
-
-static PyObject *convert_raw(PyObject *value, int format, mode_info_t *mode)
-{
-    if (PyLong_Check(value))
-    {
-        long long_value = PyLong_AsLong(value);
-
-        if (long_value == -1 && PyErr_Occurred() != NULL)
-            return NULL;
-
-        switch (format)
-        {
-            case DEVICE_FORMAT_PERCENT:
-                long_value = rescale_long(long_value,
-                                          &mode->raw,
-                                          &mode->percent);
-                break;
-
-            case DEVICE_FORMAT_SI:
-                long_value = rescale_long(long_value,
-                                          &mode->raw,
-                                          &mode->si);
-                break;
-
-            default:
-                break;
-        }
-        return PyLong_FromLong(long_value);
-    }
-    else if (PyFloat_Check(value))
-    {
-        float fvalue = (float)PyFloat_AsDouble(value);
-
-        if (fvalue == -1.0 && PyErr_Occurred() != NULL)
-            return NULL;
-
-        switch (format)
-        {
-            case DEVICE_FORMAT_PERCENT:
-                fvalue = rescale_float(fvalue,
-                                       &mode->raw,
-                                       &mode->percent);
-                break;
-
-            case DEVICE_FORMAT_SI:
-                fvalue = rescale_float(fvalue,
-                                       &mode->raw,
-                                       &mode->si);
-                break;
-
-            default:
-                break;
-        }
-        return PyFloat_FromDouble((double)fvalue);
-    }
-    else if (value == Py_None)
-    {
-        Py_RETURN_NONE;
-    }
-
-    /* Otherwise this is unexpected */
-    PyErr_SetString(cmd_get_exception(), "Invalid value");
-    return NULL;
-}
-
-
 static int get_value(DeviceObject *device)
 {
     device->rx_error = DO_RXERR_NONE;
-    if (cmd_get_port_value(port_get_id(device->port)) < 0)
+
+    uint8_t selindex = 0;
+    if (device->current_mode != MODE_IS_COMBI)
+        selindex = device->current_mode;
+
+    if (cmd_get_port_value(port_get_id(device->port), selindex) < 0)
     {
         PyObject *hub_protocol_exception = cmd_get_exception();
 
@@ -988,30 +910,31 @@ Device_get(PyObject *self, PyObject *args)
      * SI (2).
      */
 
-    if (/*device->current_mode != MODE_IS_COMBI*/ 1 == 0)
+    if (device->current_mode != MODE_IS_COMBI)
     {
         /* Simple (single) mode */
         /* Get the current mode data */
         mode = &device->modes[device->current_mode];
         result_count = PyList_Size(device->values);
-        if (result_count != mode->format.datasets)
+        /*if (result_count != mode->format.datasets)
         {
             PyErr_SetString(cmd_get_exception(),
                             "Device value length mismatch");
             return NULL;
-        }
+        }*/
 
         /* We wish to return a list with "mode->format->datasets" data
          * values.
          */
-        if ((results = PyList_New(mode->format.datasets)) == NULL)
+
+        result_count = PyList_Size(device->values);
+        if ((results = PyList_New(result_count)) == NULL)
             return NULL;
 
         /* device->values is a list containing result_count elements */
         for (i = 0; i < result_count; i++)
         {
             PyObject *value = PyList_GetItem(device->values, i);
-            value = convert_raw(value, format, mode);
             if (value == NULL)
             {
                 Py_DECREF(results);
@@ -1086,9 +1009,9 @@ Device_callback(PyObject *self, PyObject *args)
 
     if(device->num_combi_modes == 0)
     {
-        /*if (set_simple_mode(device, device->current_mode) < 0){
+        if (set_simple_mode(device, device->current_mode) < 0){
             return NULL;
-        }*/
+        }
     }
     else
     {
@@ -1580,6 +1503,7 @@ int device_new_combi_value(PyObject *self,
     mode_info_t *mode;
     int bytes_consumed;
     int i;
+    int modes;
 
     device->is_mode_busy = 0;
 
@@ -1592,6 +1516,9 @@ int device_new_combi_value(PyObject *self,
 
     mode_number = (device->combi_mode[entry] >> 4) & 0x0f;
     mode = &device->modes[mode_number];
+    modes = device->num_combi_modes;
+    if (device->current_mode != MODE_IS_COMBI)
+        modes = entry+1;
 
     bytes_consumed = read_value_new(buffer, &value);
     if (bytes_consumed < 0)
@@ -1601,14 +1528,14 @@ int device_new_combi_value(PyObject *self,
     }
 
     /* This is not terribly efficient... */
-    if ((values = PyList_New(device->num_combi_modes)) == NULL)
+    if ((values = PyList_New(modes)) == NULL)
     {
         Py_DECREF(value);
         device->rx_error = DO_RXERR_INTERNAL;
         return -1;
     }
 
-    for (i = 0; i < device->num_combi_modes; i++)
+    for (i = 0; i < modes; i++)
     {
         if (i == entry)
         {
@@ -1831,5 +1758,6 @@ int device_set_device_format(PyObject *device, uint8_t modei, uint8_t type)
     mode_info_t *mode;
     mode = &dev->modes[modei];
     mode->format.type = type;
+    dev->num_modes = modei;
     return 0;
 }

src/uart.c

@@ -399,7 +399,7 @@ void parse_line(char *serbuf)
             }
         } else if (serbuf[2] == '>') {
             parsed = 1;
-        } else if (serbuf[2] == 'C') {
+        } else if (serbuf[2] == 'C' || serbuf[2] == 'M') {
             //int combiindex = serbuf[3] - 48;
             char *tmp = malloc((strlen(serbuf) - 5) + 1);
             memcpy(tmp, serbuf + 5, strlen(serbuf) - 5);
@@ -419,7 +419,6 @@ void parse_line(char *serbuf)
                 token = strtok(NULL, " ");
                 mcount++;
             }
-
             callback_queue(CALLBACK_DEVICE, port, CALLBACK_DATA);
         }
     }