Gurkengewuerz/audio-reactive-led-strip
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #20 ESP8266 can send multiple packets

Browse Source 
Previously there was no limit to the number of bytes that could be sent per packet. This commit enforces a limit on the amount of pixel information per packet.
This commit is contained in:
Scott Lawson 2017-01-30 07:11:07 -08:00 committed by GitHub
parent 5fe2f71bea
commit d6bf763c67
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
python/led.py
View File

@ -40,6 +40,7 @@ _prev_pixels = np.tile(253, (3, config.N_PIXELS))
pixels = np.tile(1, (3, config.N_PIXELS)) pixels = np.tile(1, (3, config.N_PIXELS))
"""Pixel values for the LED strip""" """Pixel values for the LED strip"""
_is_python_2 = int(platform.python_version_tuple()[0]) == 2
def _update_esp8266(): def _update_esp8266():
"""Sends UDP packets to ESP8266 to update LED strip values """Sends UDP packets to ESP8266 to update LED strip values
@ -59,24 +60,27 @@ def _update_esp8266():
global pixels, _prev_pixels global pixels, _prev_pixels
# Truncate values and cast to integer # Truncate values and cast to integer
pixels = np.clip(pixels, 0, 255).astype(int) pixels = np.clip(pixels, 0, 255).astype(int)
# Optionally apply gamma correctio # Optionally apply gamma correc tio
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
is_python_2 = int(platform.python_version_tuple()[0]) == 2 m = '' if _is_python_2 else []
m = '' if is_python_2 else [] MAX_PIXELS_PER_PACKET = 126
for i in range(config.N_PIXELS): # Pixel indices
# Ignore pixels if they haven't changed (saves bandwidth) idx = range(pixels.shape[1])
if np.array_equal(p[:, i], _prev_pixels[:, i]): idx = [i for i in idx if not np.array_equal(p[:, i], _prev_pixels[:, i])]
continue n_packets = len(idx) // MAX_PIXELS_PER_PACKET + 1
if is_python_2: idx = np.array_split(idx, n_packets)
m += chr(i) + chr(p[0][i]) + chr(p[1][i]) + chr(p[2][i]) for packet_indices in idx:
else: for i in packet_indices:
m.append(i) # Index of pixel to change if _is_python_2:
m.append(p[0][i]) # Pixel red value m += chr(i) + chr(p[0][i]) + chr(p[1][i]) + chr(p[2][i])
m.append(p[1][i]) # Pixel green value else:
m.append(p[2][i]) # Pixel blue value m.append(i) # Index of pixel to change
m = m if is_python_2 else bytes(m) m.append(p[0][i]) # Pixel red value
_sock.sendto(m, (config.UDP_IP, config.UDP_PORT)) m.append(p[1][i]) # Pixel green 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)
@ -158,4 +162,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(1) time.sleep(.1)