diff --git a/.travis.yml b/.travis.yml index a7d8748..7016294 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ install: - arduino --install-boards esp8266:esp8266 - 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 @@ -27,14 +29,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,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 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 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 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