attempt at kiss, locks up. OOs

diff --git a/lamp-draw.lua b/lamp-draw.lua
index 99e5caf921e0ae83fc802b0227c3064a6ea8f9cd..1097a5cd7788997bfc3a5248958c1949c2263bc7 100644 (file)
--- a/lamp-draw.lua
+++ b/lamp-draw.lua
@@ -19,6 +19,15 @@ return {
     fb:set(18,c) fb:set(19,c) fb:set(22,c) fb:set(23,c)
     fb:set(25,c) fb:set(28,c) fb:set(29,c) fb:set(32,c)
   end,
+  ["oo"] = function(t,fb,g,r,b)
+    t:unregister()
+    fb:fill(0,0,0)
+    local c = string.char(g,r,b)
+    fb:set( 2,c) fb:set( 3,c) fb:set( 6,c) fb:set( 7,c)
+    fb:set( 9,c) fb:set(12,c) fb:set(13,c) fb:set(16,c)
+    fb:set(17,c) fb:set(20,c) fb:set(21,c) fb:set(24,c)
+    fb:set(26,c) fb:set(27,c) fb:ser(30,c) fb:set(31,c)
+  end,
   ["laserchase"] = function(t,fb,g,r,b)
     local ix = 1
     local c = string.char(g,r,b)
@@ -28,6 +37,23 @@ return {
       ix = ix + 1; if ix > fb:size() then ix = 1 end
     end)
   end,
+  ["kiss"] = function(t,fb,g,r,b)
+    t:unregister()
+    fb:fill(0,0,0)
+    local ix = 0
+    local c = string.char(g,r,b)
+    fb:set( 2,c) fb:set( 9,c) fb:set(10,c)
+    fb:set(11,c) fb:set(14,c) fb:set(18,c) fb:set(20,c)
+    fb:set(21,c) fb:set(30,c)
+    t:register(500,tmr.ALARM_AUTO,function()
+      if ix == 1
+        then fb:set( 1,c) fb:set( 2,0,0,0) fb:set( 3,c) fb:set( 9,0,0,0) fb:set(11,0,0,0) fb:set(17,c) fb:set(18,0,0,0) fb:set(19,c)
+       else fb:set( 1,0,0,0) fb:set( 2,c) fb:set( 3,0,0,0) fb:ser( 9,c) fb:set(11,c) fb:set(17,0,0,0) fb:set(18,c) fb:set(19,0,0,0)
+      end
+      ix = 1 - ix
+      dodraw()
+    end)
+  end,
   ["snake"] = function(t,fb,g,r,b)
     local ix = 0
     local c = string.char(g,r,b)

diff --git a/pushall.sh b/pushall.sh
index 84533da3ef4fe2f3ab338b1434af9c2ae7af4e82..505f4df1599c1b46b2fd0f9b0f0d547a074a7ae5 100755 (executable)
--- a/pushall.sh
+++ b/pushall.sh
@@ -4,15 +4,15 @@ set -e -u
 
 . ./host/pushcommon.sh
 
-dopushcompile net/nwfmqtt.lua
-dopushcompile cap1188/cap1188.lua
-dopushcompile cap1188/cap1188-init.lua
+#dopushcompile net/nwfmqtt.lua
+#dopushcompile cap1188/cap1188.lua
+#dopushcompile cap1188/cap1188-init.lua
 dopushcompile examples/lamp/lamp-draw.lua
-dopushcompile examples/lamp/lamp-touch.lua
-dopushcompile examples/lamp/lamp-remote.lua
-dopushcompile examples/lamp/telnetd-cap.lua
-dopush        examples/lamp/conf/nwfmqtt.conf
-dopush        examples/lamp/conf/nwfmqtt.subs
-dopushcompile examples/lamp/init2.lua
+#dopushcompile examples/lamp/lamp-touch.lua
+#dopushcompile examples/lamp/lamp-remote.lua
+#dopushcompile examples/lamp/telnetd-cap.lua
+#dopush        examples/lamp/conf/nwfmqtt.conf
+#dopush        examples/lamp/conf/nwfmqtt.subs
+#dopushcompile examples/lamp/init2.lua
 
 echo "SUCCESS"