add queue back, define simple interface (now you can only enqueue)

rebuild/led.lua

@@ -4,17 +4,18 @@ local MAX_BRIGHTNESS = 1023
 local HEART_BEAT_IDX = 1
 local TRIPLE_BLINK_IDX = 1
 local TIMER = TIMERS.led
-local IS_FADE_IN = false
+local Q = {}
 
 local debug_message = debug_message
 local gpio = gpio
 local pwm = pwm
 local tmr = tmr
 local table = table
+local next = next
 
 module(...)
 
-function init()
+local function init()
   debug_message('led.init')
 
   --handle timer, take exclusive control
@@ -27,54 +28,57 @@ function init()
   pwm.stop(LED_PIN)
 end
 
-function pattern(start_duty, )
+local function enqueue(pattern)
+  return function()
+    table.insert(Q, pattern)
+    if not tmr.state(TIMER) then
+      next_pattern()
+    end
+  end
+end
 
-function fade_in()
-  IS_FADE_IN = true
+local function fade_in()
   local current_brightness = pwm.getduty(LED_PIN)
-  current_brightness = current_brightness + 1
-  if(current_brightness > MAX_BRIGHTNESS) then
-    current_brightness = MAX_BRIGHTNESS
-  end
-  pwm.setduty(LED_PIN, current_brightness)
 
   if current_brightness < MAX_BRIGHTNESS then
+    current_brightness = current_brightness + 1
+    pwm.setduty(LED_PIN, current_brightness)
     tmr.alarm(TIMER, 2, tmr.ALARM_SINGLE, fade_in)
   else
-    IS_FADE_IN = false
+    next_pattern()
   end
 end
 
-function fade_out()
+local function fade_out()
   local current_brightness = pwm.getduty(LED_PIN)
-  current_brightness = current_brightness - 1
-  if(current_brightness < 0) then
-    current_brightness = 0
-  end
-  pwm.setduty(LED_PIN, current_brightness)
 
   if current_brightness > 0 then
+    current_brightness = current_brightness - 1
+    pwm.setduty(LED_PIN, current_brightness)
     tmr.alarm(TIMER, 2, tmr.ALARM_SINGLE, fade_out)
+  else
+    next_pattern()
   end
 end
 
-function heart_beat()
+local function heart_beat()
   local intervals = {40, 200, 40, 900} --alternating, millisec
   local current_brightness = pwm.getduty(LED_PIN)
+
   current_brightness = MAX_BRIGHTNESS - current_brightness
   pwm.setduty(LED_PIN, current_brightness)
-  
-  --endless
+
   tmr.alarm(TIMER, intervals[HEART_BEAT_IDX], tmr.ALARM_SINGLE, heart_beat)
 
   HEART_BEAT_IDX = HEART_BEAT_IDX + 1
   if HEART_BEAT_IDX > table.getn(intervals) then
     HEART_BEAT_IDX = 1
   end
+  -- must call next_pattern() yourself
 end
 
-function triple_blink()
-  local intervals =  {100, 20, 100, 20, 100, 20, 100} --alternating, millisec
+local function triple_blink()
+  local intervals =  {200, 50, 200, 50, 200, 50, 200} --alternating, millisec
 
   local current_brightness = pwm.getduty(LED_PIN)
   current_brightness = MAX_BRIGHTNESS - current_brightness
@@ -84,11 +88,25 @@ function triple_blink()
   if TRIPLE_BLINK_IDX > table.getn(intervals) then
     TRIPLE_BLINK_IDX = 1
     pwm.setduty(LED_PIN, 0)
+    next_pattern()
   else
     tmr.alarm(TIMER, intervals[TRIPLE_BLINK_IDX], tmr.ALARM_SINGLE, triple_blink)
   end
 end
 
-function is_fade_in() return IS_FADE_IN end
+-- interface --
+q_fade_in = enqueue(fade_in)
+q_fade_out = enqueue(fade_out)
+q_heart_beat = enqueue(heart_beat)
+q_triple_blink = enqueue(triple_blink)
+
+function next_pattern()
+  tmr.unregister(TIMER)
+  if next(Q) then
+    local next_p = table.remove(Q, 1) -- how expensive is this?
+    next_p()
+  else
+  end
+end
 
 init(TIMER)