From 16b9675a4b8ce95e1214cfd1271e009219daad86 Mon Sep 17 00:00:00 2001
From: ollo <ollo@olloThinkPad>
Date: Wed, 15 Jun 2016 21:24:40 +0200
Subject: [PATCH] Moved logic into seperate file

---
 displayword.lua | 156 +++++++++++++++++++++++++++++++++++++++++++++++
 main.lua        | 157 +-----------------------------------------------
 2 files changed, 157 insertions(+), 156 deletions(-)
 create mode 100644 displayword.lua

diff --git a/displayword.lua b/displayword.lua
new file mode 100644
index 0000000..8ec0fd6
--- /dev/null
+++ b/displayword.lua
@@ -0,0 +1,156 @@
+-- Module displaying of the words
+function generateLEDs(words)
+ 
+ color=string.char(0,0,50)
+ white=string.char(0,0,0)
+ buf=color
+ -- line 1----------------------------------------------
+ if (words.itis == 1) then
+    buf=color:rep(2) -- ES
+    -- K fill character
+    buf=buf .. white:rep(1)
+    buf=buf ..color:rep(3) -- IST
+    -- L fill character
+    buf=buf .. white:rep(1)
+ else
+    buf=white:rep(7)
+ end
+ if (words.fiveMin== 1) then
+    buf= buf .. color:rep(4) -- FUENF
+  else
+    buf= buf .. white:rep(4)
+ end
+ -- line 2-- even row (so inverted) --------------------
+ if (words.twenty == 1) then
+    buf= buf .. color:rep(7) -- ZWANZIG
+  else
+    buf= buf .. white:rep(7)
+ end
+ if (words.tenMin == 1) then
+    buf= buf .. color:rep(4) -- ZEHN
+  else
+    buf= buf .. white:rep(4)
+ end
+ -- line3----------------------------------------------
+ --TODO ggf. auch ueber viertel vor abbildbar
+ if (words.threequater == 1) then
+    buf= buf .. color:rep(11) -- Dreiviertel
+  elseif (words.quater == 1) then
+    buf= buf .. white:rep(4)
+    buf= buf .. color:rep(7) -- VIERTEL
+ else
+    buf= buf .. white:rep(11)
+ end
+ --line 4-------- even row (so inverted) -------------
+ if (words.before == 1) then
+    buf=buf .. white:rep(2) 
+    buf= buf .. color:rep(3) -- VOR
+  else
+    buf= buf .. white:rep(5)
+ end
+ if (words.after == 1) then
+    buf= buf .. color:rep(4) -- NACH
+    buf= buf .. white:rep(2) -- TG
+  else
+    buf= buf .. white:rep(6)
+ end
+ ------------------------------------------------
+ if (words.half == 1) then
+    buf= buf .. color:rep(4) -- HALB
+    buf= buf .. white:rep(1) -- X
+  else
+    buf= buf .. white:rep(5)
+ end
+ if (words.twelve == 1) then
+    buf= buf .. color:rep(5) -- ZWOELF
+    buf= buf .. white:rep(1) -- P
+  else
+    buf= buf .. white:rep(6)
+ end
+ ------------even row (so inverted) ---------------------
+ if (words.seven == 1) then
+    buf= buf .. color:rep(6) -- SIEBEN
+    buf= buf .. white:rep(5)
+  elseif (words.one == 1) then
+    buf= buf .. white:rep(5)
+    buf= buf .. color:rep(4) -- EINS
+    buf= buf .. white:rep(2)
+ elseif (words.two == 1) then
+    buf= buf .. white:rep(7)
+    buf= buf .. color:rep(4) -- ZWEI
+ else
+    buf= buf .. white:rep(11)
+ end
+ ------------------------------------------------
+ if (words.three == 1) then
+    buf= buf .. white:rep(1)
+    buf= buf .. color:rep(4) -- DREI
+    buf= buf .. white:rep(6)
+  elseif (words.five == 1) then
+    buf= buf .. white:rep(7)
+    buf= buf .. color:rep(4) -- FUENF
+ else
+    buf= buf .. white:rep(11)
+ end
+ ------------even row (so inverted) ---------------------
+ if (words.four == 1) then
+    buf= buf .. color:rep(4) -- VIER
+    buf= buf .. white:rep(7)
+  elseif (words.nine == 1) then
+    buf= buf .. white:rep(4)
+    buf= buf .. color:rep(4) -- NEUN
+    buf= buf .. white:rep(3)
+ elseif (words.eleven == 1) then
+    buf= buf .. white:rep(8)
+    buf= buf .. color:rep(3) -- ELEVEN
+ else
+    buf= buf .. white:rep(11)
+ end
+ ------------------------------------------------
+ if (words.eight == 1) then
+    buf= buf .. white:rep(1)
+    buf= buf .. color:rep(4) -- ACHT
+    buf= buf .. white:rep(6)
+  elseif (words.ten == 1) then
+    buf= buf .. white:rep(5)
+    buf= buf .. color:rep(4) -- ZEHN
+    buf= buf .. white:rep(2)
+ else
+    buf= buf .. white:rep(11)
+ end
+ ------------even row (so inverted) ---------------------
+ if (words.clock == 1) then
+    buf= buf .. color:rep(3) -- UHR
+  else
+    buf= buf .. white:rep(3)
+ end
+ if (words.sechs == 1) then
+    buf= buf .. white:rep(2)
+    buf= buf .. color:rep(5) -- SECHS
+    buf= buf .. white:rep(1)
+  else
+    buf= buf .. white:rep(8)
+ end
+ 
+ if (words.min1 == 1) then
+    buf= buf .. color:rep(1)
+  else
+    buf= buf .. white:rep(1)
+ end
+ if (words.min2 == 1) then
+    buf= buf .. color:rep(1)
+  else
+    buf= buf .. white:rep(1)
+  end
+ if (words.min3 == 1) then
+    buf= buf .. color:rep(1)
+  else
+    buf= buf .. white:rep(1)
+  end
+ if (words.min4 == 1) then
+    buf= buf .. color:rep(1)
+  else
+    buf= buf .. white:rep(1)
+  end
+  return buf
+end
\ No newline at end of file
diff --git a/main.lua b/main.lua
index 71b8261..1fcb7a2 100644
--- a/main.lua
+++ b/main.lua
@@ -1,6 +1,7 @@
 dofile("wlancfg.lua")
 dofile("timecore.lua")
 dofile("wordclock.lua")
