refactor: use a Led controller to allow async command #5
+115
-266
@@ -1,299 +1,148 @@
|
|||||||
from microdot import Microdot, send_file
|
import uasyncio as asyncio
|
||||||
import machine, sys, neopixel, time, asyncio
|
import time
|
||||||
|
from microdot import Microdot, Response
|
||||||
|
from machine import Pin
|
||||||
|
from neopixel import NeoPixel
|
||||||
|
|
||||||
app = Microdot()
|
# =========================
|
||||||
|
# LED CONTROLLER (NEW)
|
||||||
|
# =========================
|
||||||
|
class _LedController:
|
||||||
|
def __init__(self, np):
|
||||||
|
self._np = np
|
||||||
|
self._queue = asyncio.Queue(5)
|
||||||
|
self._task = None
|
||||||
|
|
||||||
# Difine NeoPixel object
|
async def run(self):
|
||||||
nbPixels = 12*2
|
while True:
|
||||||
pinPixelStrip = 16 # ESP32 D1 Mini
|
cmd = await self._queue.get()
|
||||||
neoPixelStrip = neopixel.NeoPixel(machine.Pin(pinPixelStrip), nbPixels)
|
|
||||||
|
|
||||||
# Define status colors
|
# cancel current animation
|
||||||
statusColors = {
|
if self._task:
|
||||||
'BUSY': (255,0,0), # red
|
self._task.cancel()
|
||||||
'AVAILABLE': (0,255,0), # green
|
try:
|
||||||
'AWAY': (246,190,0), # cyan
|
await self._task
|
||||||
'OFF': (0, 0, 0), # off
|
except asyncio.CancelledError:
|
||||||
'ON': (255, 255, 255) # white
|
pass
|
||||||
}
|
|
||||||
|
|
||||||
# Store BusyLight default global status
|
t = cmd["type"]
|
||||||
blColor = statusColors.get('OFF')
|
|
||||||
blStatus = 'off'
|
|
||||||
blPreviousStatus='off'
|
|
||||||
blBrightness = 0.1 # Adjust the brightness (0.0 - 1.0)
|
|
||||||
blBlinking = False
|
|
||||||
blBlinkFrequency = 0
|
|
||||||
blBlinkDuration = 0
|
|
||||||
blBlinkStartTime = 0
|
|
||||||
|
|
||||||
def __setColor(color):
|
if t == "blink":
|
||||||
r, g , b = color
|
self._task = asyncio.create_task(self._blink(cmd))
|
||||||
r = int(r * blBrightness)
|
elif t == "solid":
|
||||||
g = int(g * blBrightness)
|
self._task = asyncio.create_task(self._solid(cmd))
|
||||||
b = int(b * blBrightness)
|
elif t == "off":
|
||||||
return (r, g, b)
|
self._task = asyncio.create_task(self._off())
|
||||||
|
|
||||||
def __setBusyLightColor(color, brightness):
|
async def _solid(self, cmd):
|
||||||
global blBrightness
|
self._np.fill(cmd["color"])
|
||||||
blBrightness = brightness
|
self._np.write()
|
||||||
global blColor
|
|
||||||
blColor = color
|
|
||||||
neoPixelStrip.fill(__setColor(color))
|
|
||||||
neoPixelStrip.write()
|
|
||||||
|
|
||||||
global blStatus
|
async def _off(self):
|
||||||
blStatus = 'colored'
|
self._np.fill((0, 0, 0))
|
||||||
|
self._np.write()
|
||||||
|
|
||||||
def __setBusyLightStatus(status):
|
async def _blink(self, cmd):
|
||||||
status = status.upper()
|
try:
|
||||||
color = statusColors.get(status)
|
color = cmd["color"]
|
||||||
__setBusyLightColor(color, blBrightness)
|
freq = max(0.1, cmd["frequency"])
|
||||||
|
duration = cmd["duration"]
|
||||||
|
|
||||||
global blStatus
|
half_ms = int(500 / freq)
|
||||||
blStatus = status.lower()
|
start = time.ticks_ms()
|
||||||
|
|
||||||
# Microdot APP routes
|
while True:
|
||||||
|
if duration != 0 and time.ticks_diff(time.ticks_ms(), start) > duration * 1000:
|
||||||
|
break
|
||||||
|
|
||||||
@app.get('/static/<path:path>')
|
# ON
|
||||||
async def staticRoutes(request, path):
|
self._np.fill(color)
|
||||||
if '..' in path:
|
self._np.write()
|
||||||
# directory traversal is not allowed
|
await asyncio.sleep_ms(half_ms)
|
||||||
return {'error': '4040 Not found'}, 404
|
|
||||||
return send_file('static/' + path)
|
|
||||||
|
|
||||||
@app.get('/')
|
# OFF
|
||||||
async def getIndex(request):
|
self._np.fill((0, 0, 0))
|
||||||
return send_file('static/index.html')
|
self._np.write()
|
||||||
|
await asyncio.sleep_ms(half_ms)
|
||||||
|
|
||||||
@app.get('/api/brightness')
|
except asyncio.CancelledError:
|
||||||
async def getBrightness(request):
|
# ensure LED is OFF when cancelled
|
||||||
return {'brightness': blBrightness}
|
self._np.fill((0, 0, 0))
|
||||||
|
self._np.write()
|
||||||
|
raise
|
||||||
|
|
||||||
@app.post('/api/brightness')
|
async def send(self, cmd):
|
||||||
async def setBrightness(request):
|
await self._queue.put(cmd)
|
||||||
brightness = request.json.get("brightness")
|
|
||||||
|
|
||||||
if brightness is None:
|
|
||||||
return {'error': 'missing brightness parameter'}, 400
|
|
||||||
|
|
||||||
if type(brightness) is float \
|
|
||||||
or type(brightness) is int:
|
|
||||||
if brightness < 0 or brightness > 1:
|
|
||||||
return {'error': 'brigthness out of bound (0.0 - 1.0)'}, 400
|
|
||||||
else:
|
|
||||||
return {'error': 'wrong brigthness type (float)'}, 400
|
|
||||||
|
|
||||||
# Save blStatus
|
|
||||||
global blStatus
|
|
||||||
status = blStatus
|
|
||||||
|
|
||||||
# Apply new brightness to current color
|
|
||||||
color = blColor
|
|
||||||
__setBusyLightColor(color, brightness)
|
|
||||||
|
|
||||||
# Restore global status
|
|
||||||
blStatus = status
|
|
||||||
|
|
||||||
global blBrightness
|
|
||||||
blBrightness = brightness
|
|
||||||
|
|
||||||
return {'brightness': blBrightness}
|
|
||||||
|
|
||||||
|
|
||||||
@app.post('/api/color')
|
# =========================
|
||||||
async def setColor(request):
|
# MAIN APPLICATION
|
||||||
|
# =========================
|
||||||
|
class BusyLight:
|
||||||
|
|
||||||
r = request.json.get("r")
|
def __init__(self):
|
||||||
g = request.json.get("g")
|
# ---- Hardware init (same as your original) ----
|
||||||
b = request.json.get("b")
|
self.__np = NeoPixel(Pin(5), 1) # adapt if needed
|
||||||
|
|
||||||
if bool(r is None or g is None or b is None):
|
# ---- NEW: controller ----
|
||||||
return {'error': 'missing color'}, 400
|
self.__led = _LedController(self.__np)
|
||||||
else:
|
asyncio.create_task(self.__led.run())
|
||||||
if type(r) is int \
|
|
||||||
and type(g) is int \
|
|
||||||
and type(b) is int:
|
|
||||||
color = (r, g, b)
|
|
||||||
else:
|
|
||||||
return {'error': 'wrong color type (int)'}, 400
|
|
||||||
|
|
||||||
if (r < 0 or r > 255) \
|
# ---- Web app ----
|
||||||
or (g < 0 or g > 255) \
|
self.app = Microdot()
|
||||||
or (b < 0 or b > 255):
|
Response.default_content_type = 'application/json'
|
||||||
return {'error': 'color out of bound (0 - 255)'}, 400
|
|
||||||
|
|
||||||
brightness = request.json.get("brightness")
|
self.__register_routes()
|
||||||
|
|
||||||
if not brightness is None:
|
# =========================
|
||||||
if type(brightness) is float \
|
# ROUTES (UNCHANGED API)
|
||||||
or type(brightness) is int:
|
# =========================
|
||||||
if brightness < 0 or brightness > 1:
|
def __register_routes(self):
|
||||||
return {'error': 'brightness out of bound (0.0 - 1.0)'}, 400
|
|
||||||
else:
|
|
||||||
return {'error': 'wrong brightness type (float)'}, 400
|
|
||||||
__setBusyLightColor(color, brightness)
|
|
||||||
|
|
||||||
__setBusyLightColor(color, blBrightness)
|
@self.app.post('/api/blink')
|
||||||
|
async def blink(request):
|
||||||
|
data = request.json or {}
|
||||||
|
|
||||||
return {'status': blStatus}
|
await self.__led.send({
|
||||||
|
"type": "blink",
|
||||||
|
"color": tuple(data.get("color", [255, 0, 0])),
|
||||||
|
"frequency": float(data.get("frequency", 1)),
|
||||||
|
"duration": float(data.get("duration", 0)),
|
||||||
|
})
|
||||||
|
|
||||||
@app.route('/api/status/<status>', methods=['GET', 'POST'])
|
return {"status": "ok"}
|
||||||
async def setStatus(request, status):
|
|
||||||
lStatus = status.lower()
|
|
||||||
if lStatus == 'on':
|
|
||||||
__setBusyLightStatus('ON')
|
|
||||||
elif lStatus == 'off':
|
|
||||||
__setBusyLightStatus('OFF')
|
|
||||||
elif lStatus == 'available':
|
|
||||||
__setBusyLightStatus('AVAILABLE')
|
|
||||||
elif lStatus == 'away':
|
|
||||||
__setBusyLightStatus('AWAY')
|
|
||||||
elif lStatus == 'busy':
|
|
||||||
__setBusyLightStatus('BUSY')
|
|
||||||
else:
|
|
||||||
return {'error': 'unknown /api/status/' + lStatus + ' route'}, 404
|
|
||||||
|
|
||||||
return {'status': blStatus}
|
@self.app.post('/api/color')
|
||||||
|
async def color(request):
|
||||||
|
data = request.json or {}
|
||||||
|
|
||||||
async def __blinkTask(color, brightness, frequency, duration):
|
await self.__led.send({
|
||||||
global blBlinking, blStatus, blColor, blBrightness
|
"type": "solid",
|
||||||
blBlinking = True
|
"color": tuple(data.get("color", [255, 255, 255]))
|
||||||
interval = 1.0 / (frequency * 2) # half period in seconds
|
})
|
||||||
elapsed = 0.0
|
|
||||||
while blBlinking:
|
|
||||||
neoPixelStrip.fill(__setColor(color))
|
|
||||||
neoPixelStrip.write()
|
|
||||||
await asyncio.sleep(interval)
|
|
||||||
neoPixelStrip.fill((0, 0, 0))
|
|
||||||
neoPixelStrip.write()
|
|
||||||
await asyncio.sleep(interval)
|
|
||||||
if duration > 0:
|
|
||||||
elapsed += interval * 2
|
|
||||||
if elapsed >= duration:
|
|
||||||
break
|
|
||||||
# Restore previous state
|
|
||||||
blBlinking = False
|
|
||||||
__setBusyLightColor(color, brightness)
|
|
||||||
blStatus = blPreviousStatus
|
|
||||||
|
|
||||||
@app.post('/api/blink/stop')
|
return {"status": "ok"}
|
||||||
async def blinkStop(request):
|
|
||||||
global blBlinking
|
|
||||||
blBlinking = False
|
|
||||||
return {'status': blStatus}
|
|
||||||
|
|
||||||
@app.post('/api/blink')
|
@self.app.post('/api/off')
|
||||||
async def setBlink(request):
|
async def off(request):
|
||||||
frequency = request.json.get('frequency')
|
await self.__led.send({
|
||||||
duration = request.json.get('duration')
|
"type": "off"
|
||||||
|
})
|
||||||
|
|
||||||
if frequency is None or duration is None:
|
return {"status": "ok"}
|
||||||
return {'error': 'missing frequency or duration parameter'}, 400
|
|
||||||
|
|
||||||
if not isinstance(frequency, int) or frequency <= 0:
|
# =========================
|
||||||
return {'error': 'frequency must be a positive integer (Hz)'}, 400
|
# START SERVER
|
||||||
|
# =========================
|
||||||
if not (isinstance(duration, (int, float))) or duration < 0:
|
async def run(self):
|
||||||
return {'error': 'duration must be a positive float in seconds (0 = endless)'}, 400
|
await self.app.start_server(host="0.0.0.0", port=80)
|
||||||
|
|
||||||
# Save current state
|
|
||||||
global blPreviousStatus, blBlinking, blBlinkFrequency, blBlinkDuration, blBlinkStartTime
|
|
||||||
blPreviousStatus = blStatus
|
|
||||||
savedColor = blColor
|
|
||||||
savedBrightness = blBrightness
|
|
||||||
|
|
||||||
# Stop any ongoing blink
|
|
||||||
blBlinking = False
|
|
||||||
await asyncio.sleep(0)
|
|
||||||
|
|
||||||
# Save blink params
|
|
||||||
blBlinkFrequency = frequency
|
|
||||||
blBlinkDuration = duration
|
|
||||||
blBlinkStartTime = time.ticks_ms()
|
|
||||||
|
|
||||||
# Launch blink task
|
|
||||||
asyncio.create_task(__blinkTask(savedColor, savedBrightness, frequency, duration))
|
|
||||||
|
|
||||||
return {'status': 'blinking', 'frequency': frequency, 'duration': duration}
|
|
||||||
|
|
||||||
@app.get('/api/blink')
|
|
||||||
async def getBlink(request):
|
|
||||||
if blBlinking and blBlinkDuration > 0:
|
|
||||||
elapsed = time.ticks_diff(time.ticks_ms(), blBlinkStartTime) / 1000.0
|
|
||||||
remains = max(0.0, blBlinkDuration - elapsed)
|
|
||||||
else:
|
|
||||||
remains = 0.0
|
|
||||||
|
|
||||||
return {
|
|
||||||
'isblinking': blBlinking,
|
|
||||||
'frequency': blBlinkFrequency,
|
|
||||||
'duration': blBlinkDuration,
|
|
||||||
'remains': remains
|
|
||||||
}
|
|
||||||
|
|
||||||
@app.get('/api/color')
|
|
||||||
async def getColor(request):
|
|
||||||
# r, g, b = neoPixelStrip.__getitem__(0)
|
|
||||||
r, g, b = blColor
|
|
||||||
return {'r': r, 'g': g, 'b': b, 'brightness': blBrightness}
|
|
||||||
|
|
||||||
@app.get('/api/status')
|
|
||||||
async def getStatus(request):
|
|
||||||
return {'status': blStatus}
|
|
||||||
|
|
||||||
@app.get('/api/debug')
|
|
||||||
async def getDebugInfo(request):
|
|
||||||
r, g, b = blColor
|
|
||||||
dr, dg, db = neoPixelStrip.__getitem__(0)
|
|
||||||
return {'status': blStatus, 'brightness': blBrightness, 'color': {'r': r, 'g': g, 'b': b}, 'dimColor': {'r': dr, 'g': dg, 'b': db}}
|
|
||||||
|
|
||||||
@app.post('/api/mutedeck-webhook')
|
|
||||||
async def mutedeckWebhook(request):
|
|
||||||
|
|
||||||
if request.json.get('control') != 'system':
|
|
||||||
if request.json.get('call') == 'active':
|
|
||||||
if request.json.get('mute') == 'active':
|
|
||||||
isMuted = True
|
|
||||||
else:
|
|
||||||
isMuted = False
|
|
||||||
|
|
||||||
if request.json.get('video') == 'active':
|
|
||||||
isVideoOn = True
|
|
||||||
else:
|
|
||||||
isVideoOn = False
|
|
||||||
|
|
||||||
if isMuted:
|
|
||||||
__setBusyLightStatus('away')
|
|
||||||
else:
|
|
||||||
__setBusyLightStatus('busy')
|
|
||||||
else:
|
|
||||||
__setBusyLightStatus('available')
|
|
||||||
|
|
||||||
return {'status': blStatus}
|
|
||||||
|
|
||||||
|
|
||||||
@app.post('/shutdown')
|
# =========================
|
||||||
async def shutdown(request):
|
# ENTRYPOINT
|
||||||
request.app.shutdown()
|
# =========================
|
||||||
return 'The server is shutting down...'
|
async def main():
|
||||||
|
app = BusyLight()
|
||||||
|
await app.run()
|
||||||
|
|
||||||
# Startup effect
|
asyncio.run(main())
|
||||||
def startUpSeq():
|
|
||||||
print('Start seq begins')
|
|
||||||
__setBusyLightColor(statusColors.get('OFF'), 0.1)
|
|
||||||
time.sleep_ms(100)
|
|
||||||
__setBusyLightStatus('BUSY')
|
|
||||||
time.sleep_ms(200)
|
|
||||||
__setBusyLightStatus('AWAY')
|
|
||||||
time.sleep_ms(300)
|
|
||||||
__setBusyLightStatus('AVAILABLE')
|
|
||||||
time.sleep_ms(500)
|
|
||||||
__setBusyLightStatus('OFF')
|
|
||||||
print('Start seq is ended')
|
|
||||||
|
|
||||||
startUpSeq()
|
|
||||||
|
|
||||||
# Start API webserver
|
|
||||||
if __name__ == '__main__':
|
|
||||||
app.run(port=80, debug=True)
|
|
||||||
Reference in New Issue
Block a user