From bb970c6fed9a7b6731a9b1fd423807b1d14763b5 Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 24 Sep 2017 09:57:38 -0400 Subject: [PATCH 1/3] allow value to be of type list in _set_item --- neopixel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neopixel.py b/neopixel.py index 872cca9..78e7f07 100644 --- a/neopixel.py +++ b/neopixel.py @@ -106,7 +106,7 @@ def _set_item(self, index, value): g = 0 b = 0 w = 0 - if type(value) == tuple and len(value) == self.bpp: + if ((type(value) == tuple) or (type(value) == list)) and len(value) == self.bpp: if self.bpp == 3: r, g, b = value else: From 15e637d140fb351fc9d8e2acd10b980b6cf9f7f4 Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Mon, 25 Sep 2017 06:34:18 -0400 Subject: [PATCH 2/3] modify __set_item__ to treat all non-int values as tuples --- neopixel.mpy | Bin 0 -> 3291 bytes neopixel.py | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 neopixel.mpy diff --git a/neopixel.mpy b/neopixel.mpy new file mode 100644 index 0000000000000000000000000000000000000000..6bf8a59d6efdaf904923f5d3f7143d755e20faa9 GIT binary patch literal 3291 zcmb7G-EZ606+f5Mw;el91KV{ZTefK>c3j1As|qQCqDWkLS<%E!ny!f&kd%03vy~{8 zqE>q^rjr=hfDPEgfWB=H8?cuFrDQu@v4J|uFFd3Ji`yMEqa1XjNp~JWg7Tol{M@pq5&cuPB@I&ZDEj zDZX#0CjGybq2shP!?ZLBAj^F|=Nd!z@EX4wwnj#O8D0reN>>I~cCK{NcU~#RS0Yrx ztL-@n!Ys31coUYb^A~1(!hN{V1G{GUUYQ85fy4L45T(^A+-x}BJB`{h}0p(2*T5_*9%Wb6g9a>MKL0Z zE_$NaWNa73_bPJ1W$>RkIrZvExSQ7ljmkLX58r-r#0$r|e1ys6Q0*+T~KFzWE^`0{F@;CFoHE6Yt>itIjK~$UQ2cQ4?#s4l%PDZ!z`vaGUn`C5vh~#0i zD^vHe_u4%Ait?r%V7W2Lv&R&%y!;Qy%@08FT=YTlA5is_cxONox3np$B?CGQJa5?%f zs4C?QYT3+{iu$%9#g|P3Pmi5%+W~-u5R)8j$|Xh*jO-o4zvqN~iEIjq zk>u#Hv1Bqiit?-0*XgiTW$snT7niGc>>+&nV!&eiek(c*Zxh@Da{H=v&AM*gur{Lq zfto_1zlF{83s&vdH?P%xeslNo(x=yJ?1>DF{o-bNx3#vuneMRGFKwnn*4l=9J~d{c zE)>AHHq%iIBp??y(T3U?{@V2$sUQ+QBsNlDt+6OuwPW|e8oaf4y}4S()ura@Jg(|G zJFJhI+ZS-V3qzz?J{naT>p2TRqD78r3SD^BFiHkXAs_QJuWBY+xFL#fMq`+|h3mdU26*kT*i8ZPY^N76xD$J|`qR$@JPMbxsYl}%a8 zQGdCh=4cS_hp%!glMz3sA?B!BV7rkwS)w@LhN)I5QbRVW-;lLA+VV+@@{}pJ7Q3~| z#gRuG%ll6;#c^3v;;N=s%y^l;SD|Q8ysZ9=#+6cBE17Y$Avd2~eyI}x>qYl8LVoc# zRY}a_rau$#@#4S3sNCnmp

)|15;%e1itvB#ZY~Zz49l&9RO)SoM0rKF&rmDY~o)&y@_N0@mS@i$q$$X36TH* literal 0 HcmV?d00001 diff --git a/neopixel.py b/neopixel.py index 78e7f07..89511fb 100644 --- a/neopixel.py +++ b/neopixel.py @@ -106,12 +106,7 @@ def _set_item(self, index, value): g = 0 b = 0 w = 0 - if ((type(value) == tuple) or (type(value) == list)) and len(value) == self.bpp: - if self.bpp == 3: - r, g, b = value - else: - r, g, b, w = value - elif type(value) == int: + if type(value) == int: r = value >> 16 g = (value >> 8) & 0xff b = value & 0xff @@ -123,6 +118,11 @@ def _set_item(self, index, value): r = 0 g = 0 b = 0 + elif len(value) == self.bpp: + if self.bpp == 3: + r, g, b = value + else: + r, g, b, w = value self.buf[offset + self.ORDER[0]] = r self.buf[offset + self.ORDER[1]] = g self.buf[offset + self.ORDER[2]] = b From e6e57f1cf987fc833d2bd20dca475814f07a2d3a Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Thu, 28 Sep 2017 14:42:41 -0400 Subject: [PATCH 3/3] remove neopixel.mpy --- neopixel.mpy | Bin 3291 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 neopixel.mpy diff --git a/neopixel.mpy b/neopixel.mpy deleted file mode 100644 index 6bf8a59d6efdaf904923f5d3f7143d755e20faa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3291 zcmb7G-EZ606+f5Mw;el91KV{ZTefK>c3j1As|qQCqDWkLS<%E!ny!f&kd%03vy~{8 zqE>q^rjr=hfDPEgfWB=H8?cuFrDQu@v4J|uFFd3Ji`yMEqa1XjNp~JWg7Tol{M@pq5&cuPB@I&ZDEj zDZX#0CjGybq2shP!?ZLBAj^F|=Nd!z@EX4wwnj#O8D0reN>>I~cCK{NcU~#RS0Yrx ztL-@n!Ys31coUYb^A~1(!hN{V1G{GUUYQ85fy4L45T(^A+-x}BJB`{h}0p(2*T5_*9%Wb6g9a>MKL0Z zE_$NaWNa73_bPJ1W$>RkIrZvExSQ7ljmkLX58r-r#0$r|e1ys6Q0*+T~KFzWE^`0{F@;CFoHE6Yt>itIjK~$UQ2cQ4?#s4l%PDZ!z`vaGUn`C5vh~#0i zD^vHe_u4%Ait?r%V7W2Lv&R&%y!;Qy%@08FT=YTlA5is_cxONox3np$B?CGQJa5?%f zs4C?QYT3+{iu$%9#g|P3Pmi5%+W~-u5R)8j$|Xh*jO-o4zvqN~iEIjq zk>u#Hv1Bqiit?-0*XgiTW$snT7niGc>>+&nV!&eiek(c*Zxh@Da{H=v&AM*gur{Lq zfto_1zlF{83s&vdH?P%xeslNo(x=yJ?1>DF{o-bNx3#vuneMRGFKwnn*4l=9J~d{c zE)>AHHq%iIBp??y(T3U?{@V2$sUQ+QBsNlDt+6OuwPW|e8oaf4y}4S()ura@Jg(|G zJFJhI+ZS-V3qzz?J{naT>p2TRqD78r3SD^BFiHkXAs_QJuWBY+xFL#fMq`+|h3mdU26*kT*i8ZPY^N76xD$J|`qR$@JPMbxsYl}%a8 zQGdCh=4cS_hp%!glMz3sA?B!BV7rkwS)w@LhN)I5QbRVW-;lLA+VV+@@{}pJ7Q3~| z#gRuG%ll6;#c^3v;;N=s%y^l;SD|Q8ysZ9=#+6cBE17Y$Avd2~eyI}x>qYl8LVoc# zRY}a_rau$#@#4S3sNCnmp

)|15;%e1itvB#ZY~Zz49l&9RO)SoM0rKF&rmDY~o)&y@_N0@mS@i$q$$X36TH*