From 5301792d169d248f26b2c00183c08138e7d100ba Mon Sep 17 00:00:00 2001 From: Artem Pastukhov Date: Thu, 2 Apr 2015 14:57:14 +0300 Subject: [PATCH] Revert "Update init.lua" This reverts commit 4989410f7b82a45de910b2f98a1a2d630090ad3b. Conflicts: init.lua --- init.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init.lua b/init.lua index bc5490f..1a222fb 100644 --- a/init.lua +++ b/init.lua @@ -5,6 +5,7 @@ print('set (mode='..wifi.getmode()..')') print('MAC: ',wifi.sta.getmac()) print('chip: ',node.chipid()) print('heap: ',node.heap()) +<<<<<<< HEAD local joincounter = 0 @@ -13,6 +14,9 @@ cfg.ssid="ESP-"..node.chipid() cfg.pwd="ESP-"..node.chipid() wifi.ap.config(cfg) cfg = nil +======= +wifi.sta.config("Kirsch Extreme","1151511515") +>>>>>>> parent of 4989410... Update init.lua -- Compile server code and remove original .lua files. -- This only happens the first time afer the .lua files are uploaded.