diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fe6096d..165b891 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -91,7 +91,7 @@ jobs: - board: esp32c3 addr_bootloader: 0x0 chip: ESP32-C3 - fqbn: esp32:esp32:esp32c3:JTAGAdapter=default,CDCOnBoot=cdc,PartitionScheme=default,CPUFreq=160,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,EraseFlash=none + fqbn: esp32:esp32:esp32c3:JTAGAdapter=default,CDCOnBoot=default,PartitionScheme=default,CPUFreq=160,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,EraseFlash=none # esp32:esp32:esp32c3:JTAGAdapter=default,CDCOnBoot=default,PartitionScheme=default,CPUFreq=160,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,EraseFlash=none name: ESP32C3 obname: SomfyController.onboard.esp32c3.bin @@ -99,7 +99,7 @@ jobs: - board: esp32s2 addr_bootloader: 0x1000 chip: ESP32-S2 - fqbn: esp32:esp32:esp32s2:JTAGAdapter=default,CDCOnBoot=cdc,MSCOnBoot=default,DFUOnBoot=default,UploadMode=default,PSRAM=disabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,EraseFlash=none + fqbn: esp32:esp32:esp32s2:JTAGAdapter=default,CDCOnBoot=default,MSCOnBoot=default,DFUOnBoot=default,UploadMode=default,PSRAM=disabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,EraseFlash=none # esp32:esp32:esp32s2:JTAGAdapter=default,CDCOnBoot=default,MSCOnBoot=default,DFUOnBoot=default,UploadMode=default,PSRAM=disabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none,EraseFlash=none name: ESP32S2 obname: SomfyController.onboard.esp32s2.bin diff --git a/.gitignore b/.gitignore index be96788..8eec9f2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ debug.cfg SomfyController.ino.XIAO_ESP32S3.bin SomfyController.ino.esp32c3.bin SomfyController.ino.esp32s2.bin -.vscode/settings.json diff --git a/ConfigFile.cpp b/ConfigFile.cpp index e515bed..f1bcd30 100644 --- a/ConfigFile.cpp +++ b/ConfigFile.cpp @@ -614,7 +614,7 @@ bool ShadeConfigFile::readNetRecord(restore_options_t &opts) { uint32_t startPos = this->file.position(); if(opts.network) { Serial.println("Reading network settings from file..."); - settings.connType = static_cast(this->readUInt8(static_cast(conn_types_t::unset))); + settings.connType = static_cast(this->readUInt8(static_cast(conn_types::unset))); settings.IP.dhcp = this->readBool(true); char ip[24]; this->readVarString(ip, sizeof(ip)); diff --git a/ConfigSettings.cpp b/ConfigSettings.cpp index 5deec5e..a6bf603 100644 --- a/ConfigSettings.cpp +++ b/ConfigSettings.cpp @@ -205,12 +205,12 @@ bool ConfigSettings::load() { pref.getString("hostname", this->hostname, sizeof(this->hostname)); this->ssdpBroadcast = pref.getBool("ssdpBroadcast", true); this->checkForUpdate = pref.getBool("checkForUpdate", true); - this->connType = static_cast(pref.getChar("connType", 0x00)); + this->connType = static_cast(pref.getChar("connType", 0x00)); //Serial.printf("Preference GFG Free Entries: %d\n", pref.freeEntries()); pref.end(); - if(this->connType == conn_types_t::unset) { + if(this->connType == conn_types::unset) { // We are doing this to convert the data from previous versions. - this->connType = conn_types_t::wifi; + this->connType = conn_types::wifi; pref.begin("WIFI"); pref.getString("hostname", this->hostname, sizeof(this->hostname)); this->ssdpBroadcast = pref.getBool("ssdpBroadcast", true); @@ -261,7 +261,7 @@ bool ConfigSettings::requiresAuth() { return this->Security.type != security_typ bool ConfigSettings::fromJSON(JsonObject &obj) { if(obj.containsKey("ssdpBroadcast")) this->ssdpBroadcast = obj["ssdpBroadcast"]; if(obj.containsKey("hostname")) this->parseValueString(obj, "hostname", this->hostname, sizeof(this->hostname)); - if(obj.containsKey("connType")) this->connType = static_cast(obj["connType"].as()); + if(obj.containsKey("connType")) this->connType = static_cast(obj["connType"].as()); if(obj.containsKey("checkForUpdate")) this->checkForUpdate = obj["checkForUpdate"]; return true; } @@ -269,8 +269,8 @@ void ConfigSettings::print() { this->Security.print(); Serial.printf("Connection Type: %u\n", (unsigned int) this->connType); this->NTP.print(); - if(this->connType == conn_types_t::wifi || this->connType == conn_types_t::unset) this->WIFI.print(); - if(this->connType == conn_types_t::ethernet || this->connType == conn_types_t::ethernetpref) this->Ethernet.print(); + if(this->connType == conn_types::wifi || this->connType == conn_types::unset) this->WIFI.print(); + if(this->connType == conn_types::ethernet || this->connType == conn_types::ethernetpref) this->Ethernet.print(); } void ConfigSettings::emitSockets() {} void ConfigSettings::emitSockets(uint8_t num) {} @@ -580,21 +580,18 @@ bool WifiSettings::fromJSON(JsonObject &obj) { this->parseValueString(obj, "ssid", this->ssid, sizeof(this->ssid)); this->parseValueString(obj, "passphrase", this->passphrase, sizeof(this->passphrase)); if(obj.containsKey("roaming")) this->roaming = obj["roaming"]; - if(obj.containsKey("hidden")) this->hidden = obj["hidden"]; return true; } bool WifiSettings::toJSON(JsonObject &obj) { obj["ssid"] = this->ssid; obj["passphrase"] = this->passphrase; obj["roaming"] = this->roaming; - obj["hidden"] = this->hidden; return true; } void WifiSettings::toJSON(JsonResponse &json) { json.addElem("ssid", this->ssid); json.addElem("passphrase", this->passphrase); json.addElem("roaming", this->roaming); - json.addElem("hidden", this->hidden); } bool WifiSettings::save() { @@ -603,7 +600,6 @@ bool WifiSettings::save() { pref.putString("ssid", this->ssid); pref.putString("passphrase", this->passphrase); pref.putBool("roaming", this->roaming); - pref.putBool("hidden", this->hidden); pref.end(); return true; } @@ -614,7 +610,6 @@ bool WifiSettings::load() { this->ssid[sizeof(this->ssid) - 1] = '\0'; this->passphrase[sizeof(this->passphrase) - 1] = '\0'; this->roaming = pref.getBool("roaming", true); - this->hidden = pref.getBool("hidden", false); pref.end(); return true; } diff --git a/ConfigSettings.h b/ConfigSettings.h index 350db96..660a8ed 100644 --- a/ConfigSettings.h +++ b/ConfigSettings.h @@ -3,15 +3,7 @@ #ifndef configsettings_h #define configsettings_h #include "WResp.h" -#define FW_VERSION "v2.4.7" -enum class conn_types_t : byte { - unset = 0x00, - wifi = 0x01, - ethernet = 0x02, - ethernetpref = 0x03, - ap = 0x04 -}; - +#define FW_VERSION "v2.4.4" enum DeviceStatus { DS_OK = 0, DS_ERROR = 1, @@ -72,7 +64,6 @@ class WifiSettings: BaseSettings { public: WifiSettings(); bool roaming = true; - bool hidden = false; char ssid[65] = ""; char passphrase[65] = ""; //bool ssdpBroadcast = true; @@ -166,13 +157,20 @@ class MQTTSettings: BaseSettings { void toJSON(JsonResponse &json); bool fromJSON(JsonObject &obj); }; +enum class conn_types : byte { + unset = 0x00, + wifi = 0x01, + ethernet = 0x02, + ethernetpref = 0x03, + ap = 0x04 +}; class ConfigSettings: BaseSettings { public: static void printAvailHeap(); char serverId[10] = ""; char hostname[32] = "ESPSomfyRTS"; char chipModel[10] = "ESP32"; - conn_types_t connType = conn_types_t::unset; + conn_types connType = conn_types::unset; appver_t fwVersion; appver_t appVersion; bool ssdpBroadcast = true; @@ -199,4 +197,5 @@ class ConfigSettings: BaseSettings { uint16_t calcNetRecSize(); bool getAppVersion(); }; + #endif diff --git a/GitOTA.cpp b/GitOTA.cpp index 49ea3c5..6dda09e 100644 --- a/GitOTA.cpp +++ b/GitOTA.cpp @@ -3,9 +3,9 @@ #include #include #include -#include "ConfigSettings.h" #include "GitOTA.h" #include "Utils.h" +#include "ConfigSettings.h" #include "Sockets.h" #include "Somfy.h" #include "Web.h" @@ -252,7 +252,6 @@ void GitRepo::toJSON(JsonResponse &json) { #define ERR_DOWNLOAD_CONNECTION -42 void GitUpdater::loop() { - if(!net.connected()) return; if(this->status == GIT_STATUS_READY) { if(settings.checkForUpdate && (millis() > net.connectTime + 60000) && // Wait a minute before checking after connection. diff --git a/MQTT.cpp b/MQTT.cpp index 55f693a..62e7d0b 100644 --- a/MQTT.cpp +++ b/MQTT.cpp @@ -2,8 +2,8 @@ #include #include #include -#include "ConfigSettings.h" #include "MQTT.h" +#include "ConfigSettings.h" #include "Somfy.h" #include "Network.h" #include "Utils.h" @@ -35,16 +35,12 @@ void MQTTClass::reset() { this->connect(); } bool MQTTClass::loop() { - if(settings.MQTT.enabled && !rebootDelay.reboot && !this->suspended && !mqttClient.connected()) { - esp_task_wdt_reset(); - if(!this->connected() && net.connected()) this->connect(); - } - esp_task_wdt_reset(); + if(settings.MQTT.enabled && !rebootDelay.reboot && !this->suspended && !mqttClient.connected()) + this->connect(); if(settings.MQTT.enabled) mqttClient.loop(); return true; } void MQTTClass::receive(const char *topic, byte*payload, uint32_t length) { - esp_task_wdt_reset(); // Make sure we do not reboot here. Serial.print("MQTT Topic:"); Serial.print(topic); Serial.print(" payload:"); @@ -183,10 +179,8 @@ void MQTTClass::receive(const char *topic, byte*payload, uint32_t length) { } } } - esp_task_wdt_reset(); // Make sure we do not reboot here. } bool MQTTClass::connect() { - esp_task_wdt_reset(); // Make sure we do not reboot here. if(mqttClient.connected()) { if(!settings.MQTT.enabled || this->suspended) return this->disconnect(); @@ -281,7 +275,6 @@ bool MQTTClass::unsubscribe(const char *topic) { } bool MQTTClass::subscribe(const char *topic) { if(mqttClient.connected()) { - esp_task_wdt_reset(); // Make sure we do not reboot here. char top[128]; if(strlen(settings.MQTT.rootTopic) > 0) snprintf(top, sizeof(top), "%s/%s", settings.MQTT.rootTopic, topic); @@ -300,7 +293,6 @@ bool MQTTClass::publish(const char *topic, const char *payload, bool retain) { snprintf(top, sizeof(top), "%s/%s", settings.MQTT.rootTopic, topic); else strlcpy(top, topic, sizeof(top)); - esp_task_wdt_reset(); // Make sure we do not reboot here. mqttClient.publish(top, payload, retain); return true; } @@ -317,7 +309,6 @@ bool MQTTClass::unpublish(const char *topic) { snprintf(top, sizeof(top), "%s/%s", settings.MQTT.rootTopic, topic); else strlcpy(top, topic, sizeof(top)); - esp_task_wdt_reset(); // Make sure we do not reboot here. mqttClient.publish(top, (const uint8_t *)"", 0, true); return true; } @@ -332,7 +323,6 @@ bool MQTTClass::publishBuffer(const char *topic, uint8_t *data, uint16_t len, bo uint16_t offset = 0; uint16_t to_write = len; uint16_t buff_len; - esp_task_wdt_reset(); // Make sure we do not reboot here. mqttClient.beginPublish(topic, len, retain); do { buff_len = to_write; diff --git a/Network.cpp b/Network.cpp index ad8f2e1..45b00bd 100644 --- a/Network.cpp +++ b/Network.cpp @@ -18,8 +18,6 @@ extern rebootDelay_t rebootDelay; extern Network net; extern SomfyShadeController somfy; -static unsigned long _lastHeapEmit = 0; - static bool _apScanning = false; static uint32_t _lastMaxHeap = 0; static uint32_t _lastHeap = 0; @@ -34,135 +32,74 @@ bool Network::setup() { WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); WiFi.persistent(false); - WiFi.setAutoReconnect(false); WiFi.onEvent(this->networkEvent); - this->disconnectTime = millis(); if(WiFi.status() == WL_CONNECTED) WiFi.disconnect(true, true); - if(settings.connType == conn_types_t::wifi || settings.connType == conn_types_t::unset) { + if(settings.connType == conn_types::wifi || settings.connType == conn_types::unset) { WiFi.persistent(false); if(settings.hostname[0] != '\0') WiFi.setHostname(settings.hostname); Serial.print("WiFi Mode: "); Serial.println(WiFi.getMode()); WiFi.mode(WIFI_STA); + //settings.WIFI.printNetworks(); } sockEmit.begin(); return true; } -conn_types_t Network::preferredConnType() { - switch(settings.connType) { - case conn_types_t::wifi: - return settings.WIFI.ssid[0] != '\0' ? conn_types_t::wifi : conn_types_t::ap; - case conn_types_t::unset: - case conn_types_t::ap: - return conn_types_t::ap; - case conn_types_t::ethernetpref: - return settings.WIFI.ssid[0] != '\0' && (!ETH.linkUp() && this->ethStarted) ? conn_types_t::wifi : conn_types_t::ethernet; - case conn_types_t::ethernet: - return ETH.linkUp() || !this->ethStarted ? conn_types_t::ethernet : conn_types_t::ap; - default: - return settings.connType; - } -} void Network::loop() { - // ORDER OF OPERATIONS: - // ---------------------------------------------- - // 1. If we are in the middle of a connection process we need to simply bail after the connect method. The - // connect method will take care of our target connection for us. - // 2. Check to see what type of target connection we need. - // a. If this is an ethernet target then the connection needs to perform a fallback if applicable. - // b. If this is a wifi target then we need to first check to see if the SSID is available. - // c. If an SSID has not been set then we need to turn on the Soft AP. - // 3. If the Soft AP is open and the target is either wifi, ethernet, or ethernetpref then - // we need to shut it down if there are no connections and the preferred connection is available. - // a. Ethernet: Check for an active ethernet connection. We cannot rely on linkup because the PHY will - // report that the link is up when no IP address is being served. - // b. WiFi: Perform synchronous scan for APs related to the SSID. If the SSID can be found then perform - // the connection process for the WiFi connection. - // c. SoftAP: This condition retains the Soft AP because no other connection method is available. - conn_types_t ctype = this->preferredConnType(); - this->connect(ctype); // Connection timeout handled in connect function as well as the opening of the Soft AP if needed. - if(this->connecting()) return; // If we are currently attempting to connect to something then we need to bail here. - if(_apScanning) { - if(settings.WIFI.hidden || // This user has elected to use a hidden AP. - (this->connected() && !settings.WIFI.roaming) || // We are already connected and should not be roaming. - (this->softAPOpened && WiFi.softAPgetStationNum() != 0) || // The Soft AP is open and a user is connected. - (ctype != conn_types_t::wifi)) { // The Ethernet link is up so we should ignore this scan. - Serial.println("Cancelling WiFi STA Scan..."); - _apScanning = false; - WiFi.scanDelete(); + this->connect(); + if(!this->connected() || this->connecting()) return; + if(millis() - this->lastEmit > 1500) { + this->lastEmit = millis(); + if(this->connected()) { + this->emitSockets(); + this->lastEmit = millis(); } + } + sockEmit.loop(); + if(this->connected() && millis() - this->lastMDNS > 60000) { + // Every 60 seconds we are going to look at wifi connectivity + // to get around the roaming issues with ESP32. We will try to do this in an async manner. If + // there is a channel that is better we will stop the wifi radio and reconnect + if(this->connType == conn_types::wifi && settings.WIFI.roaming && !this->softAPOpened) { + // If we are not already scanning then we need to start a passive scan + // and only respond if there is a better connection. + // 1. If there is currently a waiting scan don't do anything + if(!_apScanning && WiFi.scanNetworks(true, false, true, 300, 0, settings.WIFI.ssid) == -1) { + _apScanning = true; + } + } + this->lastMDNS = millis(); + } + if(_apScanning) { + if(!settings.WIFI.roaming || this->connType != conn_types::wifi || this->softAPOpened) _apScanning = false; else { - int16_t n = WiFi.scanComplete(); - if( n >= 0) { // If the scan is complete but the WiFi isn't ready this can return 0. + uint16_t n = WiFi.scanComplete(); + if( n > 0) { uint8_t bssid[6]; int32_t channel = 0; if(this->getStrongestAP(settings.WIFI.ssid, bssid, &channel)) { - if(!WiFi.BSSID() || memcmp(bssid, WiFi.BSSID(), sizeof(bssid)) != 0) { - if(!this->connected()) { - Serial.printf("Connecting to AP %02X:%02X:%02X:%02X:%02X:%02X CH: %d\n", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5], channel); - this->connectWiFi(bssid, channel); - } - else { - Serial.printf("Found stronger AP %02X:%02X:%02X:%02X:%02X:%02X CH: %d\n", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5], channel); - this->changeAP(bssid, channel); - } + if(memcmp(bssid, WiFi.BSSID(), sizeof(bssid)) != 0) { + Serial.printf("Found stronger AP %d %02X:%02X:%02X:%02X:%02X:%02X\n", channel, bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]); + this->changeAP(bssid, channel); } } _apScanning = false; } } } - if(!this->connecting() && !settings.WIFI.hidden) { - if((this->softAPOpened && WiFi.softAPgetStationNum() == 0) || - (!this->connected() && ctype == conn_types_t::wifi)) { - // If the Soft AP is opened and there are no clients connected then we need to scan for an AP. If - // our target exists we will exit out of the Soft AP and start that connection. We are also - // going to continuously scan when there is no connection and our preferred connection is wifi. - if(ctype == conn_types_t::wifi) { - // Scan for an AP but only if we are not already scanning. - if(!_apScanning && WiFi.scanNetworks(true, false, true, 300, 0, settings.WIFI.ssid) == -1) { - _apScanning = true; - } - } - } - else if(this->connected() && ctype == conn_types_t::wifi && settings.WIFI.roaming) { - // Periodically look for a roaming AP. - if(millis() > SSID_SCAN_INTERVAL + this->lastWifiScan) { - //Serial.println("Started scan for access points"); - if(!_apScanning && WiFi.scanNetworks(true, false, true, 300, 0, settings.WIFI.ssid) == -1) { - _apScanning = true; - this->lastWifiScan = millis(); - } - } - } - } - if(millis() - this->lastEmit > 1500) { - // Post our connection status if needed. - this->lastEmit = millis(); - if(this->connected()) { - this->emitSockets(); - this->lastEmit = millis(); - } - esp_task_wdt_reset(); // Make sure we do not reboot here. - } - - sockEmit.loop(); - mqtt.loop(); - if(settings.ssdpBroadcast && this->connected()) { + if(settings.ssdpBroadcast) { if(!SSDP.isStarted) SSDP.begin(); if(SSDP.isStarted) SSDP.loop(); } else if(!settings.ssdpBroadcast && SSDP.isStarted) SSDP.end(); + mqtt.loop(); } bool Network::changeAP(const uint8_t *bssid, const int32_t channel) { esp_task_wdt_reset(); // Make sure we do not reboot here. if(SSDP.isStarted) SSDP.end(); mqtt.disconnect(); - //sockEmit.end(); + sockEmit.end(); WiFi.disconnect(false, true); - this->connType = conn_types_t::unset; - this->_connecting = true; - this->connectStart = millis(); WiFi.begin(settings.WIFI.ssid, settings.WIFI.passphrase, channel, bssid); this->connectStart = millis(); return false; @@ -170,14 +107,15 @@ bool Network::changeAP(const uint8_t *bssid, const int32_t channel) { void Network::emitSockets() { this->emitHeap(); if(this->needsBroadcast || - (this->connType == conn_types_t::wifi && (abs(abs(WiFi.RSSI()) - abs(this->lastRSSI)) > 1 || WiFi.channel() != this->lastChannel))) { + (this->connType == conn_types::wifi && (abs(abs(WiFi.RSSI()) - abs(this->lastRSSI)) > 1 || WiFi.channel() != this->lastChannel))) { this->emitSockets(255); sockEmit.loop(); this->needsBroadcast = false; } } void Network::emitSockets(uint8_t num) { - if(this->connType == conn_types_t::ethernet) { + //char buf[128]; + if(this->connType == conn_types::ethernet) { JsonSockEvent *json = sockEmit.beginEmit("ethernet"); json->beginObject(); json->addElem("connected", this->connected()); @@ -185,6 +123,13 @@ void Network::emitSockets(uint8_t num) { json->addElem("fullduplex", ETH.fullDuplex()); json->endObject(); sockEmit.endEmit(num); + /* + snprintf(buf, sizeof(buf), "{\"connected\":%s,\"speed\":%d,\"fullduplex\":%s}", this->connected() ? "true" : "false", ETH.linkSpeed(), ETH.fullDuplex() ? "true" : "false"); + if(num == 255) + sockEmit.sendToClients("ethernet", buf); + else + sockEmit.sendToClient(num, "ethernet", buf); + */ } else { if(WiFi.status() == WL_CONNECTED) { @@ -195,6 +140,13 @@ void Network::emitSockets(uint8_t num) { json->addElem("channel", (int32_t)this->channel); json->endObject(); sockEmit.endEmit(num); + /* + snprintf(buf, sizeof(buf), "{\"ssid\":\"%s\",\"strength\":%d,\"channel\":%d}", WiFi.SSID().c_str(), WiFi.RSSI(), this->channel); + if(num == 255) + sockEmit.sendToClients("wifiStrength", buf); + else + sockEmit.sendToClient(num, "wifiStrength", buf); + */ this->lastRSSI = WiFi.RSSI(); this->lastChannel = WiFi.channel(); } @@ -214,19 +166,28 @@ void Network::emitSockets(uint8_t num) { json->addElem("fullduplex", false); json->endObject(); sockEmit.endEmit(num); + /* + + if(num == 255) { + sockEmit.sendToClients("wifiStrength", "{\"ssid\":\"\", \"strength\":-100,\"channel\":-1}"); + sockEmit.sendToClients("ethernet", "{\"connected\":false,\"speed\":0,\"fullduplex\":false}"); + } + else { + sockEmit.sendToClient(num, "wifiStrength", "{\"ssid\":\"\", \"strength\":-100,\"channel\":-1}"); + sockEmit.sendToClient(num, "ethernet", "{\"connected\":false,\"speed\":0,\"fullduplex\":false}"); + } + */ this->lastRSSI = -100; this->lastChannel = -1; } } this->emitHeap(num); } -void Network::setConnected(conn_types_t connType) { - esp_task_wdt_reset(); +void Network::setConnected(conn_types connType) { this->connType = connType; this->connectTime = millis(); connectRetries = 0; - Serial.println("Setting connected..."); - if(this->connType == conn_types_t::wifi) { + if(this->connType == conn_types::wifi) { if(this->softAPOpened && WiFi.softAPgetStationNum() == 0) { WiFi.softAPdisconnect(true); WiFi.mode(WIFI_STA); @@ -238,7 +199,7 @@ void Network::setConnected(conn_types_t connType) { this->channel = WiFi.channel(); this->connectAttempts++; } - else if(this->connType == conn_types_t::ethernet) { + else if(this->connType == conn_types::ethernet) { if(this->softAPOpened) { Serial.println("Disonnecting from SoftAP"); WiFi.softAPdisconnect(true); @@ -250,11 +211,9 @@ void Network::setConnected(conn_types_t connType) { } // NET: Begin this in the startup. //sockEmit.begin(); - esp_task_wdt_reset(); - if(this->connectAttempts == 1) { Serial.println(); - if(this->connType == conn_types_t::wifi) { + if(this->connType == conn_types::wifi) { Serial.print("Successfully Connected to WiFi!!!!"); Serial.print(WiFi.localIP()); Serial.print(" ("); @@ -284,7 +243,6 @@ void Network::setConnected(conn_types_t connType) { settings.IP.dns1 = ETH.dnsIP(0); settings.IP.dns2 = ETH.dnsIP(1); } - esp_task_wdt_reset(); JsonSockEvent *json = sockEmit.beginEmit("ethernet"); json->beginObject(); json->addElem("connected", this->connected()); @@ -292,7 +250,6 @@ void Network::setConnected(conn_types_t connType) { json->addElem("fullduplex", ETH.fullDuplex()); json->endObject(); sockEmit.endEmit(); - esp_task_wdt_reset(); } } else { @@ -300,7 +257,7 @@ void Network::setConnected(conn_types_t connType) { Serial.print("Reconnected after "); Serial.print(1.0 * (millis() - this->connectStart)/1000); Serial.print("sec IP: "); - if(this->connType == conn_types_t::wifi) { + if(this->connType == conn_types::wifi) { Serial.print(WiFi.localIP()); Serial.print(" "); Serial.print(this->mac); @@ -343,7 +300,6 @@ void Network::setConnected(conn_types_t connType) { SSDP.setManufacturerURL(0, "https://github.com/rstrouse"); SSDP.setURL(0, "/"); SSDP.setActive(0, true); - esp_task_wdt_reset(); if(MDNS.begin(settings.hostname)) { Serial.printf("MDNS Responder Started: serverId=%s\n", settings.serverId); MDNS.addService("http", "tcp", 80); @@ -356,11 +312,9 @@ void Network::setConnected(conn_types_t connType) { MDNS.addServiceTxt("espsomfy_rts", "tcp", "version", String(settings.fwVersion.name)); } if(settings.ssdpBroadcast) { - esp_task_wdt_reset(); SSDP.begin(); } else if(SSDP.isStarted) SSDP.end(); - esp_task_wdt_reset(); this->emitSockets(); settings.printAvailHeap(); this->needsBroadcast = true; @@ -369,16 +323,16 @@ bool Network::connectWired() { if(ETH.linkUp()) { // If the ethernet link is re-established then we need to shut down wifi. if(WiFi.status() == WL_CONNECTED) { - //sockEmit.end(); + sockEmit.end(); WiFi.disconnect(true); WiFi.mode(WIFI_OFF); } - if(this->connType != conn_types_t::ethernet) this->setConnected(conn_types_t::ethernet); + if(this->connType != conn_types::ethernet) this->setConnected(conn_types::ethernet); + this->wifiFallback = false; return true; } else if(this->ethStarted) { - // There is no wired connection so we need to fallback if appropriate. - if(settings.connType == conn_types_t::ethernetpref && settings.WIFI.ssid[0] != '\0') + if(settings.connType == conn_types::ethernetpref && settings.WIFI.ssid[0] != '\0') return this->connectWiFi(); } if(this->connectAttempts > 0) { @@ -388,44 +342,44 @@ bool Network::connectWired() { else Serial.println("Connecting to Wired Ethernet"); this->_connecting = true; - this->connTarget = conn_types_t::ethernet; - this->connType = conn_types_t::unset; + this->connTarget = conn_types::ethernet; + this->connType = conn_types::unset; if(!this->ethStarted) { - // Currently the ethernet module will leak memory if you call begin more than once. - this->ethStarted = true; - WiFi.mode(WIFI_OFF); - if(settings.hostname[0] != '\0') - ETH.setHostname(settings.hostname); - else - ETH.setHostname("ESPSomfy-RTS"); - Serial.print("Set hostname to:"); - Serial.println(ETH.getHostname()); - if(!ETH.begin(settings.Ethernet.phyAddress, settings.Ethernet.PWRPin, settings.Ethernet.MDCPin, settings.Ethernet.MDIOPin, settings.Ethernet.phyType, settings.Ethernet.CLKMode)) { - Serial.println("Ethernet Begin failed"); - this->ethStarted = false; - if(settings.connType == conn_types_t::ethernetpref) { - this->wifiFallback = true; - return connectWiFi(); - } - return false; - } - else { - if(!settings.IP.dhcp) { - if(!ETH.config(settings.IP.ip, settings.IP.gateway, settings.IP.subnet, settings.IP.dns1, settings.IP.dns2)) { - Serial.println("Unable to configure static IP address...."); - ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); - } - } + this->ethStarted = true; + WiFi.mode(WIFI_OFF); + if(settings.hostname[0] != '\0') + ETH.setHostname(settings.hostname); else - ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); - } + ETH.setHostname("ESPSomfy-RTS"); + + Serial.print("Set hostname to:"); + Serial.println(ETH.getHostname()); + if(!ETH.begin(settings.Ethernet.phyAddress, settings.Ethernet.PWRPin, settings.Ethernet.MDCPin, settings.Ethernet.MDIOPin, settings.Ethernet.phyType, settings.Ethernet.CLKMode)) { + Serial.println("Ethernet Begin failed"); + this->ethStarted = false; + if(settings.connType == conn_types::ethernetpref) { + this->wifiFallback = true; + return connectWiFi(); + } + return false; + } + else { + if(!settings.IP.dhcp) { + if(!ETH.config(settings.IP.ip, settings.IP.gateway, settings.IP.subnet, settings.IP.dns1, settings.IP.dns2)) { + Serial.println("Unable to configure static IP address...."); + ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); + } + } + else + ETH.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); + } } this->connectStart = millis(); return true; } void Network::updateHostname() { if(settings.hostname[0] != '\0' && this->connected()) { - if(this->connType == conn_types_t::ethernet && + if(this->connType == conn_types::ethernet && strcmp(settings.hostname, ETH.getHostname()) != 0) { Serial.printf("Updating host name to %s...\n", settings.hostname); ETH.setHostname(settings.hostname); @@ -440,49 +394,24 @@ void Network::updateHostname() { } } } -bool Network::connectWiFi(const uint8_t *bssid, const int32_t channel) { +bool Network::connectWiFi() { if(this->softAPOpened && WiFi.softAPgetStationNum() > 0) { - // There is a client connected to the soft AP. We do not want to close out the connection. While both the - // Soft AP and a wifi connection can coexist on ESP32 the performance is abysmal. WiFi.disconnect(false); this->_connecting = false; - this->connType = conn_types_t::unset; + this->connType = conn_types::unset; return true; } - WiFi.setSleep(false); - if(!settings.IP.dhcp) { - if(!WiFi.config(settings.IP.ip, settings.IP.gateway, settings.IP.subnet, settings.IP.dns1, settings.IP.dns2)) - WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); - } - else - WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); - if(settings.hostname[0] != '\0') WiFi.setHostname(settings.hostname); - delay(100); - - if(bssid && channel > 0) { - if(WiFi.status() == WL_CONNECTED && WiFi.SSID().compareTo(settings.WIFI.ssid) == 0 - && WiFi.channel() == channel) { - this->disconnected = 0; - return true; - } - this->connTarget = conn_types_t::wifi; - this->connType = conn_types_t::unset; - Serial.println("WiFi begin..."); - this->_connecting = true; - WiFi.begin(settings.WIFI.ssid, settings.WIFI.passphrase, channel, bssid); - this->connectStart = millis(); - } - else if(settings.WIFI.ssid[0] != '\0') { + + if(settings.WIFI.ssid[0] != '\0') { if(WiFi.status() == WL_CONNECTED && WiFi.SSID().compareTo(settings.WIFI.ssid) == 0) { // If we are connected to the target SSID then just return. this->disconnected = 0; - this->_connecting = true; return true; } if(this->_connecting) return true; this->_connecting = true; - this->connTarget = conn_types_t::wifi; - this->connType = conn_types_t::unset; + this->connTarget = conn_types::wifi; + this->connType = conn_types::unset; if(this->connectAttempts > 0) { Serial.print("Connection Lost..."); Serial.print(this->mac); @@ -493,49 +422,74 @@ bool Network::connectWiFi(const uint8_t *bssid, const int32_t channel) { Serial.println("dbm) "); } else Serial.println("Connecting to AP"); + // If the soft AP is currently opened then we do not want to kill it. + WiFi.setSleep(false); + WiFi.disconnect(false); + //WiFi.mode(WIFI_MODE_NULL); + if(!settings.IP.dhcp) { + if(!WiFi.config(settings.IP.ip, settings.IP.gateway, settings.IP.subnet, settings.IP.dns1, settings.IP.dns2)) + WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); + } + else + WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE, INADDR_NONE); delay(100); // There is also another method simply called hostname() but this is legacy for esp8266. if(settings.hostname[0] != '\0') WiFi.setHostname(settings.hostname); Serial.print("Set hostname to:"); Serial.println(WiFi.getHostname()); + //WiFi.mode(WIFI_STA); WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); - uint8_t _bssid[6]; - int32_t _channel = 0; - if(!settings.WIFI.hidden && this->getStrongestAP(settings.WIFI.ssid, _bssid, &_channel)) { - Serial.printf("Found strongest AP %02X:%02X:%02X:%02X:%02X:%02X CH:%d\n", _bssid[0], _bssid[1], _bssid[2], _bssid[3], _bssid[4], _bssid[5], _channel); - WiFi.begin(settings.WIFI.ssid, settings.WIFI.passphrase, _channel, _bssid); + uint8_t bssid[6]; + int32_t channel = 0; + if(this->getStrongestAP(settings.WIFI.ssid, bssid, &channel)) { + Serial.printf("Found strongest AP %d %02X:%02X:%02X:%02X:%02X:%02X\n", channel, bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]); + WiFi.begin(settings.WIFI.ssid, settings.WIFI.passphrase, channel, bssid); } else - // If the user has the hidden flag set just connect to whatever the AP gives us. WiFi.begin(settings.WIFI.ssid, settings.WIFI.passphrase); } this->connectStart = millis(); return true; } -bool Network::connect(conn_types_t ctype) { - esp_task_wdt_reset(); - if(this->connecting()) return true; - if(this->disconnectTime == 0) this->disconnectTime = millis(); - if(ctype == conn_types_t::ethernet && this->connType != conn_types_t::ethernet) { - // Here we need to call the connect to ethernet. +bool Network::connect() { + if(this->connecting()) { + // We are currently connecting and this flag is triggered while there is an attempt + // to connect to the network. If the connection type is set then we need to + // finish the connection. If it is not then we need to fall back to AP or in + // the case where the target was originally ethernet then we need to open the softAP. + if(this->connType == conn_types::unset) { + // If we reached our timeout for the connection then we need to open the soft ap. + if(millis() > this->connectStart + CONNECT_TIMEOUT) { + esp_task_wdt_reset(); + if(this->connTarget == conn_types::ethernet && settings.connType == conn_types::ethernetpref && settings.WIFI.ssid[0] != '\0') + this->connectWiFi(); + else if(this->softAPOpened) { + if(settings.connType == conn_types::ethernet || settings.connType == conn_types::ethernetpref) + this->connectWired(); + else if(settings.connType == conn_types::wifi && strlen(settings.WIFI.ssid) > 0) + this->connectWiFi(); + } + else { + //Serial.println("Fell into timeout"); + this->openSoftAP(); + } + } + } + else + this->setConnected(this->connTarget); + } + else if(settings.connType == conn_types::ethernet || settings.connType == conn_types::ethernetpref) this->connectWired(); - } - else if(ctype == conn_types_t::ap || (!this->connected() && millis() > this->disconnectTime + CONNECT_TIMEOUT)) { - if(!this->softAPOpened && !this->openingSoftAP) { - this->disconnectTime = millis(); - this->openSoftAP(); - } - else if(this->softAPOpened && !this->openingSoftAP && - (ctype == conn_types_t::wifi && this->connType != conn_types_t::wifi && settings.WIFI.hidden)) { - // When thge softAP is open then we need to try to connect to wifi repeatedly if the user connects to a hidden SSID. - this->connectWiFi(); - } - } - else if((ctype == conn_types_t::wifi && this->connType != conn_types_t::wifi && settings.WIFI.hidden)) { + else if(settings.connType == conn_types::wifi && strlen(settings.WIFI.ssid) > 0) this->connectWiFi(); + else + this->openSoftAP(); + if(this->softAPOpened && this->connected() && WiFi.softAPgetStationNum() == 0) { + Serial.println("Closing uneeded SoftAP"); + WiFi.softAPdisconnect(true); + if(this->connType == conn_types::wifi) WiFi.mode(WIFI_STA); } - return true; } uint32_t Network::getChipId() { @@ -546,16 +500,16 @@ uint32_t Network::getChipId() { } return chipId; } + bool Network::getStrongestAP(const char *ssid, uint8_t *bssid, int32_t *channel) { // The new AP must be at least 10dbm greater. int32_t strength = this->connected() ? WiFi.RSSI() + 10 : -127; int32_t chan = -1; memset(bssid, 0x00, 6); esp_task_wdt_delete(NULL); - int16_t n = WiFi.scanComplete(); - //int16_t n = this->connected() ? WiFi.scanComplete() : WiFi.scanNetworks(false, false, false, 300, 0, ssid); + uint8_t n = this->connected() ? WiFi.scanComplete() : WiFi.scanNetworks(false, false, false, 300, 0, ssid); esp_task_wdt_add(NULL); - for(int16_t i = 0; i < n; i++) { + for(uint8_t i = 0; i < n; i++) { if(WiFi.SSID(i).compareTo(ssid) == 0) { if(WiFi.RSSI(i) > strength) { strength = WiFi.RSSI(i); @@ -569,55 +523,44 @@ bool Network::getStrongestAP(const char *ssid, uint8_t *bssid, int32_t *channel) } bool Network::openSoftAP() { if(this->softAPOpened || this->openingSoftAP) return true; - if(this->connected()) WiFi.disconnect(false); + WiFi.disconnect(false); this->openingSoftAP = true; Serial.println(); Serial.println("Turning the HotSpot On"); esp_task_wdt_reset(); // Make sure we do not reboot here. - WiFi.softAP(strlen(settings.hostname) > 0 ? settings.hostname : "ESPSomfy RTS", ""); + WiFi.softAP("ESPSomfy RTS", ""); + Serial.println("Initializing AP for credentials modification"); delay(200); return true; } bool Network::connected() { if(this->connecting()) return false; - else if(this->connType == conn_types_t::unset) return false; - else if(this->connType == conn_types_t::wifi) return WiFi.status() == WL_CONNECTED; - else if(this->connType == conn_types_t::ethernet) return ETH.linkUp(); - else return this->connType != conn_types_t::unset; + else if(this->connType == conn_types::unset) return false; + else if(this->connType == conn_types::wifi) return WiFi.status() == WL_CONNECTED; + else if(this->connType == conn_types::ethernet) return ETH.linkUp(); + else return this->connType != conn_types::unset; return false; } bool Network::connecting() { - if(this->_connecting && millis() > this->connectStart + CONNECT_TIMEOUT) this->_connecting = false; - return this->_connecting; + return this->_connecting; } -void Network::clearConnecting() { this->_connecting = false; } void Network::networkEvent(WiFiEvent_t event) { switch(event) { case ARDUINO_EVENT_WIFI_READY: Serial.println("(evt) WiFi interface ready"); break; - case ARDUINO_EVENT_WIFI_SCAN_DONE: - Serial.printf("(evt) Completed scan for access points (%d)\n", WiFi.scanComplete()); - //Serial.println("(evt) Completed scan for access points"); - net.lastWifiScan = millis(); - break; + case ARDUINO_EVENT_WIFI_SCAN_DONE: Serial.println("(evt) Completed scan for access points"); break; case ARDUINO_EVENT_WIFI_STA_START: Serial.println("WiFi station mode started"); if(settings.hostname[0] != '\0') WiFi.setHostname(settings.hostname); break; case ARDUINO_EVENT_WIFI_STA_STOP: Serial.println("(evt) WiFi clients stopped"); break; - case ARDUINO_EVENT_WIFI_STA_CONNECTED: Serial.println("(evt) Connected to WiFi STA access point"); break; - case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: - Serial.printf("(evt) Disconnected from WiFi STA access point. Connecting: %d\n", net.connecting()); - net.connType = conn_types_t::unset; - net.disconnectTime = millis(); - net.clearConnecting(); - break; - case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: Serial.println("(evt) Authentication mode of STA access point has changed"); break; + case ARDUINO_EVENT_WIFI_STA_CONNECTED: Serial.println("(evt) Connected to access point"); break; + case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: Serial.println("(evt) Disconnected from WiFi access point"); break; + case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE: Serial.println("(evt) Authentication mode of access point has changed"); break; case ARDUINO_EVENT_WIFI_STA_GOT_IP: - Serial.print("(evt) Got WiFi STA IP: "); + Serial.print("Got WiFi IP: "); Serial.println(WiFi.localIP()); - net.connType = conn_types_t::wifi; + net.connType = conn_types::wifi; net.connectTime = millis(); - net.setConnected(conn_types_t::wifi); break; case ARDUINO_EVENT_WIFI_STA_LOST_IP: Serial.println("Lost IP address and IP address is reset to 0"); break; case ARDUINO_EVENT_ETH_GOT_IP: @@ -626,24 +569,14 @@ void Network::networkEvent(WiFiEvent_t event) { Serial.print("Got Ethernet IP "); Serial.println(ETH.localIP()); net.connectTime = millis(); - net.connType = conn_types_t::ethernet; - if(settings.IP.dhcp) { - settings.IP.ip = ETH.localIP(); - settings.IP.subnet = ETH.subnetMask(); - settings.IP.gateway = ETH.gatewayIP(); - settings.IP.dns1 = ETH.dnsIP(0); - settings.IP.dns2 = ETH.dnsIP(1); - } - net.setConnected(conn_types_t::ethernet); + net.connType = conn_types::ethernet; break; case ARDUINO_EVENT_ETH_CONNECTED: Serial.print("(evt) Ethernet Connected "); break; case ARDUINO_EVENT_ETH_DISCONNECTED: Serial.println("(evt) Ethernet Disconnected"); - net.connType = conn_types_t::unset; - net.disconnectTime = millis(); - net.clearConnecting(); + net.connType = conn_types::unset; break; case ARDUINO_EVENT_ETH_START: Serial.println("(evt) Ethernet Started"); @@ -651,7 +584,7 @@ void Network::networkEvent(WiFiEvent_t event) { break; case ARDUINO_EVENT_ETH_STOP: Serial.println("(evt) Ethernet Stopped"); - net.connType = conn_types_t::unset; + net.connType = conn_types::unset; net.ethStarted = false; break; case ARDUINO_EVENT_WIFI_AP_START: @@ -661,7 +594,8 @@ void Network::networkEvent(WiFiEvent_t event) { net.softAPOpened = true; break; case ARDUINO_EVENT_WIFI_AP_STOP: - if(!net.openingSoftAP) Serial.println("(evt) WiFi SoftAP Stopped"); + Serial.println("(evt) WiFi SoftAP Stopped"); + //if(net.softAPOpened) net.openingSoftAP = false; net.softAPOpened = false; break; default: @@ -671,41 +605,16 @@ void Network::networkEvent(WiFiEvent_t event) { } } void Network::emitHeap(uint8_t num) { - bool bEmit = false; - bool bTimeEmit = millis() - _lastHeapEmit > 15000; - bool bRoomEmit = false; - bool bValEmit = false; - if(num != 255 || this->needsBroadcast) bEmit = true; - if(millis() - _lastHeapEmit > 15000) bTimeEmit = true; - uint32_t freeHeap = ESP.getFreeHeap(); - uint32_t maxHeap = ESP.getMaxAllocHeap(); - uint32_t minHeap = ESP.getMinFreeHeap(); - if(abs((int)(freeHeap - _lastHeap)) > 1500) bValEmit = true; - if(abs((int)(maxHeap - _lastMaxHeap)) > 1500) bValEmit = true; - bRoomEmit = sockEmit.activeClients(0) > 0; - if(bValEmit) bTimeEmit = millis() - _lastHeapEmit > 7000; - if(bEmit || bTimeEmit || bRoomEmit || bValEmit) { + if(num != 255 || this->needsBroadcast || (ESP.getMaxAllocHeap() != _lastMaxHeap || ESP.getFreeHeap() != _lastHeap)) { + _lastMaxHeap = ESP.getMaxAllocHeap(); + _lastHeap = ESP.getFreeHeap(); JsonSockEvent *json = sockEmit.beginEmit("memStatus"); json->beginObject(); - json->addElem("max", maxHeap); - json->addElem("free", freeHeap); - json->addElem("min", minHeap); + json->addElem("max", _lastMaxHeap); + json->addElem("free", _lastHeap); + json->addElem("min", ESP.getMinFreeHeap()); json->addElem("total", ESP.getHeapSize()); json->endObject(); - if(num == 255 && bTimeEmit && bValEmit) { - sockEmit.endEmit(num); - _lastHeapEmit = millis(); - _lastHeap = freeHeap; - _lastMaxHeap = maxHeap; - //Serial.printf("BROAD HEAP: Emit:%d TimeEmit:%d ValEmit:%d\n", bEmit, bTimeEmit, bValEmit); - } - else if(num != 255) { - sockEmit.endEmit(num); - //Serial.printf("TARGET HEAP %d: Emit:%d TimeEmit:%d ValEmit:%d\n", num, bEmit, bTimeEmit, bValEmit); - } - else if(bRoomEmit) { - sockEmit.endEmitRoom(0); - //Serial.printf("ROOM HEAP: Emit:%d TimeEmit:%d ValEmit:%d\n", bEmit, bTimeEmit, bValEmit); - } + sockEmit.endEmit(num); } } diff --git a/Network.h b/Network.h index 864966c..0d90256 100644 --- a/Network.h +++ b/Network.h @@ -3,10 +3,7 @@ #ifndef Network_h #define Network_h -//enum class conn_types_t : byte; - #define CONNECT_TIMEOUT 20000 -#define SSID_SCAN_INTERVAL 60000 class Network { protected: unsigned long lastEmit = 0; @@ -16,32 +13,28 @@ class Network { int linkSpeed = 0; bool _connecting = false; public: - unsigned long lastWifiScan = 0; bool ethStarted = false; bool wifiFallback = false; bool softAPOpened = false; bool openingSoftAP = false; bool needsBroadcast = true; - conn_types_t connType = conn_types_t::unset; - conn_types_t connTarget = conn_types_t::unset; + conn_types connType = conn_types::unset; + conn_types connTarget = conn_types::unset; bool connected(); bool connecting(); - void clearConnecting(); - conn_types_t preferredConnType(); String ssid; String mac; int channel; int strength; int disconnected = 0; int connectAttempts = 0; - uint32_t disconnectTime = 0; uint32_t connectStart = 0; uint32_t connectTime = 0; bool openSoftAP(); - bool connect(conn_types_t ctype); - bool connectWiFi(const uint8_t *bssid = nullptr, const int32_t channel = -1); + bool connect(); + bool connectWiFi(); bool connectWired(); - void setConnected(conn_types_t connType); + void setConnected(conn_types connType); bool getStrongestAP(const char *ssid, uint8_t *bssid, int32_t *channel); bool changeAP(const uint8_t *bssid, const int32_t channel); //int getStrengthByMac(const char *mac); diff --git a/SSDP.cpp b/SSDP.cpp index f866865..6f76a1f 100644 --- a/SSDP.cpp +++ b/SSDP.cpp @@ -161,7 +161,7 @@ void UPNPDeviceType::setChipId(uint32_t chipId) { (uint16_t)chipId & 0xff); } SSDPClass::SSDPClass():sendQueue{false, INADDR_NONE, 0, nullptr, false, 0, "", response_types_t::root} {} -SSDPClass::~SSDPClass() { end(); this->isStarted = false; } +SSDPClass::~SSDPClass() { end(); } bool SSDPClass::begin() { for(int i = 0; i < SSDP_QUEUE_SIZE; i++) { this->sendQueue[i].waiting = false; @@ -209,7 +209,6 @@ void SSDPClass::end() { if(this->_server.connected()) { this->_sendByeBye(); this->_server.close(); - Serial.println("Disconnected from SSDP..."); } this->isStarted = false; // Clear out the last notified so if the user starts us up again it will notify @@ -217,6 +216,8 @@ void SSDPClass::end() { for(uint8_t i = 0; i < this->m_cdeviceTypes; i++) { this->deviceTypes[i].lastNotified = 0; } + + Serial.println("Disconnected from SSDP..."); } UPNPDeviceType* SSDPClass::getDeviceType(uint8_t ndx) { if(ndx < this->m_cdeviceTypes) return &this->deviceTypes[ndx]; return nullptr; } UPNPDeviceType* SSDPClass::findDeviceByType(char *devType) { diff --git a/Sockets.cpp b/Sockets.cpp index 51765aa..6d098a8 100644 --- a/Sockets.cpp +++ b/Sockets.cpp @@ -43,9 +43,6 @@ bool room_t::leave(uint8_t num) { } return true; } -void room_t::clear() { - memset(this->clients, 255, sizeof(this->clients)); -} uint8_t room_t::activeClients() { uint8_t n = 0; for(uint8_t i = 0; i < sizeof(this->clients); i++) { @@ -80,7 +77,7 @@ void SocketEmitter::begin() { sockServer.enableHeartbeat(20000, 10000, 3); sockServer.onEvent(this->wsEvent); Serial.println("Socket Server Started..."); - //settings.printAvailHeap(); + settings.printAvailHeap(); } void SocketEmitter::loop() { this->initClients(); @@ -129,11 +126,7 @@ void SocketEmitter::delayInit(uint8_t num) { } } } -void SocketEmitter::end() { - sockServer.close(); - for(uint8_t i = 0; i < SOCK_MAX_ROOMS; i++) - this->rooms[i].clear(); -} +void SocketEmitter::end() { sockServer.close(); } void SocketEmitter::disconnect() { sockServer.disconnect(); } void SocketEmitter::wsEvent(uint8_t num, WStype_t type, uint8_t *payload, size_t length) { switch(type) { diff --git a/Sockets.h b/Sockets.h index d76ab93..f6acf46 100644 --- a/Sockets.h +++ b/Sockets.h @@ -12,7 +12,6 @@ struct room_t { bool isJoined(uint8_t num); bool join(uint8_t num); bool leave(uint8_t num); - void clear(); }; class SocketEmitter { protected: diff --git a/Somfy.cpp b/Somfy.cpp index bffebd2..2e994e6 100644 --- a/Somfy.cpp +++ b/Somfy.cpp @@ -257,10 +257,6 @@ void somfy_frame_t::decodeFrame(somfy_rx_t *rx) { this->rssi = ELECHOUSE_cc1101.getRssi(); this->decodeFrame(rx->payload); } -byte somfy_frame_t::encode80Byte7(byte start, uint8_t repeat) { - while((repeat * 4) + start > 255) repeat -= 15; - return start + (repeat * 4); -} void somfy_frame_t::encode80BitFrame(byte *frame, uint8_t repeat) { switch(this->cmd) { // Step up and down commands encode the step size into the last 3 bytes. @@ -295,37 +291,22 @@ void somfy_frame_t::encode80BitFrame(byte *frame, uint8_t repeat) { frame[9] |= this->calc80Checksum(frame[7], frame[8], frame[9]); break; case somfy_commands::Toggle: - frame[0] = 164; - frame[1] |= 0xF0; - frame[7] = this->encode80Byte7(196, repeat); + if(repeat == 0) { + frame[0] = 164; + frame[1] |= 0xF0; + } + frame[7] = 196; frame[8] = 0; frame[9] = 0x10; frame[9] |= this->calc80Checksum(frame[7], frame[8], frame[9]); break; - case somfy_commands::Up: - frame[7] = this->encode80Byte7(196, repeat); - frame[8] = 32; - frame[9] = 0x00; - frame[9] |= this->calc80Checksum(frame[7], frame[8], frame[9]); - break; - case somfy_commands::Down: - frame[7] = this->encode80Byte7(196, repeat); - frame[8] = 44; - frame[9] = 0x80; - frame[9] |= this->calc80Checksum(frame[7], frame[8], frame[9]); - break; case somfy_commands::Prog: - case somfy_commands::UpDown: - case somfy_commands::MyDown: - case somfy_commands::MyUp: - case somfy_commands::MyUpDown: - case somfy_commands::My: - frame[7] = this->encode80Byte7(196, repeat); - frame[8] = 0x00; - frame[9] = 0x10; + if(repeat > 0) frame[7] = 196 + (repeat * 4); + else frame[7] = 132; + frame[8] = 0; + frame[9] = ((repeat + 1) & 0x0F) << 4; frame[9] |= this->calc80Checksum(frame[7], frame[8], frame[9]); - break; - + break; default: break; } @@ -420,7 +401,7 @@ void somfy_frame_t::encodeFrame(byte *frame) { } else { - if(this->bitLength == 80) this->encode80BitFrame(&frame[0], this->repeats); + if(this->bitLength == 80) this->encode80BitFrame(&frame[0], 0); } byte checksum = 0; @@ -992,7 +973,7 @@ void SomfyShade::triggerGPIOs(somfy_frame_t &frame) { int8_t dir = 0; switch(frame.cmd) { case somfy_commands::My: - if(this->shadeType != shade_types::drycontact && !this->isToggle()) { + if(this->shadeType != shade_types::drycontact && this->shadeType != shade_types::garage1) { digitalWrite(this->gpioUp, p_off); digitalWrite(this->gpioDown, p_off); digitalWrite(this->gpioMy, p_on); @@ -1001,7 +982,7 @@ void SomfyShade::triggerGPIOs(somfy_frame_t &frame) { } break; case somfy_commands::Up: - if(this->shadeType != shade_types::drycontact && !this->isToggle() && this->shadeType != shade_types::drycontact2) { + if(this->shadeType != shade_types::drycontact && this->shadeType != shade_types::garage1 && this->shadeType != shade_types::drycontact2) { digitalWrite(this->gpioMy, p_off); digitalWrite(this->gpioDown, p_off); digitalWrite(this->gpioUp, p_on); @@ -1011,7 +992,7 @@ void SomfyShade::triggerGPIOs(somfy_frame_t &frame) { break; case somfy_commands::Toggle: case somfy_commands::Down: - if(this->shadeType != shade_types::drycontact && !this->isToggle() && this->shadeType != shade_types::drycontact2) { + if(this->shadeType != shade_types::drycontact && this->shadeType != shade_types::garage1 && this->shadeType != shade_types::drycontact2) { digitalWrite(this->gpioMy, p_off); digitalWrite(this->gpioUp, p_off); } @@ -1020,7 +1001,7 @@ void SomfyShade::triggerGPIOs(somfy_frame_t &frame) { Serial.printf("UP: false, DOWN: true, MY: false\n"); break; case somfy_commands::MyUp: - if(this->shadeType != shade_types::drycontact && !this->isToggle() && this->shadeType != shade_types::drycontact2) { + if(this->shadeType != shade_types::drycontact && this->shadeType != shade_types::garage1 && this->shadeType != shade_types::drycontact2) { digitalWrite(this->gpioDown, p_off); digitalWrite(this->gpioMy, p_on); digitalWrite(this->gpioUp, p_on); @@ -1028,7 +1009,7 @@ void SomfyShade::triggerGPIOs(somfy_frame_t &frame) { } break; case somfy_commands::MyDown: - if(this->shadeType != shade_types::drycontact && !this->isToggle() && this->shadeType != shade_types::drycontact2) { + if(this->shadeType != shade_types::drycontact && this->shadeType != shade_types::garage1 && this->shadeType != shade_types::drycontact2) { digitalWrite(this->gpioUp, p_off); digitalWrite(this->gpioMy, p_on); digitalWrite(this->gpioDown, p_on); @@ -1036,7 +1017,7 @@ void SomfyShade::triggerGPIOs(somfy_frame_t &frame) { } break; case somfy_commands::MyUpDown: - if(this->shadeType != shade_types::drycontact && this->isToggle() && this->shadeType != shade_types::drycontact2) { + if(this->shadeType != shade_types::drycontact && this->shadeType != shade_types::garage1 && this->shadeType != shade_types::drycontact2) { digitalWrite(this->gpioUp, p_on); digitalWrite(this->gpioMy, p_on); digitalWrite(this->gpioDown, p_on); @@ -1504,9 +1485,6 @@ void SomfyShade::publishDisco() { case shade_types::lgate: case shade_types::cgate: case shade_types::rgate: - case shade_types::lgate1: - case shade_types::cgate1: - case shade_types::rgate1: case shade_types::ldrapery: case shade_types::rdrapery: case shade_types::cdrapery: @@ -2395,7 +2373,7 @@ void SomfyShade::processFrame(somfy_frame_t &frame, bool internal) { break; case somfy_commands::My: if(this->shadeType == shade_types::drycontact2) return; - if(this->isToggle()) { // This is a one button device + if(this->shadeType == shade_types::garage1) { if(this->lastFrame.processed) return; this->lastFrame.processed = true; if(!this->isIdle()) this->p_target(this->currentPos); @@ -2928,7 +2906,7 @@ void SomfyShade::sendCommand(somfy_commands cmd, uint8_t repeat, uint8_t stepSiz } } else if(cmd == somfy_commands::My) { - if(this->isToggle() || this->shadeType == shade_types::drycontact) + if(this->shadeType == shade_types::garage1 || this->shadeType == shade_types::drycontact) SomfyRemote::sendCommand(cmd, repeat); else if(this->shadeType == shade_types::drycontact2) return; else if(this->isIdle()) { @@ -2945,7 +2923,7 @@ void SomfyShade::sendCommand(somfy_commands cmd, uint8_t repeat, uint8_t stepSiz if(this->bitLength != 80) SomfyRemote::sendCommand(somfy_commands::My, repeat, stepSize); else SomfyRemote::sendCommand(somfy_commands::Toggle, repeat); } - else if(this->isToggle() && cmd == somfy_commands::Prog) { + else if(this->shadeType == shade_types::garage1 && cmd == somfy_commands::Prog) { SomfyRemote::sendCommand(somfy_commands::Toggle, repeat, stepSize); } else { @@ -3027,8 +3005,8 @@ void SomfyShade::moveToTiltTarget(float target) { } void SomfyShade::moveToTarget(float pos, float tilt) { somfy_commands cmd = somfy_commands::My; - if(this->isToggle()) { - // Overload this as we cannot seek a position on a garage door or single button device. + if(this->shadeType == shade_types::garage1) { + // Overload this as we cannot seek a position on a garage door. this->p_target(pos); this->p_currentPos(pos); this->emitState(); @@ -3110,24 +3088,12 @@ bool SomfyShade::save() { } bool SomfyRoom::save() { somfy.commit(); return true; } bool SomfyGroup::save() { somfy.commit(); return true; } -bool SomfyShade::isToggle() { - switch(this->shadeType) { - case shade_types::garage1: - case shade_types::lgate1: - case shade_types::cgate1: - case shade_types::rgate1: - return true; - default: - break; - } - return false; -} bool SomfyShade::usesPin(uint8_t pin) { if(this->proto != radio_proto::GP_Remote && this->proto != radio_proto::GP_Relay) return false; if(this->gpioDown == pin) return true; else if(this->shadeType == shade_types::drycontact) return this->gpioDown == pin; - else if(this->isToggle()) { + else if(this->shadeType == shade_types::garage1) { if(this->proto == radio_proto::GP_Relay && this->gpioUp == pin) return true; } else if(this->shadeType == shade_types::drycontact2) { @@ -3179,9 +3145,7 @@ int8_t SomfyShade::validateJSON(JsonObject &obj) { uint8_t upPin = obj.containsKey("gpioUp") ? obj["gpioUp"].as() : this->gpioUp; uint8_t downPin = obj.containsKey("gpioDown") ? obj["gpioDown"].as() : this->gpioDown; uint8_t myPin = obj.containsKey("gpioMy") ? obj["gpioMy"].as() : this->gpioMy; - if(type == shade_types::drycontact || - ((type == shade_types::garage1 || type == shade_types::lgate1 || type == shade_types::cgate1 || type == shade_types::rgate1) - && proto == radio_proto::GP_Remote)) upPin = myPin = 255; + if(type == shade_types::drycontact || (type == shade_types::garage1 && proto == radio_proto::GP_Remote)) upPin = myPin = 255; else if(type == shade_types::drycontact2) myPin = 255; if(proto == radio_proto::GP_Relay) myPin = 255; if(somfy.transceiver.config.enabled) { @@ -3190,7 +3154,7 @@ int8_t SomfyShade::validateJSON(JsonObject &obj) { (myPin != 255 && somfy.transceiver.usesPin(myPin))) ret = -10; } - if(settings.connType == conn_types_t::ethernet || settings.connType == conn_types_t::ethernetpref) { + if(settings.connType == conn_types::ethernet || settings.connType == conn_types::ethernetpref) { if((upPin != 255 && settings.Ethernet.usesPin(upPin)) || (downPin != 255 && somfy.transceiver.usesPin(downPin)) || (myPin != 255 && somfy.transceiver.usesPin(myPin))) @@ -3997,13 +3961,9 @@ void SomfyRemote::repeatFrame(uint8_t repeat) { somfy.transceiver.beginTransmit(); byte frm[10]; this->lastFrame.encodeFrame(frm); - this->lastFrame.repeats++; somfy.transceiver.sendFrame(frm, this->bitLength == 56 ? 2 : 12, this->bitLength); for(uint8_t i = 0; i < repeat; i++) { - this->lastFrame.repeats++; - if(this->lastFrame.bitLength == 80) this->lastFrame.encode80BitFrame(&frm[0], this->lastFrame.repeats); somfy.transceiver.sendFrame(frm, this->bitLength == 56 ? 7 : 6, this->bitLength); - esp_task_wdt_reset(); } somfy.transceiver.endTransmit(); //somfy.processFrame(this->lastFrame, true); @@ -4197,7 +4157,7 @@ void SomfyShadeController::toJSONGroups(JsonResponse &json) { } void SomfyShadeController::toJSONRepeaters(JsonResponse &json) { for(uint8_t i = 0; i < SOMFY_MAX_REPEATERS; i++) { - if(somfy.repeaters[i] != 0) json.addElem((uint32_t)somfy.repeaters[i]); + if(somfy.repeaters[i] != 0) json.addElem((uint8_t)somfy.repeaters[i]); } } void SomfyShadeController::loop() { diff --git a/Somfy.h b/Somfy.h index bc5c99b..aad8823 100644 --- a/Somfy.h +++ b/Somfy.h @@ -67,10 +67,7 @@ enum class shade_types : byte { drycontact2 = 0x0A, lgate = 0x0B, cgate = 0x0C, - rgate = 0x0D, - lgate1 = 0x0E, - cgate1 = 0x0F, - rgate1 = 0x10 + rgate = 0x0D }; enum class tilt_types : byte { none = 0x00, @@ -192,7 +189,6 @@ struct somfy_frame_t { void print(); void encode80BitFrame(byte *frame, uint8_t repeat); byte calc80Checksum(byte b0, byte b1, byte b2); - byte encode80Byte7(byte start, uint8_t repeat); void encodeFrame(byte *frame); void decodeFrame(byte* frame); void decodeFrame(somfy_rx_t *rx); @@ -325,7 +321,6 @@ class SomfyShade : public SomfyRemote { void setMovement(int8_t dir); void setTarget(float target); bool isAtTarget(); - bool isToggle(); void moveToTarget(float pos, float tilt = -1.0f); void moveToTiltTarget(float target); void sendTiltCommand(somfy_commands cmd); diff --git a/SomfyController.ino b/SomfyController.ino index 464d179..46dfc8d 100644 --- a/SomfyController.ino +++ b/SomfyController.ino @@ -49,9 +49,7 @@ void loop() { Serial.print("Rebooting after "); Serial.print(rebootDelay.rebootTime); Serial.println("ms"); - net.end(); ESP.restart(); - return; } uint32_t timing = millis(); diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index bb87d58..b0fc392 100644 Binary files a/SomfyController.ino.esp32.bin and b/SomfyController.ino.esp32.bin differ diff --git a/SomfyController.ino.esp32s3.bin b/SomfyController.ino.esp32s3.bin index 76f303c..54c0774 100644 Binary files a/SomfyController.ino.esp32s3.bin and b/SomfyController.ino.esp32s3.bin differ diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin index 98d9f83..0b7c980 100644 Binary files a/SomfyController.littlefs.bin and b/SomfyController.littlefs.bin differ diff --git a/Utils.h b/Utils.h index 51a29b2..b31e3ab 100644 --- a/Utils.h +++ b/Utils.h @@ -9,7 +9,6 @@ [[maybe_unused]] static void SETCHARPROP(char *prop, const char *value, size_t size) {strncpy(prop, value, size); prop[size - 1] = '\0';} -/* namespace util { // Createa a custom to_string function. C++ can be annoying // with all the trailing 0s on number formats. @@ -24,8 +23,6 @@ namespace util { return str; } } -*/ - static void _ltrim(char *str) { int s = 0, j, k = 0; int e = strlen(str); diff --git a/WResp.cpp b/WResp.cpp index e44e3ba..3b158ca 100644 --- a/WResp.cpp +++ b/WResp.cpp @@ -21,7 +21,7 @@ void JsonSockEvent::endEvent(uint8_t num) { else this->server->sendTXT(num, this->buff); } void JsonSockEvent::_safecat(const char *val, bool escape) { - size_t len = (escape ? this->calcEscapedLength(val) : strlen(val)) + strlen(this->buff); + size_t len = strlen(val) + strlen(this->buff); if(escape) len += 2; if(len >= this->buffSize) { Serial.printf("Socket exceeded buffer size %d - %d\n", this->buffSize, len); @@ -29,8 +29,7 @@ void JsonSockEvent::_safecat(const char *val, bool escape) { return; } if(escape) strcat(this->buff, "\""); - if(escape) this->escapeString(val, &this->buff[strlen(this->buff)]); - else strcat(this->buff, val); + strcat(this->buff, val); if(escape) strcat(this->buff, "\""); } void JsonResponse::beginResponse(WebServer *server, char *buff, size_t buffSize) { @@ -53,14 +52,13 @@ void JsonResponse::send() { this->_headersSent = true; } void JsonResponse::_safecat(const char *val, bool escape) { - size_t len = (escape ? this->calcEscapedLength(val) : strlen(val)) + strlen(this->buff); + size_t len = strlen(val) + strlen(this->buff); if(escape) len += 2; if(len >= this->buffSize) { this->send(); } if(escape) strcat(this->buff, "\""); - if(escape) this->escapeString(val, &this->buff[strlen(this->buff)]); - else strcat(this->buff, val); + strcat(this->buff, val); if(escape) strcat(this->buff, "\""); } @@ -135,70 +133,13 @@ void JsonFormatter::addElem(const char *name, uint64_t lval) { sprintf(this->_nu void JsonFormatter::addElem(const char *name, bool bval) { strcpy(this->_numbuff, bval ? "true" : "false"); this->_appendNumber(name); } void JsonFormatter::_safecat(const char *val, bool escape) { - size_t len = (escape ? this->calcEscapedLength(val) : strlen(val)) + strlen(this->buff); + size_t len = strlen(val) + strlen(this->buff); if(escape) len += 2; if(len >= this->buffSize) { return; } if(escape) strcat(this->buff, "\""); - if(escape) this->escapeString(val, &this->buff[strlen(this->buff)]); - else strcat(this->buff, val); + strcat(this->buff, val); if(escape) strcat(this->buff, "\""); } void JsonFormatter::_appendNumber(const char *name) { this->appendElem(name); this->_safecat(this->_numbuff); } -uint32_t JsonFormatter::calcEscapedLength(const char *raw) { - uint32_t len = 0; - for(size_t i = strlen(raw); i > 0; i--) { - switch(raw[i]) { - case '"': - case '/': - case '\b': - case '\f': - case '\n': - case '\r': - case '\t': - case '\\': - len += 2; - break; - default: - len++; - break; - } - } - return len; -} -void JsonFormatter::escapeString(const char *raw, char *escaped) { - for(uint32_t i = 0; i < strlen(raw); i++) { - switch(raw[i]) { - case '"': - strcat(escaped, "\\\""); - break; - case '/': - strcat(escaped, "\\/"); - break; - case '\b': - strcat(escaped, "\\b"); - break; - case '\f': - strcat(escaped, "\\f"); - break; - case '\n': - strcat(escaped, "\\n"); - break; - case '\r': - strcat(escaped, "\\r"); - break; - case '\t': - strcat(escaped, "\\t"); - break; - case '\\': - strcat(escaped, "\\\\"); - break; - default: - size_t len = strlen(escaped); - escaped[len] = raw[i]; - escaped[len+1] = 0x00; - break; - } - } -} diff --git a/WResp.h b/WResp.h index 4bda5d5..f1a7f2c 100644 --- a/WResp.h +++ b/WResp.h @@ -16,8 +16,6 @@ class JsonFormatter { virtual void _safecat(const char *val, bool escape = false); void _appendNumber(const char *name); public: - void escapeString(const char *raw, char *escaped); - uint32_t calcEscapedLength(const char *raw); void beginObject(const char *name = nullptr); void endObject(); void beginArray(const char *name = nullptr); diff --git a/Web.cpp b/Web.cpp index 425d1b2..fdbc058 100644 --- a/Web.cpp +++ b/Web.cpp @@ -791,8 +791,8 @@ void Web::handleDiscovery(WebServer &server) { if (method == HTTP_POST || method == HTTP_GET) { Serial.println("Discovery Requested"); char connType[10] = "Unknown"; - if(net.connType == conn_types_t::ethernet) strcpy(connType, "Ethernet"); - else if(net.connType == conn_types_t::wifi) strcpy(connType, "Wifi"); + if(net.connType == conn_types::ethernet) strcpy(connType, "Ethernet"); + else if(net.connType == conn_types::wifi) strcpy(connType, "Wifi"); JsonResponse resp; resp.beginResponse(&server, g_content, sizeof(g_content)); @@ -2374,13 +2374,13 @@ void Web::begin() { // Parse out all the inputs. bool reboot = false; if(obj.containsKey("connType") && obj["connType"].as() != static_cast(settings.connType)) { - settings.connType = static_cast(obj["connType"].as()); + settings.connType = static_cast(obj["connType"].as()); settings.save(); reboot = true; } if(obj.containsKey("wifi")) { JsonObject objWifi = obj["wifi"]; - if(settings.connType == conn_types_t::wifi) { + if(settings.connType == conn_types::wifi) { if(objWifi.containsKey("ssid") && objWifi["ssid"].as().compareTo(settings.WIFI.ssid) != 0) { if(WiFi.softAPgetStationNum() == 0) reboot = true; } @@ -2395,7 +2395,7 @@ void Web::begin() { { JsonObject objEth = obj["ethernet"]; // This is an ethernet connection so if anything changes we need to reboot. - if(settings.connType == conn_types_t::ethernet || settings.connType == conn_types_t::ethernetpref) + if(settings.connType == conn_types::ethernet || settings.connType == conn_types::ethernetpref) reboot = true; settings.Ethernet.fromJSON(objEth); settings.Ethernet.save(); diff --git a/data/appversion b/data/appversion index 48a6b50..ab6d278 100644 --- a/data/appversion +++ b/data/appversion @@ -1 +1 @@ -2.4.7 \ No newline at end of file +2.4.4 \ No newline at end of file diff --git a/data/index.html b/data/index.html index fda0670..64ed89c 100644 --- a/data/index.html +++ b/data/index.html @@ -8,9 +8,9 @@ - - - + + + @@ -114,7 +114,7 @@ rel="apple-touch-startup-image"> - +
@@ -160,7 +160,7 @@
-
+
@@ -275,24 +275,17 @@