Преглед изворни кода

manage wifi modes using decorators

etisab пре 10 година
родитељ
комит
78b110cad8
3 измењених фајлова са 25 додато и 13 уклоњено
  1. 20 9
      rebuild/main.lua
  2. 4 3
      rebuild/read.lua
  3. 1 1
      rebuild/write.lua

+ 20 - 9
rebuild/main.lua

@@ -10,19 +10,30 @@ local yo = require('yo')
 local server = require('server')
 local read = require('read')
 
+function wifi_setup(func, ...)
+  wifi.setmode(wifi.STATIONAP)
+  wifi.ap.config({
+    ssid = "YoButton-" .. node.chipid(),
+    pwd = "yobutton",
+    max = 1,
+    auth = wifi.AUTH_OPEN
+  })
+  wifi.ap.dhcp.start()
 
-a = '0c6ac771-71fa-420f-810c-2853989a8ca6'
-y = 'ariyeah'
-wifi.sta.config('Pizza Pirate Cove', 'pizzapirates')
-wifi.setmode(wifi.STATION)
+  func(...)
+end
 
-function short_press()
+function wifi_default(func, ...)
   server.stop()
-  yo.yo(y, a)
-end
+  wifi.setmode(wifi.STATION)
 
-function long_press()
+  func(...)
+end
 
+function short_press()
+  wifi_default(yo.yo, read.yo_recipient(), read.api_key())
+end
 
-  server.start()
+function long_press()
+  wifi_setup(server.start)
 end

+ 4 - 3
rebuild/read.lua

@@ -1,6 +1,6 @@
 local wifi = wifi
 local file = file
-local yo_file = 'yo_recipient.txt'
+local yo_file = 'yorecipient.txt'
 local wifi_status = {
   [0] = 'not enabled',
   'connecting',
@@ -32,9 +32,10 @@ function yo_recipient()
 end
 
 function api_key()
-  file.open('api_key.txt')
-  api_key = file.read()
+  file.open('apikey.txt')
+  local api_key = file.read()
   file.close()
+  return api_key
 end
 
 function current_settings()

+ 1 - 1
rebuild/write.lua

@@ -2,7 +2,7 @@ local wifi = wifi
 local file = file
 local assert = assert
 local type = type
-local yo_file = 'yo_recipient.txt'
+local yo_file = 'yorecipient.txt'
 local debug_message = debug_message
 
 --TODO: validate ALL THE THINGS!