extend internal check if cc1101 is connected to avoid infinite-loop #2

dewenni · Dec 18, 2024 · 135fa45 · 135fa45
1 parent b10ee02
commit 135fa45
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 13 deletions.
diff --git a/changeNew.md b/changeNew.md
@@ -1,8 +1,8 @@
-# v1.1.0
+# v1.1.1
 
 ## what's new
 
-minor changes and updates!
+this is a minor bug fix version!
 
 this project is still in an early phase.
 If you like this project, feel free to push the **[Star ⭐️]** button and click **[Watch 👁]** to stay updated.
@@ -11,7 +11,4 @@ If you have any further questions, suggestions or requests, please use the discu
 
 ## changelog
 
-- add gpio check (check for duplicates and set initial values if gpio=0)
-- set initial log level to "Debug"
-- update mathieucarbou/AsyncTCP @ 3.3.1
-- update mathieucarbou/ESPAsyncWebServer @ 3.4.3
+- extend internal check if cc1101 is connected to avoid infinite-loop #2
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,25 @@
 **Changelog**
 
+# v1.1.0
+
+## what's new
+
+minor changes and updates!
+
+this project is still in an early phase.
+If you like this project, feel free to push the **[Star ⭐️]** button and click **[Watch 👁]** to stay updated.
+If there is any bug, please use the Issue function and let me know.
+If you have any further questions, suggestions or requests, please use the discussion function.
+
+## changelog
+
+- add gpio check (check for duplicates and set initial values if gpio=0)
+- set initial log level to "Debug"
+- update mathieucarbou/AsyncTCP @ 3.3.1
+- update mathieucarbou/ESPAsyncWebServer @ 3.4.3
+
+---
+
 # v1.0.0
 
 ## what's new

diff --git a/include/config.h b/include/config.h
@@ -4,7 +4,7 @@
 /*-------------------------------------------------------------------------------
 General Configuration
 --------------------------------------------------------------------------------*/
-#define VERSION "v1.1.0" // internal program version
+#define VERSION "v1.1.1" // internal program version
 
 #define WIFI_RECONNECT 30000 // Delay between wifi reconnection tries
 #define MQTT_RECONNECT 10000 // Delay between mqtt reconnection tries

