"; // {q} = HTTP_ITEM_QI, {r} = HTTP_ITEM_QP
+// const char HTTP_ITEM[] = ""; // test all tokens
+
+const char HTTP_FORM_START[] = "";
+const char HTTP_FORM_LABEL[] = "{t} ";
+const char HTTP_FORM_PARAM_HEAD[] = "Saving Credentials
";
+const char HTTP_PARAMSAVED[] = "Saved
";
+const char HTTP_END[] = "";
+const char HTTP_ERASEBTN[] = "Connected to {v}with IP {i}
";
+const char HTTP_STATUS_OFF[] = "Not connected to {v}{r}
"; // {c=class} {v=ssid} {r=status_off}
+const char HTTP_STATUS_OFFPW[] = "No AP set
";
+const char HTTP_BR[] = "Update failed!
";
+const char HTTP_UPDATE_SUCCESS[] = "Update successful.
";
+
+const char HTTP_INFO_esphead[] = "esp32 ";
+const char HTTP_INFO_chiprev[] = "Chip rev {1} ";
+const char HTTP_INFO_lastreset[] = "Last reset reason CPU0: {1} ";
+const char HTTP_INFO_aphost[] = "Access point hostname {1} ";
+const char HTTP_INFO_psrsize[] = "PSRAM Size {1} bytes ";
+const char HTTP_INFO_temp[] = "Temperature {1} C° / {2} F° ";
+const char HTTP_INFO_hall[] = "Hall {1} ";
+
+const char HTTP_INFO_memsmeter[] = "Memory - Sketch size Used / Total bytes Memory - Free heap {1} bytes available ";
+const char HTTP_INFO_wifihead[] = "WiFi Uptime {1} mins {2} secs ";
+const char HTTP_INFO_chipid[] = "Chip ID {1} ";
+const char HTTP_INFO_idesize[] = "Flash size {1} bytes ";
+const char HTTP_INFO_sdkver[] = "SDK version {1} ";
+const char HTTP_INFO_cpufreq[] = "CPU frequency {1}MHz ";
+const char HTTP_INFO_apip[] = "Access point IP {1} ";
+const char HTTP_INFO_apmac[] = "Access point MAC {1} ";
+const char HTTP_INFO_apssid[] = "Access point SSID {1} ";
+const char HTTP_INFO_apbssid[] = "BSSID {1} ";
+const char HTTP_INFO_stassid[] = "Station SSID {1} ";
+const char HTTP_INFO_staip[] = "Station IP {1} ";
+const char HTTP_INFO_stagw[] = "Station gateway {1} ";
+const char HTTP_INFO_stasub[] = "Station subnet {1} ";
+const char HTTP_INFO_dnss[] = "DNS Server {1} ";
+const char HTTP_INFO_host[] = "Hostname {1} ";
+const char HTTP_INFO_stamac[] = "Station MAC {1} ";
+const char HTTP_INFO_conx[] = "Connected {1} ";
+const char HTTP_INFO_autoconx[] = "Autoconnect {1} ";
+
+const char HTTP_INFO_aboutarduino[] = "Arduino {1} ";
+const char HTTP_INFO_aboutsdk[] = "ESP-SDK/IDF {1} ";
+const char HTTP_INFO_aboutdate[] = "Build date {1} ";
+
+const char WIFI_PAGE_TITLE[] = "WiFi Setup
#include "LogAppender.h"
+#include "main.h"
using namespace websockets;
diff --git a/include/settings.h b/include/settings.h
index 1b0c5874..a9088a92 100644
--- a/include/settings.h
+++ b/include/settings.h
@@ -213,7 +213,7 @@
#define MAX_RECONNECT_TRIES 3
// loop speed for the SmartSpin2k BLE communications
-#define BLE_NOTIFY_DELAY 503
+#define BLE_NOTIFY_DELAY 503
// loop speed for the SmartSpin2k BLE Client reconnect
#define BLE_CLIENT_DELAY 101
@@ -273,7 +273,7 @@
#define NORMAL_CAD 90
// Temperature of the ESP32 at which to start reducing the power output of the stepper motor driver.
-#define THROTTLE_TEMP 85
+#define THROTTLE_TEMP 100
// Size of the Aux Serial Buffer for Peloton
#define AUX_BUF_SIZE 10
diff --git a/platformio.ini b/platformio.ini
index cb7f04c9..0fadb375 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,7 +13,7 @@ default_envs = release
[esp32doit]
lib_ldf_mode = chain
lib_compat_mode = strict
-platform = espressif32 @ 6.0.1
+platform = espressif32 @ 6.4.0
board = esp32doit-devkit-v1
framework = arduino
board_build.partitions = min_spiffs.csv
@@ -26,7 +26,7 @@ build_flags =
!python build_date_macro.py
-D CONFIG_BT_NIMBLE_MAX_CONNECTIONS=6
-D CONFIG_MDNS_STRICT_MODE=1
- -D CORE_DEBUG_LEVEL=1
+ -D CORE_DEBUG_LEVEL=2
-D ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE=3500
lib_deps =
https://github.com/h2zero/NimBLE-Arduino/archive/refs/tags/1.4.0.zip
diff --git a/src/BLE_Client.cpp b/src/BLE_Client.cpp
index f228931b..8657218d 100644
--- a/src/BLE_Client.cpp
+++ b/src/BLE_Client.cpp
@@ -58,16 +58,30 @@ static void onNotify(BLERemoteCharacteristic *pBLERemoteCharacteristic, uint8_t
}
}
-// BLE Client loop task
+// BLE Client loop task. Manages connections to BLE servers.
void bleClientTask(void *pvParameters) {
+ static unsigned long scanCacheTimer = millis();
for (;;) {
- vTaskDelay(BLE_CLIENT_DELAY / portTICK_PERIOD_MS); // Delay a second between loops.
+ if (httpServer.isServing) { // Scan slower if HTTP Server is working.
+ vTaskDelay((BLE_NOTIFY_DELAY * 3) / portTICK_PERIOD_MS);
+ }
+ vTaskDelay(BLE_CLIENT_DELAY / portTICK_PERIOD_MS);
+
+ NimBLEScan *scan = NimBLEDevice::getScan();
+ if (scan) {
+ while (scan->isScanning()) { // wait for current scan to finish
+ vTaskDelay(BLE_CLIENT_DELAY / portTICK_PERIOD_MS);
+ Serial.print(".");
+ }
+ }
+
+ if ((millis() - scanCacheTimer) > 1200000) { // Clear the scan cache every 120 seconds
+ scanCacheTimer = millis();
+ SS2K_LOG(BLE_CLIENT_LOG_TAG, "Clearing BLE Scan Cache.");
+ scan->clearDuplicateCache();
+ scan->clearResults();
+ }
spinBLEClient.checkBLEReconnect();
- // if (spinBLEClient.doScan && (spinBLEClient.scanRetries > 0) && !NimBLEDevice::getScan()->isScanning()) {
- // spinBLEClient.scanRetries--;
- // SS2K_LOG(BLE_CLIENT_LOG_TAG, "Initiating Scan from Client Task:");
- // spinBLEClient.scanProcess();
- // }
#ifdef DEBUG_STACK
Serial.printf("BLEClient: %d \n", uxTaskGetStackHighWaterMark(BLEClientTask));
#endif // DEBUG_STACK
@@ -75,7 +89,6 @@ void bleClientTask(void *pvParameters) {
if (spinBLEClient.myBLEDevices[x].doConnect == true) {
if (spinBLEClient.connectToServer()) {
SS2K_LOG(BLE_CLIENT_LOG_TAG, "We are now connected to the BLE Server.");
- // vTaskDelay(5000 / portTICK_PERIOD_MS);
} else {
}
}
@@ -182,7 +195,9 @@ bool SpinBLEClient::connectToServer() {
spinBLEClient.resetDevices(pClient);
pClient->deleteServices();
pClient->disconnect();
- NimBLEDevice::getScan()->erase(pClient->getPeerAddress());
+ if (NimBLEDevice::getScan()) {
+ NimBLEDevice::getScan()->erase(pClient->getPeerAddress());
+ }
NimBLEDevice::deleteClient(pClient);
}
return false;
@@ -447,7 +462,7 @@ void SpinBLEClient::scanProcess(int duration) {
pBLEScan->setDuplicateFilter(true);
pBLEScan->setActiveScan(true);
BLEScanResults foundDevices = pBLEScan->start(duration, true);
- this->dontBlockScan = false;
+ // this->dontBlockScan = false;
// Load the scan into a Json String
int count = foundDevices.getCount();
diff --git a/src/BLE_Common.cpp b/src/BLE_Common.cpp
index 218ab074..f93778f9 100644
--- a/src/BLE_Common.cpp
+++ b/src/BLE_Common.cpp
@@ -21,9 +21,9 @@ TaskHandle_t BLECommunicationTask;
void BLECommunications(void *pvParameters) {
for (;;) {
- if (!spinBLEClient.dontBlockScan) {
- NimBLEDevice::getScan()->stop(); // stop routine scans
- }
+ // if (!spinBLEClient.dontBlockScan) {
+ // NimBLEDevice::getScan()->stop(); // stop routine scans
+ //}
// **********************************Client***************************************
for (size_t x = 0; x < NUM_BLE_DEVICES; x++) { // loop through discovered devices
if (spinBLEClient.myBLEDevices[x].connectedClientID != BLE_HS_CONN_HANDLE_NONE) {
@@ -138,6 +138,9 @@ void BLECommunications(void *pvParameters) {
} else {
digitalWrite(LED_PIN, HIGH);
}
+ if (httpServer.isServing) { // slow the BLE communications for faster web tasks.
+ vTaskDelay((BLE_NOTIFY_DELAY) / portTICK_PERIOD_MS);
+ }
vTaskDelay((BLE_NOTIFY_DELAY) / portTICK_PERIOD_MS);
#ifdef DEBUG_STACK
Serial.printf("BLEComm: %d \n", uxTaskGetStackHighWaterMark(BLECommunicationTask));
diff --git a/src/HTTP_Server_Basic.cpp b/src/HTTP_Server_Basic.cpp
index 8210ef09..d8df536a 100644
--- a/src/HTTP_Server_Basic.cpp
+++ b/src/HTTP_Server_Basic.cpp
@@ -34,6 +34,11 @@ HTTP_Server httpServer;
WiFiClientSecure client;
WebServer server(80);
+// WiFi Scanner
+int _numNetworks = 0;
+int _minimumQuality = -1;
+bool haveScan = false;
+
#ifdef USE_TELEGRAM
#include
TaskHandle_t telegramTask;
@@ -148,9 +153,7 @@ void HTTP_Server::start() {
String response =
"Scanning for BLE Devices. Please wait "
"15 seconds.";
- // spinBLEClient.resetDevices();
- spinBLEClient.dontBlockScan = true;
+ myIP.toString() + "/bluetoothscanner.html';\",100);";
spinBLEClient.scanProcess(DEFAULT_SCAN_DURATION);
server.send(200, "text/html", response);
});
@@ -291,7 +294,17 @@ void HTTP_Server::start() {
server.on("/login", HTTP_GET, []() {
server.sendHeader("Connection", "close");
- server.send(200, "text/html", OTALoginIndex);
+ String page = FPSTR(OTALOGININDEX);
+ page += FPSTR(HTTP_STYLE);
+ server.send(200, "text/html", page);
+ });
+
+ server.on("/wifi", []() {
+ if (!server.arg("refresh").isEmpty()) {
+ WiFi_scanNetworks();
+ }
+ server.sendHeader("Connection", "close");
+ server.send(200, "text/html", httpServer.processWiFiHTML());
});
server.on("/OTAIndex", HTTP_GET, []() {
@@ -384,7 +397,7 @@ void HTTP_Server::start() {
"webClientUpdate", /* name of task. */
HTTP_STACK + (DEBUG_LOG_BUFFER_SIZE * 2), /* Stack size of task Used to be 3000*/
NULL, /* parameter of the task */
- 10, /* priority of the task */
+ 4, /* priority of the task */
&webClientTask, /* Task handle to keep track of created task */
0); /* pin task to core */
@@ -403,14 +416,30 @@ void HTTP_Server::start() {
void HTTP_Server::webClientUpdate(void *pvParameters) {
static unsigned long mDnsTimer = millis(); // NOLINT: There is no overload in String for uint64_t
+ bool recheck = false;
for (;;) {
server.handleClient();
- vTaskDelay(WEBSERVER_DELAY / portTICK_RATE_MS);
+ // vTaskDelay(WEBSERVER_DELAY / portTICK_RATE_MS);
if (WiFi.getMode() != WIFI_MODE_STA) {
+ if (WiFi.softAPgetStationNum()) { // Client Connected to AP
+ httpServer.isServing = true;
+ }
dnsServer.processNextRequest();
+ if (!haveScan) {
+ WiFi_scanNetworks();
+ haveScan = true;
+ }
}
// Keep MDNS alive
if ((millis() - mDnsTimer) > 30000) {
+ if (httpServer.isServing) {
+ if (recheck) {
+ httpServer.isServing = false; // reset BLE communications slowdown.
+ recheck = false;
+ } else {
+ recheck = true; // check again in 30 seconds.
+ }
+ }
MDNS.addServiceTxt("http", "_tcp", "lf", String(mDnsTimer));
mDnsTimer = millis();
#ifdef DEBUG_STACK
@@ -421,29 +450,266 @@ void HTTP_Server::webClientUpdate(void *pvParameters) {
}
void HTTP_Server::handleIndexFile() {
- String filename = "/index.html";
+ httpServer.isServing = true;
+ String filename = "/index.html";
+ server.sendHeader("Connection", "close");
if (LittleFS.exists(filename)) {
- File file = LittleFS.open(filename, FILE_READ);
- server.streamFile(file, "text/html");
+ File file = LittleFS.open(filename, FILE_READ);
+ String page = "";
+ page += FPSTR(HTTP_HEAD_START);
+ page.replace(FPSTR(T_v), DEVICE_NAME);
+ page += FPSTR(HTTP_STYLE);
+ while (file.available()) {
+ page += char(file.read());
+ }
+ server.send(200, "text/html", page);
+ // server.streamFile(file, "text/html");
file.close();
SS2K_LOG(HTTP_SERVER_LOG_TAG, "Served %s", filename.c_str());
} else {
SS2K_LOG(HTTP_SERVER_LOG_TAG, "%s not found. Sending builtin Index.html", filename.c_str());
- server.send(200, "text/html", noIndexHTML);
+ server.send(200, "text/html", httpServer.processWiFiHTML());
+ }
+}
+
+String HTTP_Server::processWiFiHTML() {
+ String page = getHTTPHead(); // @token titlewifi
+ if (!haveScan) {
+ WiFi_scanNetworks(); // wifiscan, force if arg refresh
+ }
+
+ page.replace(FPSTR(T_1), reinterpret_cast(WIFI_PAGE_TITLE));
+ page += getScanItemOut();
+
+ String pitem = "";
+
+ pitem = FPSTR(HTTP_FORM_START);
+ pitem.replace(FPSTR(T_v), F("send_settings")); // set form action
+ page += pitem;
+
+ pitem = FPSTR(HTTP_FORM_WIFI);
+ pitem.replace(FPSTR(T_v), reinterpret_cast(userConfig.getSsid()));
+
+ pitem.replace(FPSTR(T_p), reinterpret_cast(DEFAULT_PASSWORD));
+
+ page += pitem;
+
+ page += FPSTR(HTTP_BR);
+ page += FPSTR(HTTP_FORM_WIFI_END);
+ page += FPSTR(HTTP_FORM_END);
+ page += FPSTR(HTTP_SCAN_LINK);
+ if (!LittleFS.exists("/index.html")) {
+ page += FPSTR(NOINDEXHTML);
}
+ page += FPSTR(HTTP_REBOOT_LINK);
+
+ page += FPSTR(HTTP_END);
+
+ return page;
+}
+
+bool WiFi_scanNetworks() {
+ // if 0 networks, rescan @note this was a kludge, now disabling to test real cause ( maybe wifi not init etc)
+ // enable only if preload failed?
+ if (_numNetworks == 0) {
+ SS2K_LOG(HTTP_SERVER_LOG_TAG, "NO APs found forcing new scan");
+ }
+
+ int8_t res;
+
+ SS2K_LOG(HTTP_SERVER_LOG_TAG, "WiFi Scan SYNC started");
+ res = WiFi.scanNetworks();
+
+ if (res == WIFI_SCAN_FAILED) {
+ SS2K_LOG(HTTP_SERVER_LOG_TAG, "WiFi Scan failed");
+ } else if (res == WIFI_SCAN_RUNNING) {
+ while (WiFi.scanComplete() == WIFI_SCAN_RUNNING) {
+ Serial.print(".");
+ delay(100);
+ }
+ _numNetworks = WiFi.scanComplete();
+ } else if (res >= 0) {
+ _numNetworks = res;
+ haveScan = true;
+ }
+
+ if (res > 0) {
+ // Serial.printf("Networks found: %d", _numNetworks);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+String getHTTPHead() {
+ String page;
+ page += FPSTR(HTTP_HEAD_START);
+ page.replace(FPSTR(T_v), DEVICE_NAME);
+ page += FPSTR(HTTP_SCRIPT);
+ page += FPSTR(HTTP_STYLE);
+ page += FPSTR(HTTP_TITLE);
+ page += FPSTR(HTTP_HEAD_END);
+ return page;
+}
+
+String getScanItemOut() {
+ String page;
+
+ if (!_numNetworks) WiFi_scanNetworks(); // scan in case this gets called before any scans
+
+ int n = _numNetworks;
+ if (n == 0) {
+#ifdef WM_DEBUG_LEVEL
+ DEBUG_WM(F("No networks found"));
+#endif
+ page += FPSTR(S_nonetworks); // @token nonetworks
+ page += F("