fix logging and device counter was not stored #29 #33

Author: dewenni

changeNew.md

@@ -9,3 +9,5 @@ this is a minor bugfix version
 
 - [IMPROVE] improved Login Form Feedback for Incorrect Credentials
 - [IMPROVE] add build script to automatically update version in github-pages
+- [BUGFIX] fix missing log entries from jarolift-controller library #29 #33
+- [BUGFIX] device counter was not saved after editing in WebUI settings #33

include/config.h

@@ -4,7 +4,7 @@
 /*-------------------------------------------------------------------------------
 General Configuration
 --------------------------------------------------------------------------------*/
-#define VERSION "v1.6.2" // internal program version
+#define VERSION "v1.6.3" // internal program version
 
 #define WIFI_RECONNECT 30000 // Delay between wifi reconnection tries
 #define MQTT_RECONNECT 10000 // Delay between mqtt reconnection tries

include/gzip_css.h

@@ -1,2 +1,2 @@
-const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0x97, 0xf9, 0xae, 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;
+const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0xac, 0xde, 0xb1, 0x67, 0x02, 0xff, 0x8d, 0x55, 0xcd, 0x8e, 0xdb, 0x36, 0x10, 0xbe, 0xfb, 0x29, 0x26, 0x3c, 0xc9, 0x88, 0x2d, 0x35, 0xc9, 0xa5, 0xf0, 0x4a, 0x06, 0xd2, 0xae, 0x03, 0xb4, 0x08, 0x90, 0x05, 0x76, 0x5b, 0xa0, 0x47, 0x5a, 0x1c, 0x5b, 0x6c, 0x28, 0x52, 0x21, 0x29, 0x3b, 0xce, 0xc2, 0xef, 0x9e, 0xa1, 0x64, 0x59, 0x92, 0x57, 0x5b, 0x54, 0x17, 0x71, 0x66, 0xbe, 0xf9, 0x1f, 0x0e, 0xd3, 0x37, 0xf7, 0x5f, 0x7e, 0x7f, 0xfa, 0xe7, 0x61, 0x03, 0x85, 0x2f, 0xd5, 0x7a, 0x96, 0x86, 0x1f, 0x28, 0xae, 0xf7, 0x19, 0x43, 0xcd, 0x40, 0x48, 0x9b, 0x31, 0xe5, 0x2d, 0x9d, 0xb8, 0xe7, 0x4b, 0x5f, 0x60, 0x89, 0x19, 0x13, 0xdc, 0x7e, 0x65, 0xeb, 0x19, 0x40, 0x5a, 0x20, 0x17, 0xe1, 0x40, 0xc7, 0x12, 0x3d, 0x87, 0xbc, 0xe0, 0xd6, 0xa1, 0xcf, 0xd8, 0x5f, 0x4f, 0x9f, 0x96, 0xbf, 0x32, 0x48, 0x86, 0x42, 0xcd, 0x83, 0x32, 0xaf, 0x2a, 0x85, 0xcb, 0xd2, 0x6c, 0x25, 0xfd, 0x8e, 0xb8, 0x5d, 0x12, 0x63, 0x99, 0xf3, 0x8a, 0x6f, 0x15, 0x32, 0xc8, 0x8d, 0xf6, 0xa8, 0xc9, 0xc0, 0x09, 0x5d, 0xaf, 0xee, 0xa5, 0x57, 0xb8, 0xde, 0x3c, 0x3e, 0x7c, 0x78, 0xbf, 0xfc, 0x93, 0x5b, 0xa3, 0xe4, 0xce, 0xa7, 0x49, 0xcb, 0x6d, 0x11, 0x4a, 0xea, 0xaf, 0x60, 0x51, 0x65, 0x4c, 0x92, 0x09, 0x06, 0x85, 0xc5, 0x5d, 0xc6, 0x92, 0x1d, 0x3f, 0x04, 0x3a, 0x76, 0x87, 0x3d, 0x03, 0x27, 0x7f, 0xa0, 0xa3, 0x00, 0xf4, 0x89, 0x81, 0x3f, 0x55, 0x14, 0x8b, 0x2c, 0xf9, 0x1e, 0x13, 0x12, 0xbe, 0xfd, 0x5e, 0xaa, 0xde, 0x5d, 0x6f, 0xcc, 0xf9, 0x93, 0x42, 0x57, 0x20, 0xfa, 0x4e, 0xc5, 0xe3, 0x77, 0x9f, 0xe4, 0xce, 0x75, 0x2e, 0x4a, 0x2e, 0x75, 0xdc, 0xd0, 0x13, 0xb9, 0x1e, 0x24, 0x1e, 0x2b, 0x63, 0xfd, 0x20, 0xaf, 0xa3, 0x14, 0xbe, 0xc8, 0x04, 0x52, 0x5c, 0x94, 0x7e, 0x20, 0x16, 0x20, 0xb5, 0xf4, 0x92, 0xab, 0xa5, 0xcb, 0xb9, 0xc2, 0xec, 0x5d, 0xfc, 0xcb, 0xc5, 0x58, 0x9a, 0x74, 0xf5, 0x4d, 0xb7, 0x46, 0x9c, 0x2e, 0xf6, 0x05, 0x41, 0xcd, 0x1e, 0x4c, 0x85, 0xba, 0xe5, 0x10, 0x8f, 0x5b, 0x2f, 0xf3, 0xae, 0x18, 0x0d, 0xa7, 0x78, 0xff, 0xa2, 0x5e, 0xc4, 0xea, 0xe5, 0xd5, 0xfa, 0x41, 0x21, 0x77, 0x08, 0x9f, 0xcd, 0x5e, 0xea, 0x34, 0xa9, 0x06, 0xb2, 0x9d, 0xb1, 0x25, 0x48, 0x41, 0x9d, 0x0f, 0xb2, 0x4f, 0x44, 0xb1, 0x5e, 0x4a, 0x72, 0xa9, 0xab, 0xda, 0x0f, 0x18, 0xd0, 0x80, 0x6b, 0x87, 0x36, 0xa4, 0xcd, 0x46, 0x92, 0xbe, 0x6a, 0x63, 0x7e, 0x5b, 0xa0, 0x69, 0x9d, 0x4a, 0xf1, 0x1c, 0x0b, 0xa3, 0x04, 0xda, 0x16, 0x02, 0x2f, 0x31, 0x16, 0xbf, 0xd5, 0xd2, 0xa2, 0xe8, 0xca, 0xfe, 0x9f, 0xa1, 0x55, 0xdc, 0xb9, 0xa3, 0xb1, 0x62, 0x2a, 0xb4, 0x69, 0x59, 0x1b, 0xde, 0xb4, 0x6c, 0x14, 0xde, 0x34, 0xe4, 0x95, 0xe8, 0xb6, 0xb5, 0xf7, 0x46, 0x5f, 0x1c, 0xbb, 0x7a, 0x5b, 0x4a, 0xcf, 0xd6, 0x97, 0x06, 0xb4, 0xb2, 0x41, 0x17, 0x92, 0xd0, 0x86, 0x6b, 0x87, 0x93, 0x51, 0x8b, 0xd3, 0xa4, 0x9d, 0x82, 0xf5, 0xac, 0x25, 0x5d, 0x6e, 0x65, 0xe5, 0x3b, 0xf0, 0xae, 0xd6, 0xb9, 0x97, 0xe4, 0x88, 0xae, 0xe2, 0xdf, 0x5c, 0x49, 0xba, 0xbb, 0x44, 0x45, 0xe1, 0x0a, 0xcf, 0xe1, 0xf9, 0xea, 0xe1, 0xc0, 0x2d, 0xa0, 0xa2, 0x1b, 0xad, 0x3d, 0x64, 0x20, 0x4c, 0x5e, 0x87, 0x63, 0xbc, 0x47, 0xbf, 0x69, 0xb9, 0xbf, 0x9d, 0xfe, 0x10, 0x8d, 0x56, 0x2c, 0xc5, 0xfc, 0xee, 0xaa, 0x27, 0x77, 0x10, 0x5d, 0xf4, 0x86, 0xe6, 0x5a, 0x41, 0x03, 0x3f, 0x04, 0xa7, 0x63, 0x19, 0x74, 0xae, 0x62, 0x8b, 0xa5, 0x39, 0xe0, 0x47, 0xef, 0xad, 0xa4, 0x9c, 0x31, 0x62, 0xdc, 0x4a, 0xbe, 0x94, 0xba, 0x51, 0x62, 0x03, 0x3f, 0x00, 0x67, 0x52, 0xa2, 0x11, 0x9d, 0xb6, 0x43, 0xc9, 0xbd, 0x66, 0x64, 0x01, 0xcc, 0xdb, 0x1a, 0x6f, 0x8c, 0xcd, 0x6e, 0x4f, 0xe7, 0xd9, 0xe5, 0xd0, 0xe5, 0x7e, 0x45, 0xdc, 0x16, 0x61, 0x70, 0x13, 0xe6, 0x3d, 0x88, 0x0b, 0xb1, 0x39, 0x10, 0xe4, 0xb3, 0x74, 0x74, 0xb9, 0xd1, 0x46, 0x5d, 0x4f, 0x17, 0x7d, 0x0b, 0x22, 0x3c, 0xbc, 0xa8, 0x53, 0xc3, 0x8a, 0x2b, 0xdb, 0xfc, 0xef, 0x71, 0xc7, 0x6b, 0xe5, 0x23, 0x8a, 0x75, 0x00, 0xd9, 0xa1, 0xcf, 0x8b, 0x88, 0x25, 0x8d, 0x5f, 0xb2, 0x37, 0x2e, 0x01, 0xad, 0x98, 0xc2, 0x88, 0x15, 0xb0, 0x87, 0x2f, 0x8f, 0x4f, 0x6c, 0x31, 0x92, 0x85, 0x4d, 0xb1, 0x02, 0x8d, 0x47, 0x08, 0xe1, 0xde, 0x53, 0x3b, 0x22, 0x5f, 0x48, 0x37, 0x1f, 0xa3, 0xc2, 0x62, 0x41, 0xeb, 0x56, 0xf0, 0x0c, 0x1f, 0xf3, 0x1c, 0x2b, 0x4f, 0xc6, 0xc2, 0x66, 0x96, 0x79, 0x33, 0x2b, 0xc9, 0xbf, 0x2e, 0x6c, 0xd1, 0xf3, 0x50, 0xe9, 0x3c, 0x1f, 0x59, 0x88, 0xe9, 0x31, 0xd0, 0x51, 0x64, 0xd1, 0x55, 0x46, 0x3b, 0x9c, 0x43, 0xb6, 0x86, 0x8e, 0x88, 0x83, 0x7a, 0x34, 0x9f, 0x54, 0x68, 0xa7, 0x90, 0xc0, 0xe3, 0x94, 0x06, 0xd3, 0xe3, 0x6a, 0x8a, 0xc8, 0xb9, 0xf9, 0x0b, 0x04, 0xc0, 0x51, 0x6a, 0x61, 0x8e, 0xb1, 0x32, 0x6d, 0x98, 0x71, 0xd8, 0xc1, 0x34, 0xbb, 0x2c, 0x61, 0x77, 0x37, 0xd8, 0xc9, 0xd1, 0x09, 0xdf, 0xf8, 0x4e, 0x3c, 0xd3, 0x7e, 0xa0, 0xd4, 0xaf, 0x7b, 0x68, 0x01, 0xcd, 0x04, 0xad, 0x9a, 0xf7, 0x2e, 0xee, 0xd8, 0x8d, 0x02, 0x15, 0xe0, 0xee, 0xff, 0x59, 0xbb, 0xee, 0x84, 0xb1, 0xb5, 0x8e, 0xfd, 0x9a, 0xb5, 0xf3, 0x88, 0xbe, 0x2d, 0x37, 0x65, 0x4c, 0x13, 0x11, 0xa1, 0xb5, 0xc6, 0x36, 0xf5, 0xa3, 0x27, 0xc5, 0x19, 0x85, 0x71, 0xc3, 0x89, 0xd8, 0x26, 0xfc, 0x56, 0xe4, 0xb2, 0x45, 0x0c, 0xac, 0x77, 0x9e, 0xd2, 0xa4, 0x5f, 0x13, 0xb4, 0x6f, 0x9a, 0x17, 0x85, 0x5e, 0x85, 0xe6, 0xe1, 0xff, 0x09, 0x37, 0x87, 0x5f, 0x56, 0x09, 0x08, 0x00, 0x00};
+const unsigned int gzip_login_html_size = 839;