diff --git a/include/gzip_css.h b/include/gzip_css.h
diff --git a/include/gzip_js.h b/include/gzip_js.h
diff --git a/include/gzip_login_html.h b/include/gzip_login_html.h
@@ -1,2 +1,2 @@
-const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0xbc, 0xa7, 0x61, 0x67, 0x02, 0xff, 0x75, 0x53, 0xb1, 0x92, 0xd4, 0x30, 0x0c, 0xed, 0xef, 0x2b, 0x84, 0x5b, 0xc8, 0xe6, 0x38, 0x1a, 0x8a, 0x64, 0x1b, 0xb8, 0x2b, 0x18, 0x66, 0xd8, 0x19, 0x8e, 0x82, 0x52, 0x89, 0xb5, 0xb1, 0xe7, 0x1c, 0xdb, 0xd8, 0xca, 0xee, 0x85, 0xaf, 0xc7, 0x59, 0x27, 0x24, 0x3b, 0x2c, 0x95, 0xe5, 0xf7, 0xe4, 0x27, 0xe9, 0x69, 0x5c, 0xbd, 0xf9, 0xfc, 0xed, 0xd3, 0xf3, 0xcf, 0xc3, 0x23, 0x28, 0xee, 0xcd, 0xfe, 0xae, 0x9a, 0x0e, 0x30, 0x68, 0xbb, 0x5a, 0x90, 0x15, 0x20, 0x75, 0xa8, 0x85, 0xe1, 0x90, 0x22, 0x64, 0x2c, 0x58, 0x51, 0x4f, 0xb5, 0x90, 0x18, 0x5e, 0xc4, 0xfe, 0x0e, 0xa0, 0x52, 0x84, 0x72, 0x0a, 0x52, 0xd8, 0x13, 0x23, 0xb4, 0x0a, 0x43, 0x24, 0xae, 0xc5, 0x8f, 0xe7, 0xa7, 0xe2, 0xa3, 0x80, 0x72, 0x4b, 0x5a, 0x9c, 0x1e, 0xa3, 0xf7, 0x86, 0x8a, 0xde, 0x35, 0x3a, 0x1d, 0x67, 0x6a, 0x8a, 0x04, 0x14, 0x2d, 0x7a, 0x6c, 0x0c, 0x09, 0x68, 0x9d, 0x65, 0xb2, 0x49, 0x60, 0xa4, 0xb8, 0x3e, 0x67, 0xcd, 0x86, 0xf6, 0x8f, 0xdf, 0x0f, 0x1f, 0x1e, 0x8a, 0x2f, 0x18, 0x9c, 0xd1, 0x47, 0xae, 0xca, 0x8c, 0xe6, 0x0c, 0xa3, 0xed, 0x0b, 0x04, 0x32, 0xb5, 0xd0, 0x49, 0x42, 0x80, 0x0a, 0x74, 0xac, 0x45, 0x79, 0xc4, 0xd3, 0x74, 0xdf, 0xc5, 0x53, 0x27, 0x20, 0xea, 0xdf, 0x14, 0x53, 0x03, 0x76, 0x14, 0xc0, 0xa3, 0x4f, 0xbd, 0xe8, 0x1e, 0x3b, 0x2a, 0x13, 0xf9, 0xf6, 0xb5, 0x37, 0x6b, 0xb9, 0x55, 0x2c, 0xf2, 0x68, 0x28, 0x2a, 0x22, 0x5e, 0x9e, 0x30, 0xbd, 0x72, 0xd9, 0xc6, 0xb8, 0x94, 0xe8, 0x51, 0xdb, 0xdd, 0xe5, 0x7e, 0x63, 0xd6, 0x93, 0xa6, 0xb3, 0x77, 0x81, 0x37, 0x73, 0x9d, 0xb5, 0x64, 0x55, 0x4b, 0x4a, 0x7d, 0xa5, 0xf1, 0xa7, 0xcb, 0x3b, 0xd0, 0x56, 0xb3, 0x46, 0x53, 0xc4, 0x16, 0x0d, 0xd5, 0xef, 0x77, 0xf7, 0xb3, 0x58, 0x55, 0x2e, 0xfe, 0x56, 0x8d, 0x93, 0xe3, 0xac, 0x2f, 0x53, 0xaa, 0xeb, 0xc0, 0x79, 0xb2, 0x19, 0x49, 0x18, 0x06, 0xd6, 0xed, 0x62, 0xc6, 0x05, 0x51, 0x0f, 0xff, 0xf8, 0x95, 0xa0, 0x95, 0xf7, 0xfb, 0x83, 0x21, 0x8c, 0x04, 0x5f, 0x5d, 0xa7, 0x6d, 0x55, 0xfa, 0x0d, 0x77, 0x74, 0xa1, 0x07, 0x6c, 0x59, 0x3b, 0x9b, 0x3c, 0x34, 0x53, 0x82, 0x80, 0x34, 0x96, 0x72, 0xb2, 0x16, 0xde, 0x45, 0x16, 0x6b, 0x72, 0x4a, 0xd7, 0xd6, 0x0f, 0xbc, 0xb1, 0x47, 0xcc, 0xd3, 0x0f, 0x91, 0xc2, 0x14, 0x09, 0xf0, 0x06, 0x5b, 0x52, 0xce, 0x48, 0x0a, 0x19, 0x86, 0x8c, 0x07, 0xfa, 0x35, 0xe8, 0x40, 0x72, 0xf1, 0x6e, 0x2b, 0xb8, 0x01, 0x60, 0x16, 0xf7, 0x18, 0xe3, 0xd9, 0x05, 0x29, 0xae, 0xb8, 0x5c, 0xec, 0x36, 0x77, 0x55, 0xf8, 0x76, 0xca, 0x7f, 0x7a, 0x68, 0x06, 0x66, 0x67, 0xe7, 0xc2, 0x71, 0x68, 0x7a, 0x9d, 0xa6, 0x9e, 0xbd, 0xca, 0xdc, 0xc6, 0xb0, 0x72, 0x72, 0xec, 0xef, 0x32, 0xca, 0xab, 0x6d, 0x54, 0x65, 0x5e, 0x58, 0x5e, 0x68, 0xde, 0x63, 0xda, 0xc5, 0xe5, 0xbb, 0xfd, 0x01, 0x84, 0x40, 0xe8, 0x4e, 0x7f, 0x03, 0x00, 0x00};
+const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0x3f, 0x00, 0x63, 0x67, 0x02, 0xff, 0x75, 0x53, 0xb1, 0x92, 0xd4, 0x30, 0x0c, 0xed, 0xef, 0x2b, 0x84, 0x5b, 0xc8, 0xe6, 0x38, 0x1a, 0x8a, 0x64, 0x1b, 0xb8, 0x2b, 0x18, 0x66, 0xd8, 0x19, 0x8e, 0x82, 0x52, 0x89, 0xb5, 0xb1, 0xe7, 0x1c, 0xdb, 0xd8, 0xca, 0xee, 0x85, 0xaf, 0xc7, 0x59, 0x27, 0x24, 0x3b, 0x2c, 0x95, 0xe5, 0xf7, 0xe4, 0x27, 0xe9, 0x69, 0x5c, 0xbd, 0xf9, 0xfc, 0xed, 0xd3, 0xf3, 0xcf, 0xc3, 0x23, 0x28, 0xee, 0xcd, 0xfe, 0xae, 0x9a, 0x0e, 0x30, 0x68, 0xbb, 0x5a, 0x90, 0x15, 0x20, 0x75, 0xa8, 0x85, 0xe1, 0x90, 0x22, 0x64, 0x2c, 0x58, 0x51, 0x4f, 0xb5, 0x90, 0x18, 0x5e, 0xc4, 0xfe, 0x0e, 0xa0, 0x52, 0x84, 0x72, 0x0a, 0x52, 0xd8, 0x13, 0x23, 0xb4, 0x0a, 0x43, 0x24, 0xae, 0xc5, 0x8f, 0xe7, 0xa7, 0xe2, 0xa3, 0x80, 0x72, 0x4b, 0x5a, 0x9c, 0x1e, 0xa3, 0xf7, 0x86, 0x8a, 0xde, 0x35, 0x3a, 0x1d, 0x67, 0x6a, 0x8a, 0x04, 0x14, 0x2d, 0x7a, 0x6c, 0x0c, 0x09, 0x68, 0x9d, 0x65, 0xb2, 0x49, 0x60, 0xa4, 0xb8, 0x3e, 0x67, 0xcd, 0x86, 0xf6, 0x8f, 0xdf, 0x0f, 0x1f, 0x1e, 0x8a, 0x2f, 0x18, 0x9c, 0xd1, 0x47, 0xae, 0xca, 0x8c, 0xe6, 0x0c, 0xa3, 0xed, 0x0b, 0x04, 0x32, 0xb5, 0xd0, 0x49, 0x42, 0x80, 0x0a, 0x74, 0xac, 0x45, 0x79, 0xc4, 0xd3, 0x74, 0xdf, 0xc5, 0x53, 0x27, 0x20, 0xea, 0xdf, 0x14, 0x53, 0x03, 0x76, 0x14, 0xc0, 0xa3, 0x4f, 0xbd, 0xe8, 0x1e, 0x3b, 0x2a, 0x13, 0xf9, 0xf6, 0xb5, 0x37, 0x6b, 0xb9, 0x55, 0x2c, 0xf2, 0x68, 0x28, 0x2a, 0x22, 0x5e, 0x9e, 0x30, 0xbd, 0x72, 0xd9, 0xc6, 0xb8, 0x94, 0xe8, 0x51, 0xdb, 0xdd, 0xe5, 0x7e, 0x63, 0xd6, 0x93, 0xa6, 0xb3, 0x77, 0x81, 0x37, 0x73, 0x9d, 0xb5, 0x64, 0x55, 0x4b, 0x4a, 0x7d, 0xa5, 0xf1, 0xa7, 0xcb, 0x3b, 0xd0, 0x56, 0xb3, 0x46, 0x53, 0xc4, 0x16, 0x0d, 0xd5, 0xef, 0x77, 0xf7, 0xb3, 0x58, 0x55, 0x2e, 0xfe, 0x56, 0x8d, 0x93, 0xe3, 0xac, 0x2f, 0x53, 0xaa, 0xeb, 0xc0, 0x79, 0xb2, 0x19, 0x49, 0x18, 0x06, 0xd6, 0xed, 0x62, 0xc6, 0x05, 0x51, 0x0f, 0xff, 0xf8, 0x95, 0xa0, 0x95, 0xf7, 0xfb, 0x83, 0x21, 0x8c, 0x04, 0x5f, 0x5d, 0xa7, 0x6d, 0x55, 0xfa, 0x0d, 0x77, 0x74, 0xa1, 0x07, 0x6c, 0x59, 0x3b, 0x9b, 0x3c, 0x34, 0x53, 0x82, 0x80, 0x34, 0x96, 0x72, 0xb2, 0x16, 0xde, 0x45, 0x16, 0x6b, 0x72, 0x4a, 0xd7, 0xd6, 0x0f, 0xbc, 0xb1, 0x47, 0xcc, 0xd3, 0x0f, 0x91, 0xc2, 0x14, 0x09, 0xf0, 0x06, 0x5b, 0x52, 0xce, 0x48, 0x0a, 0x19, 0x86, 0x8c, 0x07, 0xfa, 0x35, 0xe8, 0x40, 0x72, 0xf1, 0x6e, 0x2b, 0xb8, 0x01, 0x60, 0x16, 0xf7, 0x18, 0xe3, 0xd9, 0x05, 0x29, 0xae, 0xb8, 0x5c, 0xec, 0x36, 0x77, 0x55, 0xf8, 0x76, 0xca, 0x7f, 0x7a, 0x68, 0x06, 0x66, 0x67, 0xe7, 0xc2, 0x71, 0x68, 0x7a, 0x9d, 0xa6, 0x9e, 0xbd, 0xca, 0xdc, 0xc6, 0xb0, 0x72, 0x72, 0xec, 0xef, 0x32, 0xca, 0xab, 0x6d, 0x54, 0x65, 0x5e, 0x58, 0x5e, 0x68, 0xde, 0x63, 0xda, 0xc5, 0xe5, 0xbb, 0xfd, 0x01, 0x84, 0x40, 0xe8, 0x4e, 0x7f, 0x03, 0x00, 0x00};
 const unsigned int gzip_login_html_size = 448;
