Merge pull request #5946 from tammymakesthings/pr4218-neopixel-show-after-deinit

Fixes neopixel show() after deinit() not raising an exception

Author: dhalbert

ports/atmel-samd/mpconfigport.mk

@@ -20,6 +20,7 @@ ifeq ($(CHIP_FAMILY),samd21)
 # fit in 256kB of flash
 
 CIRCUITPY_AESIO ?= 0
+CIRCUITPY_ATEXIT ?= 0
 CIRCUITPY_AUDIOMIXER ?= 0
 CIRCUITPY_BINASCII ?= 0
 CIRCUITPY_BITBANGIO ?= 0
@@ -33,6 +34,7 @@ CIRCUITPY_COUNTIO ?= 0
 # Not enough RAM for framebuffers
 CIRCUITPY_FRAMEBUFFERIO ?= 0
 CIRCUITPY_FREQUENCYIO ?= 0
+CIRCUITPY_GETPASS ?= 0
 CIRCUITPY_GIFIO ?= 0
 CIRCUITPY_I2CPERIPHERAL ?= 0
 CIRCUITPY_JSON ?= 0

shared-bindings/neopixel_write/__init__.c

@@ -29,8 +29,15 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/util.h"
 #include "supervisor/shared/translate.h"
 
+STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) {
+    if (common_hal_digitalio_digitalinout_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
 //| """Low-level neopixel implementation
 //|
 //| The `neopixel_write` module contains a helper method to write out bytes in
@@ -60,8 +67,13 @@ STATIC mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj
     if (!mp_obj_is_type(digitalinout_obj, &digitalio_digitalinout_type)) {
         mp_raise_TypeError_varg(translate("Expected a %q"), digitalio_digitalinout_type.name);
     }
+
     // Convert parameters into expected types.
     const digitalio_digitalinout_obj_t *digitalinout = MP_OBJ_TO_PTR(digitalinout_obj);
+
+    // Check to see if the NeoPixel has been deinited before writing to it.
+    check_for_deinit(digitalinout_obj);
+
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
     // Call platform's neopixel write function with provided buffer and options.

tests/circuitpython-manual/audiobusio/i2s_sample_loop.py

@@ -19,7 +19,7 @@
 # signed 16 bit
 s16 = array.array("h", [0] * length)
 for i in range(length):
-    s16[i] = int(math.sin(math.pi * 2 * i / length) * (2 ** 15))
+    s16[i] = int(math.sin(math.pi * 2 * i / length) * (2**15))
     print(s16[i])
 
 sample = audiocore.RawSample(s16, sample_rate=8000)

tests/circuitpython-manual/audiopwmio/single_buffer_loop.py

@@ -19,29 +19,29 @@
 # unsigned 8 bit
 u8 = array.array("B", [0] * length)
 for i in range(length):
-    u8[i] = int(math.sin(math.pi * 2 * i / length) * (2 ** 7) + 2 ** 7)
+    u8[i] = int(math.sin(math.pi * 2 * i / length) * (2**7) + 2**7)
 
 samples.append(audiocore.RawSample(u8, sample_rate=4000))
 
 # signed 8 bit
 s8 = array.array("b", [0] * length)
 for i in range(length):
-    s8[i] = int(math.sin(math.pi * 2 * i / length) * (2 ** 7))
+    s8[i] = int(math.sin(math.pi * 2 * i / length) * (2**7))
 
 samples.append(audiocore.RawSample(s8, sample_rate=16000))
 
 # unsigned 16 bit
 u16 = array.array("H", [0] * length)
 for i in range(length):
-    u16[i] = int(math.sin(math.pi * 2 * i / length) * (2 ** 15) + 2 ** 15)
+    u16[i] = int(math.sin(math.pi * 2 * i / length) * (2**15) + 2**15)
 
 samples.append(audiocore.RawSample(u16, sample_rate=8000))
 
 
 # signed 16 bit
 s16 = array.array("h", [0] * length)
 for i in range(length):
-    s16[i] = int(math.sin(math.pi * 2 * i / length) * (2 ** 15))
+    s16[i] = int(math.sin(math.pi * 2 * i / length) * (2**15))
 
 samples.append(audiocore.RawSample(s16, sample_rate=8000))
 

tests/cpydiff/modules_random_randint.py

@@ -8,5 +8,5 @@
 import random
 
 
-x = random.randint(2 ** 128 - 1, 2 ** 128)
+x = random.randint(2**128 - 1, 2**128)
 print("x={}".format(x))

tests/extmod/uhashlib_sha1.py

@@ -22,7 +22,7 @@
 
 sha1 = hashlib.sha1(b"hello")
 try:
-    sha1.update(u"world")
+    sha1.update("world")
 except TypeError as e:
     print("TypeError")
 print(sha1.digest())

tests/extmod/uhashlib_sha256.py

@@ -28,7 +28,7 @@
 
 sha256 = hashlib.sha256(b"hello")
 try:
-    sha256.update(u"world")
+    sha256.update("world")
 except TypeError as e:
     print("TypeError")
 print(sha256.digest())

tests/float/complex1.py

@@ -27,15 +27,15 @@
 print(1j / 2)
 print((1j / 2j).real)
 print(1j / (1 + 2j))
-ans = 0j ** 0
+ans = 0j**0
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 0j ** 1
+ans = 0j**1
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 0j ** 0j
+ans = 0j**0j
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 1j ** 2.5
+ans = 1j**2.5
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 1j ** 2.5j
+ans = 1j**2.5j
 print("%.5g %.5g" % (ans.real, ans.imag))
 
 # comparison
@@ -116,10 +116,10 @@
 
 # zero division via power
 try:
-    0j ** -1
+    0j**-1
 except ZeroDivisionError:
     print("ZeroDivisionError")
 try:
-    0j ** 1j
+    0j**1j
 except ZeroDivisionError:
     print("ZeroDivisionError")

tests/float/float1.py

@@ -88,7 +88,7 @@
     print("ZeroDivisionError")
 
 try:
-    0.0 ** -1
+    0.0**-1
 except ZeroDivisionError:
     print("ZeroDivisionError")
 

tests/float/float2int_doubleprec_intbig.py

@@ -35,16 +35,16 @@
     print(int(1418774543.0))
     print("%d" % 1418774543.0)
     if ll_type == 3:
-        print(int(2.0 ** 100))
-        print("%d" % 2.0 ** 100)
+        print(int(2.0**100))
+        print("%d" % 2.0**100)
 else:
     print(int(1073741823.0))
     print("%d" % 1073741823.0)
 
 testpass = True
 p2_rng = ((30, 63, 1024), (62, 63, 1024))[is_64bit][ll_type]
 for i in range(0, p2_rng):
-    bitcnt = len(bin(int(2.0 ** i))) - 3
+    bitcnt = len(bin(int(2.0**i))) - 3
     if i != bitcnt:
         print("fail: 2**%u was %u bits long" % (i, bitcnt))
         testpass = False
@@ -53,7 +53,7 @@
 testpass = True
 p10_rng = ((9, 18, 23), (18, 18, 23))[is_64bit][ll_type]
 for i in range(0, p10_rng):
-    digcnt = len(str(int(10.0 ** i))) - 1
+    digcnt = len(str(int(10.0**i))) - 1
     if i != digcnt:
         print("fail: 10**%u was %u digits long" % (i, digcnt))
         testpass = False
@@ -72,28 +72,28 @@ def fp2int_test(num, name, should_fail):
 if ll_type != 2:
     if ll_type == 0:
         if is_64bit:
-            neg_bad_fp = -1.00000005 * 2.0 ** 62.0
-            pos_bad_fp = 2.0 ** 62.0
-            neg_good_fp = -(2.0 ** 62.0)
-            pos_good_fp = 0.99999993 * 2.0 ** 62.0
+            neg_bad_fp = -1.00000005 * 2.0**62.0
+            pos_bad_fp = 2.0**62.0
+            neg_good_fp = -(2.0**62.0)
+            pos_good_fp = 0.99999993 * 2.0**62.0
         else:
-            neg_bad_fp = -1.00000005 * 2.0 ** 30.0
-            pos_bad_fp = 2.0 ** 30.0
-            neg_good_fp = -(2.0 ** 30.0)
-            pos_good_fp = 0.9999999499 * 2.0 ** 30.0
+            neg_bad_fp = -1.00000005 * 2.0**30.0
+            pos_bad_fp = 2.0**30.0
+            neg_good_fp = -(2.0**30.0)
+            pos_good_fp = 0.9999999499 * 2.0**30.0
     else:
-        neg_bad_fp = -0.51 * 2.0 ** 64.0
-        pos_bad_fp = 2.0 ** 63.0
-        neg_good_fp = -(2.0 ** 63.0)
-        pos_good_fp = 1.9999998 * 2.0 ** 62.0
+        neg_bad_fp = -0.51 * 2.0**64.0
+        pos_bad_fp = 2.0**63.0
+        neg_good_fp = -(2.0**63.0)
+        pos_good_fp = 1.9999998 * 2.0**62.0
 
     fp2int_test(neg_bad_fp, "neg bad", True)
     fp2int_test(pos_bad_fp, "pos bad", True)
     fp2int_test(neg_good_fp, "neg good", False)
     fp2int_test(pos_good_fp, "pos good", False)
 else:
-    fp2int_test(-1.9999999999999981 * 2.0 ** 1023.0, "large neg", False)
-    fp2int_test(1.9999999999999981 * 2.0 ** 1023.0, "large pos", False)
+    fp2int_test(-1.9999999999999981 * 2.0**1023.0, "large neg", False)
+    fp2int_test(1.9999999999999981 * 2.0**1023.0, "large pos", False)
 
 fp2int_test(float("inf"), "inf test", True)
 fp2int_test(float("-inf"), "inf test", True)