update

Author: lefty01

code/include/common.h

@@ -14,6 +14,7 @@
 extern const char* PROG_VERSION;
 
 #ifdef MQTT_USE_SSL
+#include <WiFiClientSecure.h>
 extern WiFiClientSecure wifiClient;
 #else
 extern WiFiClient wifiClient;

code/platformio.ini

@@ -8,6 +8,7 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
+
 [platformio]
 default_envs = esp32dev_mqttssl
 
@@ -18,14 +19,13 @@ lib_deps_builtin =
 lib_deps_ext = 
 	https://github.com/lefty01/ESP32-HUB75-MatrixPanel-I2S-DMA
 	https://github.com/lefty01/BH1750
-	;claws/BH1750@^1.3.0
 	gmag11/[email protected]
 	adafruit/Adafruit GFX Library @ ^1.10.6
 	adafruit/Adafruit BusIO @ ^1.7.2
 	knolleary/PubSubClient @ ^2.8
 	bblanchon/ArduinoJson @ ^6.18.0
 	adafruit/Adafruit TSL2591 Library @ ^1.3.1
-	adafruit/Adafruit BMP280 [email protected]
+;	adafruit/Adafruit BMP280 [email protected]
 	adafruit/Adafruit Unified Sensor@^1.1.4
 
 [env:esp32dev]
@@ -38,12 +38,13 @@ check_skip_packages = yes
 lib_deps = 
 	${common_env_data.lib_deps_builtin}
 	${common_env_data.lib_deps_ext}
-
+	adafruit/Adafruit BMP280 Library@^2.6.8
 build_flags = 
 	-DPANEL_SIZE_64_x_64=1
 
 [env:esp32dev_mqttssl]
-platform = espressif32
+platform = https://github.com/pioarduino/platform-espressif32/
+;;platform = espressif32
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
@@ -52,11 +53,10 @@ check_skip_packages = yes
 lib_deps = 
 	${common_env_data.lib_deps_builtin}
 	${common_env_data.lib_deps_ext}
-
+	adafruit/Adafruit BMP280 Library@^2.6.8
 build_flags = 
 	-DMQTT_USE_SSL=1
 	-DPANEL_SIZE_64_x_64=1
 	-DMATRIX_HEIGHT=64
 	-DMATRIX_WIDTH=64
 	-DLIGHT_SENSOR_BH1750=1
-;	-DLIGHT_SENSOR_TSL2591=1

code/src/buzzer.cpp

@@ -3,8 +3,10 @@
 
 void buzzer_init() {
     pinMode(BUZZER_PIN, OUTPUT);
-    ledcSetup(BUZZER_PWM_CHANNEL, 1000, BUZZER_PWM_RESOLUTION);
-    ledcAttachPin(BUZZER_PIN, BUZZER_PWM_CHANNEL);
+    //ledcSetup(BUZZER_PWM_CHANNEL, 1000, BUZZER_PWM_RESOLUTION);
+    //ledcAttachPin(BUZZER_PIN, BUZZER_PWM_CHANNEL);
+
+    ledcAttach(BUZZER_PIN, 1000, BUZZER_PWM_RESOLUTION);
 }
 
 void buzzer_tone(double freq, uint32_t durationMs) {

code/src/digit.cpp

@@ -14,16 +14,16 @@ const uint16_t height = PANEL_HEIGHT-1;
 const uint16_t width = PANEL_WIDTH-1;
 
 byte digitBits[] = {
-  B11111100, // 0 ABCDEF--
-  B01100000, // 1 -BC-----
-  B11011010, // 2 AB-DE-G-
-  B11110010, // 3 ABCD--G-
-  B01100110, // 4 -BC--FG-
-  B10110110, // 5 A-CD-FG-
-  B10111110, // 6 A-CDEFG-
-  B11100000, // 7 ABC-----
-  B11111110, // 8 ABCDEFG-
-  B11110110, // 9 ABCD_FG-
+  0b11111100, // 0 ABCDEF--
+  0b01100000, // 1 -BC-----
+  0b11011010, // 2 AB-DE-G-
+  0b11110010, // 3 ABCD--G-
+  0b01100110, // 4 -BC--FG-
+  0b10110110, // 5 A-CD-FG-
+  0b10111110, // 6 A-CDEFG-
+  0b11100000, // 7 ABC-----
+  0b11111110, // 8 ABCDEFG-
+  0b11110110, // 9 ABCD_FG-
 };
 
 //byte sunBitmap[] {

code/src/main.cpp

@@ -44,6 +44,13 @@ unsigned long lastWeatherUpdate;
 //Just a blinking heart to show the main thread is still alive...
 bool blinkOn;
 
+//#define CONFIG_FREERTOS_NUMBER_OF_CORES 1
+esp_task_wdt_config_t twdt_config = {
+    .timeout_ms = WDT_TIMEOUT,
+    .idle_core_mask = (1 << CONFIG_FREERTOS_NUMBER_OF_CORES) - 1,    // Bitmask of all cores
+    .trigger_panic = true,
+};
+
 void setup(){
   display_init();
 
@@ -97,8 +104,12 @@ void setup(){
   delay(500);
 
   logStatusMessage("Setting up watchdog...");
-  esp_task_wdt_init(WDT_TIMEOUT, true);
-  esp_task_wdt_add(NULL);
+
+  esp_task_wdt_deinit(); //wdt is enabled by default, so we need to deinit it first
+  esp_task_wdt_init(&twdt_config); //enable panic so ESP32 restarts
+  esp_task_wdt_add(NULL); //add current thread to WDT watch
+  // deprecated: esp_task_wdt_init(WDT_TIMEOUT, true);
+  // deprecated: esp_task_wdt_add(NULL);
   logStatusMessage("Woof!");
 
   //logStatusMessage(WiFi.localIP().toString());

code/src/mqtt.cpp

@@ -77,8 +77,8 @@ void reconnect() {
     if ( status != WL_CONNECTED) {
       WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
       while (WiFi.status() != WL_CONNECTED) {
-        delay(500);
-        Serial.print(".");
+	delay(500);
+	Serial.print(".");
       }
       Serial.println("Connected to AP");
       logStatusMessage("MQTT lost");