diff --git a/include/gzip_m_html.h b/include/gzip_m_html.h
diff --git a/include/gzip_ntp_html.h b/include/gzip_ntp_html.h
diff --git a/lib/JaroliftController/cc1101.cpp b/lib/JaroliftController/cc1101.cpp
@@ -94,7 +94,10 @@ void CC1101::setGPIO(int8_t sck, int8_t miso, int8_t mosi, int8_t ss, int8_t gdo
  *
  * check if CC1101 is connected
  */
-bool CC1101::connected(void) { return readStatusReg(CC1101_MARCSTATE) != 0; }
+bool CC1101::connected(void) {
+  uint8_t marcstate = readStatusReg(CC1101_MARCSTATE);
+  return (marcstate != 0 && marcstate != 0xff);
+}
 
 /**
  * wakeUp

diff --git a/...sp32_jarolift_controller_flash_v1.1.0.bin → ...sp32_jarolift_controller_flash_v1.1.1.bin b/...sp32_jarolift_controller_flash_v1.1.0.bin → ...sp32_jarolift_controller_flash_v1.1.1.bin
diff --git a/...jarolift_controller_ota_update_v1.1.0.bin → ...jarolift_controller_ota_update_v1.1.1.bin b/...jarolift_controller_ota_update_v1.1.0.bin → ...jarolift_controller_ota_update_v1.1.1.bin