Fixed bytes bug and finished analogue

Author: Thomas Preston

CHANGELOG

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+v0.7.0
+------
+- Fixed bytes error in serial_channel_device -- and/or/bulk commands
+  work again.
+- Added support for analogue inputs, PWM and added music helper methods.
+
 v0.6.1
 ------
 - Fixed error with `set_pullup`. Fixes issue #14.

codebug_tether/__init__.py

@@ -1 +1,5 @@
-from codebug_tether.core import CodeBug
+from codebug_tether.core import (CodeBug,
+                                 IO_DIGITAL_OUTPUT,
+                                 IO_DIGITAL_INPUT,
+                                 IO_ANALOGUE_INPUT,
+                                 IO_PWM_OUTPUT)

codebug_tether/core.py

@@ -10,7 +10,7 @@
 
 IO_DIGITAL_OUTPUT = 0
 IO_DIGITAL_INPUT = 1
-IO_ANALOG_INPUT = 2
+IO_ANALOGUE_INPUT = 2
 IO_PWM_OUTPUT = 3
 
 # CHANNEL_INDEX_ROW_0 = 0
@@ -19,31 +19,30 @@
 # CHANNEL_INDEX_ROW_3 = 3
 # CHANNEL_INDEX_ROW_4 = 4
 (CHANNEL_INDEX_OUTPUT,
-CHANNEL_INDEX_LEG_INPUT,
-CHANNEL_INDEX_BUTTON_INPUT,
-CHANNEL_INDEX_ANALOGUE_INPUT_0,
-CHANNEL_INDEX_ANALOGUE_INPUT_1,
-CHANNEL_INDEX_ANALOGUE_INPUT_2,
-CHANNEL_INDEX_IO_DIRECTION_LEGS,
-CHANNEL_INDEX_IO_DIRECTION_EXT,
-CHANNEL_INDEX_PULLUPS,
-CHANNEL_INDEX_EXT_CONF,
-CHANNEL_INDEX_SPI_RATE,
-CHANNEL_INDEX_SPI_LENGTH,
-CHANNEL_INDEX_SPI_CONTROL,
-CHANNEL_INDEX_I2C_ADDR,
-CHANNEL_INDEX_I2C_LENGTH,
-CHANNEL_INDEX_I2C_CONTROL,
-CHANNEL_INDEX_UART_RX_OFFSET,
-CHANNEL_INDEX_UART_RX_LENGTH,
-CHANNEL_INDEX_UART_TX_OFFSET,
-CHANNEL_INDEX_UART_TX_LENGTH,
-CHANNEL_INDEX_UART_CONTROL,
-CHANNEL_INDEX_COLOURTAIL_LENGTH,
-CHANNEL_INDEX_COLOURTAIL_CONTROL,
-CHANNEL_INDEX_PWM_CONF_0,
-CHANNEL_INDEX_PWM_CONF_1,
-CHANNEL_INDEX_PWM_CONF_2) = range(5, 31)
+ CHANNEL_INDEX_LEG_INPUT,
+ CHANNEL_INDEX_BUTTON_INPUT,
+ CHANNEL_INDEX_ANALOGUE_CONF,
+ CHANNEL_INDEX_ANALOGUE_INPUT,
+ CHANNEL_INDEX_IO_DIRECTION_LEGS,
+ CHANNEL_INDEX_IO_DIRECTION_EXT,
+ CHANNEL_INDEX_PULLUPS,
+ CHANNEL_INDEX_EXT_CONF,
+ CHANNEL_INDEX_SPI_RATE,
+ CHANNEL_INDEX_SPI_LENGTH,
+ CHANNEL_INDEX_SPI_CONTROL,
+ CHANNEL_INDEX_I2C_ADDR,
+ CHANNEL_INDEX_I2C_LENGTH,
+ CHANNEL_INDEX_I2C_CONTROL,
+ CHANNEL_INDEX_UART_RX_OFFSET,
+ CHANNEL_INDEX_UART_RX_LENGTH,
+ CHANNEL_INDEX_UART_TX_OFFSET,
+ CHANNEL_INDEX_UART_TX_LENGTH,
+ CHANNEL_INDEX_UART_CONTROL,
+ CHANNEL_INDEX_COLOURTAIL_LENGTH,
+ CHANNEL_INDEX_COLOURTAIL_CONTROL,
+ CHANNEL_INDEX_PWM_CONF_0,
+ CHANNEL_INDEX_PWM_CONF_1,
+ CHANNEL_INDEX_PWM_CONF_2) = range(5, 30)
 
 EXTENSION_CONF_IO = 0x01
 EXTENSION_CONF_SPI = 0x02
