From 7fbb941383fecdbe847b23c05a26cb5661215e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikdat=20DO=C4=9ERU?= Date: Sun, 2 Jun 2019 18:27:50 +0300 Subject: [PATCH 01/13] Update WiFiManager.cpp i wrapped to int() function, because cannot match on css because the incoming data is decimal --- WiFiManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 881f979..55e285f 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -1164,7 +1164,7 @@ String WiFiManager::WiFiManager::getScanItemOut(){ if(tok_e) item.replace(FPSTR(T_e), encryptionTypeStr(enc_type)); if(tok_r) item.replace(FPSTR(T_r), (String)rssiperc); // rssi percentage 0-100 if(tok_R) item.replace(FPSTR(T_R), (String)WiFi.RSSI(indices[i])); // rssi db - if(tok_q) item.replace(FPSTR(T_q), (String)round(map(rssiperc,0,100,1,4))); //quality icon 1-4 + if(tok_q) item.replace(FPSTR(T_q), (String)int(round(map(rssiperc,0,100,1,4)))); //quality icon 1-4 if(tok_i){ if (enc_type != WM_WIFIOPEN) { item.replace(FPSTR(T_i), F("l")); @@ -2714,4 +2714,4 @@ void WiFiManager::WiFi_autoReconnect(){ #endif } -#endif \ No newline at end of file +#endif From 318742e18337affdbdb7d767d1af263f92e83a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikdat=20DO=C4=9ERU?= Date: Sun, 2 Jun 2019 18:58:13 +0300 Subject: [PATCH 02/13] Update WiFiManager.template.html parse.js parsing error fixed --- extras/WiFiManager.template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/WiFiManager.template.html b/extras/WiFiManager.template.html index bfda6fe..657a1e4 100644 --- a/extras/WiFiManager.template.html +++ b/extras/WiFiManager.template.html @@ -253,7 +253,7 @@ button.D{
AP not found - +
Could not Connect From d20b85a7b80ae78e766e793cdde2ac3172f8c175 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 06:53:58 -0500 Subject: [PATCH 03/13] remove geenric from travis for now --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8ff9d8..3691d3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:generic:xtal=80,CrystalFreq=26,eesz=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - arduino --board esp8266:esp8266:xtal=80,CrystalFreq=26,eesz=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From debb20e41b5100046f4c6778427d060241b3e807 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 06:56:20 -0500 Subject: [PATCH 04/13] Revert "remove geenric from travis for now" This reverts commit d20b85a7b80ae78e766e793cdde2ac3172f8c175. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3691d3f..f8ff9d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:xtal=80,CrystalFreq=26,eesz=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - arduino --board esp8266:esp8266:generic:xtal=80,CrystalFreq=26,eesz=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From a1c53d785fa2f9ad11b9317c3a9460b00f01d037 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 07:00:13 -0500 Subject: [PATCH 05/13] travis fqbn updates just removing bad ones for now, will fix later --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8ff9d8..ec2e2fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,14 +27,14 @@ install: - python2 get.py - popd # esp32 needs WebServer_tng for now - - git clone https://github.com/bbx10/WebServer_tng.git /usr/local/share/arduino/libraries/WebServer_tng + # - git clone https://github.com/bbx10/WebServer_tng.git /usr/local/share/arduino/libraries/WebServer_tng script: - "echo $PWD" - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:generic:xtal=80,CrystalFreq=26,eesz=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - arduino --board esp8266:esp8266:generic:xtal=80,CrystalFreq=26,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From 49c6cec9981f40b4fa493d065f83a5b05ea9dbd6 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 07:08:35 -0500 Subject: [PATCH 06/13] ugh wtf --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec2e2fb..b05ca05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:generic:xtal=80,CrystalFreq=26,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - arduino --board esp8266:esp8266:nodemcuv2:xtal=80,CrystalFreq=26,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From 848311886041294b3479e80be3bb4fc2e713e4dd Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 07:15:32 -0500 Subject: [PATCH 07/13] all jacked up --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b05ca05..518ef8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:nodemcuv2:xtal=80,CrystalFreq=26,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial,DebugLevel=CORE --save-prefs + - arduino --board esp8266:esp8266:nodemcuv2:xtal=80,CrystalFreq=26,FlashMode=qio,eesz=4M1M,led=2,LwIPVariant=v2mss536,dbg=Serial,lvl=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From 35a1ab2e8dacc5ab6d6e28fefcdeb9eb9113f3ec Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 07:18:23 -0500 Subject: [PATCH 08/13] remove crytalfreq --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 518ef8f..89072f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:nodemcuv2:xtal=80,CrystalFreq=26,FlashMode=qio,eesz=4M1M,led=2,LwIPVariant=v2mss536,dbg=Serial,lvl=CORE --save-prefs + - arduino --board esp8266:esp8266:nodemcuv2:xtal=80,FlashMode=qio,eesz=4M1M,led=2,LwIPVariant=v2mss536,dbg=Serial,lvl=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From 5685e7d9b46e4b1ba6bb22bd38876d7c16382927 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 07:21:19 -0500 Subject: [PATCH 09/13] ugh boards is so whack --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 89072f9..b3f0dc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:nodemcuv2:xtal=80,FlashMode=qio,eesz=4M1M,led=2,LwIPVariant=v2mss536,dbg=Serial,lvl=CORE --save-prefs + - arduino --board esp8266:esp8266:generic:xtal=80,FlashMode=qio,eesz=4M1M,led=2,LwIPVariant=v2mss536,dbg=Serial,lvl=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From e0e0150f7815829b5b117ce4953fd7efeae8b358 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Sat, 13 Jul 2019 07:34:57 -0500 Subject: [PATCH 10/13] why did they change every flag????? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3f0dc4..25d31a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ script: - "echo $HOME" - "ls $PWD" - source $TRAVIS_BUILD_DIR/travis/common.sh - - arduino --board esp8266:esp8266:generic:xtal=80,FlashMode=qio,eesz=4M1M,led=2,LwIPVariant=v2mss536,dbg=Serial,lvl=CORE --save-prefs + - arduino --board esp8266:esp8266:generic:xtal=80,FlashMode=qio,eesz=4M1M,led=2,dbg=Serial,lvl=CORE --save-prefs - build_examples - arduino --board espressif:esp32:esp32doit-devkit-v1:FlashFreq=80,DebugLevel=info --save-prefs # some examples fail (SPIFFS defines differ esp32 vs esp8266) so we exclude them From b5218d1b93004e1b49722a4c11008d803c1334c3 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 19 Jul 2019 08:04:46 -0500 Subject: [PATCH 11/13] fix travis compile on esp32 --- examples/DEV/OnDemandConfigPortal/OnDemandConfigPortal.ino | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/DEV/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/DEV/OnDemandConfigPortal/OnDemandConfigPortal.ino index 186f593..d4042c8 100644 --- a/examples/DEV/OnDemandConfigPortal/OnDemandConfigPortal.ino +++ b/examples/DEV/OnDemandConfigPortal/OnDemandConfigPortal.ino @@ -68,7 +68,9 @@ void saveWifiCallback(){ //gets called when WiFiManager enters configuration mode void configModeCallback (WiFiManager *myWiFiManager) { Serial.println("[CALLBACK] configModeCallback fired"); - print_oled("WiFiManager Waiting\nIP: " + WiFi.softAPIP().toString() + "\nSSID: " + WiFi.softAPSSID(),1); + #ifdef ESP8266 + print_oled("WiFiManager Waiting\nIP: " + WiFi.softAPIP().toString() + "\nSSID: " + WiFi.softAPSSID(),1); + #endif // myWiFiManager->setAPStaticIPConfig(IPAddress(10,0,1,1), IPAddress(10,0,1,1), IPAddress(255,255,255,0)); // Serial.println(WiFi.softAPIP()); //if you used auto generated SSID, print it From 8a8e363cc36c446057e4d1e9b8b95fcdea6aa64e Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 19 Jul 2019 08:23:21 -0500 Subject: [PATCH 12/13] Can i just do esp32 boards install now ? --- .travis.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25d31a4..d12a383 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,15 +17,17 @@ install: - arduino --install-boards esp8266:esp8266 - arduino --pref "compiler.warning_level=all" --save-prefs # install esp32 - - pushd . - - mkdir -p ~/Arduino/hardware/espressif - - cd ~/Arduino/hardware/espressif - - git clone https://github.com/espressif/arduino-esp32.git esp32 - - cd esp32 - - git submodule update --init --recursive - - cd tools - - python2 get.py - - popd +# @todo install via boards now since it has been released? + - arduino --install-boards espressif:esp32 + # - pushd . + # - mkdir -p ~/Arduino/hardware/espressif + # - cd ~/Arduino/hardware/espressif + # - git clone https://github.com/espressif/arduino-esp32.git esp32 + # - cd esp32 + # - git submodule update --init --recursive + # - cd tools + # - python2 get.py + # - popd # esp32 needs WebServer_tng for now # - git clone https://github.com/bbx10/WebServer_tng.git /usr/local/share/arduino/libraries/WebServer_tng From 4775b1df510fd016aa46f04414ff8831e3a29474 Mon Sep 17 00:00:00 2001 From: tablatronix Date: Fri, 19 Jul 2019 09:19:39 -0500 Subject: [PATCH 13/13] ok maybe not --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index d12a383..92ccf46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,16 +18,16 @@ install: - arduino --pref "compiler.warning_level=all" --save-prefs # install esp32 # @todo install via boards now since it has been released? - - arduino --install-boards espressif:esp32 - # - pushd . - # - mkdir -p ~/Arduino/hardware/espressif - # - cd ~/Arduino/hardware/espressif - # - git clone https://github.com/espressif/arduino-esp32.git esp32 - # - cd esp32 - # - git submodule update --init --recursive - # - cd tools - # - python2 get.py - # - popd + # - arduino --install-boards espressif:esp32 + - pushd . + - mkdir -p ~/Arduino/hardware/espressif + - cd ~/Arduino/hardware/espressif + - git clone https://github.com/espressif/arduino-esp32.git esp32 + - cd esp32 + - git submodule update --init --recursive + - cd tools + - python2 get.py + - popd # esp32 needs WebServer_tng for now # - git clone https://github.com/bbx10/WebServer_tng.git /usr/local/share/arduino/libraries/WebServer_tng