+dofile("displayword.lua")
 
 timezoneoffset=1
 
@@ -25,162 +26,6 @@ tmr.alarm(0, 100, 1, function()
   end
 end)
 
-function generateLEDs(words)
- 
- color=string.char(0,0,50)
- white=string.char(0,0,0)
- buf=color
- -- line 1----------------------------------------------
- if (words.itis == 1) then
-    buf=color:rep(2) -- ES
-    -- K fill character
-    buf=buf .. white:rep(1)
-    buf=buf ..color:rep(3) -- IST
-    -- L fill character
-    buf=buf .. white:rep(1)
- else
-    buf=white:rep(7)
- end
- if (words.fiveMin== 1) then
-    buf= buf .. color:rep(4) -- FUENF
-  else
-    buf= buf .. white:rep(4)
- end
- -- line 2-- even row (so inverted) --------------------
- if (words.twenty == 1) then
-    buf= buf .. color:rep(7) -- ZWANZIG
-  else
-    buf= buf .. white:rep(7)
- end
- if (words.tenMin == 1) then
-    buf= buf .. color:rep(4) -- ZEHN
-  else
-    buf= buf .. white:rep(4)
- end
- -- line3----------------------------------------------
- --TODO ggf. auch ueber viertel vor abbildbar
- if (words.threequater == 1) then
-    buf= buf .. color:rep(11) -- Dreiviertel
-  elseif (words.quater == 1) then
-    buf= buf .. white:rep(4)
-    buf= buf .. color:rep(7) -- VIERTEL
- else
-    buf= buf .. white:rep(11)
- end
- --line 4-------- even row (so inverted) -------------
- if (words.before == 1) then
-    buf=buf .. white:rep(2) 
-    buf= buf .. color:rep(3) -- VOR
-  else
-    buf= buf .. white:rep(5)
- end
- if (words.after == 1) then
-    buf= buf .. color:rep(4) -- NACH
-    buf= buf .. white:rep(2) -- TG
-  else
-    buf= buf .. white:rep(6)
- end
- ------------------------------------------------
- if (words.half == 1) then
-    buf= buf .. color:rep(4) -- HALB
-    buf= buf .. white:rep(1) -- X
-  else
-    buf= buf .. white:rep(5)
- end
- if (words.twelve == 1) then
-    buf= buf .. color:rep(5) -- ZWOELF
-    buf= buf .. white:rep(1) -- P
-  else
-    buf= buf .. white:rep(6)
- end
- ------------even row (so inverted) ---------------------
- if (words.seven == 1) then
-    buf= buf .. color:rep(6) -- SIEBEN
-    buf= buf .. white:rep(5)
-  elseif (words.one == 1) then
-    buf= buf .. white:rep(5)
-    buf= buf .. color:rep(4) -- EINS
-    buf= buf .. white:rep(2)
- elseif (words.two == 1) then
-    buf= buf .. white:rep(7)
-    buf= buf .. color:rep(4) -- ZWEI
- else
-    buf= buf .. white:rep(11)
- end
- ------------------------------------------------
- if (words.three == 1) then
-    buf= buf .. white:rep(1)
-    buf= buf .. color:rep(4) -- DREI
-    buf= buf .. white:rep(6)
-  elseif (words.five == 1) then
-    buf= buf .. white:rep(7)
-    buf= buf .. color:rep(4) -- FUENF
- else
-    buf= buf .. white:rep(11)
- end
- ------------even row (so inverted) ---------------------
- if (words.four == 1) then
-    buf= buf .. color:rep(4) -- VIER
-    buf= buf .. white:rep(7)
-  elseif (words.nine == 1) then
-    buf= buf .. white:rep(4)
-    buf= buf .. color:rep(4) -- NEUN
-    buf= buf .. white:rep(3)
- elseif (words.eleven == 1) then
-    buf= buf .. white:rep(8)
-    buf= buf .. color:rep(3) -- ELEVEN
- else
-    buf= buf .. white:rep(11)
- end
- ------------------------------------------------
- if (words.eight == 1) then
-    buf= buf .. white:rep(1)
-    buf= buf .. color:rep(4) -- ACHT
-    buf= buf .. white:rep(6)
-  elseif (words.ten == 1) then
-    buf= buf .. white:rep(5)
-    buf= buf .. color:rep(4) -- ZEHN
-    buf= buf .. white:rep(2)
- else
-    buf= buf .. white:rep(11)
- end
- ------------even row (so inverted) ---------------------
- if (words.clock == 1) then
-    buf= buf .. color:rep(3) -- UHR
-  else
-    buf= buf .. white:rep(3)
- end
- if (words.sechs == 1) then
-    buf= buf .. white:rep(2)
-    buf= buf .. color:rep(5) -- SECHS
-    buf= buf .. white:rep(1)
-  else
-    buf= buf .. white:rep(8)
- end
- 
- if (words.min1 == 1) then
-    buf= buf .. color:rep(1)
-  else
-    buf= buf .. white:rep(1)
- end
- if (words.min2 == 1) then
-    buf= buf .. color:rep(1)
-  else
-    buf= buf .. white:rep(1)
-  end
- if (words.min3 == 1) then
-    buf= buf .. color:rep(1)
-  else
-    buf= buf .. white:rep(1)
-  end
- if (words.min4 == 1) then
-    buf= buf .. color:rep(1)
-  else
-    buf= buf .. white:rep(1)
-  end
-  return buf
-end
-
 tmr.alarm(1, 5000, 1 ,function()
  sec, usec = rtctime.get()
  time = getTime(sec, timezoneoffset)