include/gzip_js.h

@@ -6,14 +6,6 @@
 #define MAX_LOG_LINES 200 // max log lines
 #define MAX_LOG_ENTRY 128 // max length of one entry
 
-// #ifndef MY_LOGGER_SUPPORT
-// #define MY_LOGGER_SUPPORT
-// #define ESP_LOGE(tag, format, ...) esp_log_write(ESP_LOG_ERROR, tag, "E (APP-%s): " format "\n", tag, ##__VA_ARGS__)
-// #define ESP_LOGI(tag, format, ...) esp_log_write(ESP_LOG_INFO, tag, "I (APP-%s): " format "\n", tag, ##__VA_ARGS__)
-// #define ESP_LOGW(tag, format, ...) esp_log_write(ESP_LOG_WARN, tag, "W (APP-%s): " format "\n", tag, ##__VA_ARGS__)
-// #define ESP_LOGD(tag, format, ...) esp_log_write(ESP_LOG_DEBUG, tag, "D (APP-%s): " format "\n", tag, ##__VA_ARGS__)
-// #endif
-
 struct s_logdata {
   int lastLine;
   char buffer[MAX_LOG_LINES][MAX_LOG_ENTRY];

include/gzip_login_html.h

@@ -1,4 +1,3 @@
-#include "esp_log.h"
 #include <JaroliftController.h>
 #include <nvs.h>
 #include <nvs_flash.h>
@@ -10,7 +9,7 @@
 
 #define BITS_SIZE 8
 
-static const char *TAG = "JARO-CTRL"; // LOG TAG
+static const char *TAG = "JARO-LIB"; // LOG TAG
 
 // RX variables and defines
 #define debounce 200 // Ignoring short pulses in reception... no clue if required and if it makes sense ;)
@@ -116,7 +115,23 @@ void JaroliftController::devcnt_handler(bool do_increment) {
 // ####################################################################
 void JaroliftController::setDeviceCounter(uint16_t newDevCnt) {
   devcnt = newDevCnt;
-  devcnt_handler(false);
+
+  nvs_handle_t nvs_handle;
+  esp_err_t err = nvs_open(NVS_NAMESPACE, NVS_READWRITE, &nvs_handle);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "Failed to open NVS");
+    return;
+  }
+
+  nvs_set_u16(nvs_handle, "devcnt", devcnt);
+  nvs_commit(nvs_handle);
+
+  ESP_LOGD(TAG, "stored Device Counter: %i", devcnt);
+  ESP_LOGW(TAG, "Wstored Device Counter: %i", devcnt);
+  ESP_LOGE(TAG, "Estored Device Counter: %i", devcnt);
+
+  nvs_close(nvs_handle);
+
   delay(100);
 }
 
