Python 2.7 compatibility fix
This commit is contained in:
parent
d828f5a273
commit
219eb2b62f
@ -1,7 +1,7 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from __future__ import division
|
from __future__ import division
|
||||||
from __future__ import unicode_literals
|
|
||||||
|
|
||||||
|
import platform
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import config
|
import config
|
||||||
|
|
||||||
@ -48,18 +48,22 @@ def _update_esp8266():
|
|||||||
# Optionally apply gamma correctio
|
# Optionally apply gamma correctio
|
||||||
p = _gamma[pixels] if config.SOFTWARE_GAMMA_CORRECTION else np.copy(pixels)
|
p = _gamma[pixels] if config.SOFTWARE_GAMMA_CORRECTION else np.copy(pixels)
|
||||||
# Send UDP packets when using ESP8266
|
# Send UDP packets when using ESP8266
|
||||||
m = []
|
is_python_2 = int(platform.python_version_tuple()[0]) == 2
|
||||||
|
m = '' if is_python_2 else []
|
||||||
for i in range(config.N_PIXELS):
|
for i in range(config.N_PIXELS):
|
||||||
# Ignore pixels if they haven't changed (saves bandwidth)
|
# Ignore pixels if they haven't changed (saves bandwidth)
|
||||||
if np.array_equal(p[:, i], _prev_pixels[:, i]):
|
if np.array_equal(p[:, i], _prev_pixels[:, i]):
|
||||||
continue
|
continue
|
||||||
# Byte
|
if is_python_2:
|
||||||
|
m += chr(i) + chr(p[0][i]) + chr(p[1][i]) + chr(p[2][i])
|
||||||
|
else:
|
||||||
m.append(i) # Index of pixel to change
|
m.append(i) # Index of pixel to change
|
||||||
m.append(p[0][i]) # Pixel red value
|
m.append(p[0][i]) # Pixel red value
|
||||||
m.append(p[1][i]) # Pixel green value
|
m.append(p[1][i]) # Pixel green value
|
||||||
m.append(p[2][i]) # Pixel blue value
|
m.append(p[2][i]) # Pixel blue value
|
||||||
|
m = m if is_python_2 else bytes(m)
|
||||||
|
_sock.sendto(m, (config.UDP_IP, config.UDP_PORT))
|
||||||
_prev_pixels = np.copy(p)
|
_prev_pixels = np.copy(p)
|
||||||
_sock.sendto(bytes(m), (config.UDP_IP, config.UDP_PORT))
|
|
||||||
|
|
||||||
|
|
||||||
def _update_pi():
|
def _update_pi():
|
||||||
@ -112,4 +116,4 @@ if __name__ == '__main__':
|
|||||||
while True:
|
while True:
|
||||||
pixels = np.roll(pixels, 1, axis=1)
|
pixels = np.roll(pixels, 1, axis=1)
|
||||||
update()
|
update()
|
||||||
time.sleep(0.01)
|
time.sleep(1)
|
||||||
|
Loading…
Reference in New Issue
Block a user