Merge branch 'master' into dev

python/neopixel.py

@@ -28,7 +28,7 @@ def __getitem__(self, pos):
 		# Handle if a slice of positions are passed in by grabbing all the values
 		# and returning them in a list.
 		if isinstance(pos, slice):
-			return [ws.ws2811_led_get(self.channel, n) for n in range(pos.indices(self.size))]
+			return [ws.ws2811_led_get(self.channel, n) for n in xrange(*pos.indices(self.size))]
 		# Else assume the passed in value is a number to the position.
 		else:
 			return ws.ws2811_led_get(self.channel, pos)
@@ -41,7 +41,7 @@ def __setitem__(self, pos, value):
 		# LED data values to the provided values.
 		if isinstance(pos, slice):
 			index = 0
-			for n in range(pos.indices(self.size)):
+			for n in xrange(*pos.indices(self.size)):
 				ws.ws2811_led_set(self.channel, n, value[index])
 				index += 1
 		# Else assume the passed in value is a number to the position.

rpihw.c

@@ -280,6 +280,16 @@ static const rpi_hw_t rpi_hw_info[] = {
         .videocore_base = VIDEOCORE_BASE_RPI2,
         .desc = "Pi 3",
     },
+    //
+    // Pi Compute Module 3
+    //
+    {
+        .hwver  = 0xa020a0,
+        .type = RPI_HWVER_TYPE_PI2,
+        .periph_base = PERIPH_BASE_RPI2,
+        .videocore_base = VIDEOCORE_BASE_RPI2,
+        .desc = "Pi 3",
+    },
 
 };