@@ -115,12 +114,11 @@ def read_analogue(self, leg_index):
             128
 
         """
-        if leg_index == 0:
-            return self.get(CHANNEL_INDEX_ANALOGUE_INPUT_0)
-        elif leg_index == 1:
-            return self.get(CHANNEL_INDEX_ANALOGUE_INPUT_1)
-        elif leg_index == 2:
-            return self.get(CHANNEL_INDEX_ANALOGUE_INPUT_2)
+        # set which leg to read (and do the read)
+        self.set(CHANNEL_INDEX_ANALOGUE_CONF, leg_index)
+        # return the value
+        analogue_value = self.get(CHANNEL_INDEX_ANALOGUE_INPUT)
+        return struct.unpack('B', analogue_value)[0]
 
     def set_pullup(self, input_index, state):
         """Sets the state of the input pullups. Turn off to enable touch
@@ -153,9 +151,11 @@ def set_leg_io(self, leg_index, direction):
 
         """
         if leg_index < 4:
-            clear_mask = 0b11 << leg_index * 2
+            clear_mask = 0xff ^ (0b11 << leg_index * 2)
             direction_mask = (0b11 & direction) << leg_index * 2
+            print("and_mask: {}".format(bin(clear_mask)))
             self.and_mask(CHANNEL_INDEX_IO_DIRECTION_LEGS, clear_mask)
+            print("or_mask: {}".format(bin(direction_mask)))
             self.or_mask(CHANNEL_INDEX_IO_DIRECTION_LEGS, direction_mask)
         else:
             ext_index = leg_index - 4

codebug_tether/serial_channel_device.py

@@ -111,7 +111,7 @@ def set_bulk(self, channel_index, values):
         self.transaction(
             struct.pack('BB',
                         (CMD_SET_BULK << 5 | channel_index & 0x1f),
-                        len(values)) + bytes(values))
+                        len(values)) + bytes((values,)))
 
     def and_mask(self, channel_index, mask):
         """Returns AndPacket as bytes.
@@ -127,7 +127,7 @@ def and_mask(self, channel_index, mask):
         """
         self.transaction(
             struct.pack('B', (CMD_AND << 5 | channel_index & 0x1f)) + \
-            bytes(mask))
+            bytes((mask,)))
 
     def or_mask(self, channel_index, mask):
         """Returns OrPacket as bytes.
@@ -143,7 +143,7 @@ def or_mask(self, channel_index, mask):
         """
         self.transaction(
             struct.pack('B', (CMD_OR << 5 | channel_index & 0x1f)) + \
-            bytes(mask))
+            bytes((mask,)))
 
     def set_bit(self, channel_index, bit_index, state):
         """Sets a bit in a channel to state."""
@@ -189,7 +189,7 @@ def set_buffer(self, buffer_index, values, offset=0):
             struct.pack('BBB',
                         (CMD_SET_BUFFER << 5 | buffer_index & 0x1f),
                         offset,
-                        len(values)) + bytes(values))
+                        len(values)) + bytes((values,)))
 
     def transaction(self, tx_bytes):
         """Sends a packet and waits for a ACK response."""