859419639d
Added Access Point determination for OLED reporting of mode/IP address, now auto shows AP on icon Fixed latency issue when switching thermo/fixed mode in Screen3
127 lines
3.5 KiB
C++
127 lines
3.5 KiB
C++
/*
|
|
* This file is part of the "bluetoothheater" distribution
|
|
* (https://gitlab.com/mrjones.id.au/bluetoothheater)
|
|
*
|
|
* Copyright (C) 2018 James Clark
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
// Should be working - Jimmy C
|
|
#include "BTCWifi.h"
|
|
#include "DebugPort.h"
|
|
// select which pin will trigger the configuration portal when set to LOW
|
|
|
|
WiFiManager wm;
|
|
|
|
unsigned int timeout = 120; // seconds to run for
|
|
unsigned int startTime = millis();
|
|
bool isAP = false;
|
|
bool portalRunning = false;
|
|
bool startCP = false; // start AP and webserver if true, else start only webserver
|
|
int TRIG_PIN;
|
|
|
|
|
|
|
|
|
|
void initWifi(int initpin,const char *failedssid, const char *failedpassword)
|
|
{
|
|
TRIG_PIN = initpin;
|
|
pinMode(TRIG_PIN, INPUT);
|
|
|
|
//reset settings - wipe credentials for testing
|
|
//wm.resetSettings();
|
|
|
|
// Automatically connect using saved credentials,
|
|
// if connection fails, it starts an access point with the specified name ( "AutoConnectAP"),
|
|
// if empty will auto generate SSID, if password is blank it will be anonymous AP (wm.autoConnect())
|
|
// then goes into a blocking loop awaiting configuration and will return success result
|
|
wm.setConfigPortalTimeout(20);
|
|
wm.setConfigPortalBlocking(false);
|
|
|
|
bool res = wm.autoConnect(); // auto generated AP name from chipid
|
|
// bool res = false;
|
|
|
|
if(!res) {
|
|
DebugPort.println("Failed to connect");
|
|
DebugPort.println("Setting up ESP as AP");
|
|
isAP = WiFi.softAP(failedssid, failedpassword);
|
|
if(isAP) {
|
|
WiFi.softAPConfig(IPAddress(192, 168, 100, 1), IPAddress(192, 168, 100, 0), IPAddress(255,255,255,0));
|
|
}
|
|
}
|
|
else {
|
|
//if you get here you have connected to the WiFi
|
|
DebugPort.println("connected...yeey :)");
|
|
DebugPort.println("Ready");
|
|
DebugPort.print("IP address: ");
|
|
DebugPort.println(WiFi.localIP());
|
|
}
|
|
}
|
|
|
|
void doWiFiManager(){
|
|
// is auto timeout portal running
|
|
if(portalRunning){
|
|
wm.process();
|
|
long tDelta = millis() - startTime;
|
|
if(tDelta > (timeout*1000)){
|
|
DebugPort.println("portaltimeout");
|
|
portalRunning = false;
|
|
if(startCP){
|
|
wm.stopConfigPortal();
|
|
}
|
|
else{
|
|
wm.stopWebPortal();
|
|
}
|
|
}
|
|
}
|
|
|
|
// is configuration portal requested?
|
|
if(TRIG_PIN == 1 && (!portalRunning)) {
|
|
if(startCP){
|
|
DebugPort.println("Button Pressed, Starting Config Portal");
|
|
wm.setConfigPortalBlocking(false);
|
|
wm.startConfigPortal();
|
|
TRIG_PIN = 0; // reset the flag
|
|
}
|
|
else{
|
|
DebugPort.println("Button Pressed, Starting Web Portal");
|
|
wm.startWebPortal();
|
|
TRIG_PIN = 0; // reset the flag
|
|
}
|
|
portalRunning = true;
|
|
startTime = millis();
|
|
}
|
|
}
|
|
|
|
const char* getWifiAddrStr()
|
|
{
|
|
if(isAP)
|
|
return WiFi.softAPIP().toString().c_str();
|
|
else
|
|
return WiFi.localIP().toString().c_str();
|
|
};
|
|
|
|
|
|
bool isWifiConnected()
|
|
{
|
|
return WiFi.status() == WL_CONNECTED;
|
|
}
|
|
|
|
bool isWifiAP()
|
|
{
|
|
return isAP;
|
|
}
|
|
|