@@ -145,6 +160,7 @@ uint16_t JaroliftController::getDeviceCounter() {
   }
 
   nvs_close(nvs_handle);
+
   return devcnt;
 }
 
@@ -361,7 +377,7 @@ uint8_t JaroliftController::getRssi() {
     value = rssi / 2;
     value = value + 74;
   }
-  ESP_LOGD(TAG, " CC1101_RSSI: %i", value);
+  ESP_LOGD(TAG, "CC1101_RSSI: %i", value);
   return value;
 } // void ReadRSSI
 
@@ -684,6 +700,8 @@ void JaroliftController::cmdUpDown(uint8_t channel) {
 
 void JaroliftController::begin() {
 
+  ESP_LOGI(TAG, "start CC1101 setup");
+
   EEPROM.begin(sizeof(devcnt));
   devcnt = getDeviceCounter();
 
@@ -773,11 +791,9 @@ void JaroliftController::loop() {
       steadycnt = 0;
     }
 
-    ESP_LOGD(TAG, "(INF1) serial: 0x%08lx, rx_function: 0x%x, rx_disc_low: %d, rx_disc_high: %d", rx_serial, rx_function, rx_disc_low[0],
-            rx_disc_h);
+    ESP_LOGD(TAG, "(INF1) serial: 0x%08lx, rx_function: 0x%x, rx_disc_low: %d, rx_disc_high: %d", rx_serial, rx_function, rx_disc_low[0], rx_disc_h);
     ESP_LOGD(TAG, "(INF2) RSSI: %d, counter: %d", getRssi(), rx_disc_low[3]);
-    ESP_LOGD(TAG, "(INF3) rx_device_key_lsb: 0x%08x, rx_device_key_msb: 0x%08x, decoded: 0x%08lx", rx_device_key_lsb, rx_device_key_msb,
-            decoded);
+    ESP_LOGD(TAG, "(INF3) rx_device_key_lsb: 0x%08x, rx_device_key_msb: 0x%08x, decoded: 0x%08lx", rx_device_key_lsb, rx_device_key_msb, decoded);
 
     rx_disc_h = 0;
     rx_hopcode = 0;

include/gzip_m_html.h

@@ -18,38 +18,15 @@ class JaroliftController {
   void ReadRSSI();
   void enterrx();
   void entertx();
-  void (*messageCallback)(esp_log_level_t level, const char *msg) = nullptr;
-
-  static constexpr size_t MAX_MESSAGE_LENGTH = 256;
-
-  void sendMsg(esp_log_level_t level, const char *format, ...) {
-    if (messageCallback != nullptr) {
-      // Puffer für die formatierte Nachricht
-      char buffer[MAX_MESSAGE_LENGTH];
-
-      // Variadische Argumente verarbeiten
-      va_list args;
-      va_start(args, format);
-      vsnprintf(buffer, MAX_MESSAGE_LENGTH, format, args);
-      va_end(args);
-
-      // Callback mit der formatierten Nachricht aufrufen
-      messageCallback(level, buffer);
-    } else {
-      // Fallback, wenn kein Callback gesetzt ist
-      printf("[Fallback Handler]: Callback not set.\n");
-    }
-  }
 
+ 
 public:
   void begin();
 
   void loop();
 
   void setGPIO(int8_t sck, int8_t miso, int8_t mosi, int8_t ss, int8_t gdo0, int8_t gdo2);
 
-  void setMessageCallback(void (*callback)(esp_log_level_t level, const char *msg)) { messageCallback = callback; }
-
   bool getCC1101State(void);
 
   uint8_t getRssi();