diff --git a/README.md b/README.md index 97c10eea..4283e5e2 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,8 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our Code of Conduc This project is licensed under the Apache 2 License - see the [LICENSE](LICENSE) file for details. ## Version -v3.0.1 +v3.0.2 + [Project OWL]: diff --git a/library.json b/library.json index adee1d60..0eb65b3d 100644 --- a/library.json +++ b/library.json @@ -8,7 +8,7 @@ "email": "info@project-owl.com", "url": "https://www.project-owl.com" }, - "version": "3.0.0", + "version": "3.0.2", "repository": { "type": "git", diff --git a/library.properties b/library.properties index d0a7235d..458ac17c 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ClusterDuck Protocol -version=3.0.0 +version=3.0.2 author=Project OWL maintainer=Project OWL sentence=Mesh communication protocol. diff --git a/src/CdpPacket.h b/src/CdpPacket.h index 9666d02e..40fcb249 100644 --- a/src/CdpPacket.h +++ b/src/CdpPacket.h @@ -52,8 +52,9 @@ Each MUID: 04 byte array - Message unique ID */ #define MAX_MUID_PER_ACK 14 -// header + 1 hop + 1 byte data -#define MIN_PACKET_LENGTH (HEADER_LENGTH + DUID_LENGTH + 1) +// header +// Should be header + 1 but need to test to make sure detector still works +#define MIN_PACKET_LENGTH HEADER_LENGTH #define ARRAY_LENGTH(array) (sizeof(array) / sizeof((array)[0])) diff --git a/src/DuckNet.cpp b/src/DuckNet.cpp index d3eb504d..7233454a 100644 --- a/src/DuckNet.cpp +++ b/src/DuckNet.cpp @@ -129,13 +129,13 @@ int DuckNet::setupWebServer(bool createCaptivePortal, String html) { }); - webServer.on("/flipDetector", HTTP_POST, [&](AsyncWebServerRequest* request) { + webServer.on("/flipDetector", HTTP_GET, [&](AsyncWebServerRequest* request) { //Run flip method duckutils::flipDetectState(); request->send(200, "text/plain", "Success"); }); - webServer.on("/flipDecrypt", HTTP_POST, [&](AsyncWebServerRequest* request) { + webServer.on("/flipDecrypt", HTTP_GET, [&](AsyncWebServerRequest* request) { //Flip Decrypt State loginfo("Flipping Decrypt"); diff --git a/src/DuckRadio.cpp b/src/DuckRadio.cpp index e07738b7..51bdf849 100644 --- a/src/DuckRadio.cpp +++ b/src/DuckRadio.cpp @@ -113,6 +113,9 @@ int DuckRadio::readReceivedData(std::vector* packetBytes) { if (packet_length < MIN_PACKET_LENGTH) { logerr("ERROR handlePacket rx data size invalid: " + String(packet_length)); + + DuckRadio::setReceiveFlag(false); + int rxState = startReceive(); return DUCKLORA_ERR_HANDLE_PACKET; } diff --git a/src/DuckUtils.cpp b/src/DuckUtils.cpp index 042d1df8..2b4e11d8 100644 --- a/src/DuckUtils.cpp +++ b/src/DuckUtils.cpp @@ -8,7 +8,7 @@ namespace duckutils { namespace { - std::string cdpVersion = "2.11.0"; + std::string cdpVersion = "3.0.2"; } Timer<> duckTimer = timer_create_default(); diff --git a/src/include/controlPanel.h b/src/include/controlPanel.h index 22215ab3..98bbc77e 100644 --- a/src/include/controlPanel.h +++ b/src/include/controlPanel.h @@ -96,6 +96,7 @@ const char controlPanel[] PROGMEM = R"=====( Flip Detector + Flip Decrypt