From 366a02850279aa1ee25d1988415badbe6baa6264 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sun, 26 Dec 2021 09:05:35 -0800 Subject: [PATCH 1/3] Remove unused comments. --- src/mesh/http/WebServer.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/mesh/http/WebServer.cpp b/src/mesh/http/WebServer.cpp index 500af5107..e450c566b 100644 --- a/src/mesh/http/WebServer.cpp +++ b/src/mesh/http/WebServer.cpp @@ -114,22 +114,12 @@ static void taskCreateCert(void *parameter) if (createCertResult != 0) { DEBUG_MSG("Creating the certificate failed\n"); - // Serial.printf("Creating the certificate failed. Error Code = 0x%02X, check SSLCert.hpp for details", - // createCertResult); - // while (true) - // delay(500); } else { DEBUG_MSG("Creating the certificate was successful\n"); DEBUG_MSG("Created Private Key: %d Bytes\n", cert->getPKLength()); - // for (int i = 0; i < cert->getPKLength(); i++) - // Serial.print(cert->getPKData()[i], HEX); - // Serial.println(); DEBUG_MSG("Created Certificate: %d Bytes\n", cert->getCertLength()); - // for (int i = 0; i < cert->getCertLength(); i++) - // Serial.print(cert->getCertData()[i], HEX); - // Serial.println(); prefs.putBytes("PK", (uint8_t *)cert->getPKData(), cert->getPKLength()); prefs.putBytes("cert", (uint8_t *)cert->getCertData(), cert->getCertLength()); From 072707c77e996f92e9f362caceddd30598fa95e2 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sun, 26 Dec 2021 09:08:49 -0800 Subject: [PATCH 2/3] Update esp8266-oled-ssd1306 --- platformio.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 8d4f3a883..a3ab41283 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -;default_envs = tbeam +default_envs = tbeam ;default_envs = tbeam0.7 ;default_envs = heltec-v2.0 ;default_envs = tlora-v1 @@ -21,7 +21,7 @@ ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here ;default_envs = rak4631 ;default_envs = rak4630 -default_envs = meshtastic-diy-v1 +;default_envs = meshtastic-diy-v1 [common] ; common is not currently used @@ -68,7 +68,7 @@ debug_tool = jlink ; monitor adapter_khz 10000 lib_deps = - https://github.com/meshtastic/esp8266-oled-ssd1306.git#35d796226b853b0c0ff818b2f1aa3d35e7296a96 ; ESP8266_SSD1306 + https://github.com/meshtastic/esp8266-oled-ssd1306.git#03c0015fc4621f7a76390fa6846de41380f1f9f9 ; ESP8266_SSD1306 https://github.com/meshtastic/OneButton.git#3bcba9492d01e2a8a86f46700ab16f96dd2cf1f5 ; OneButton library for non-blocking button debounce 1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib https://github.com/meshtastic/arduino-fsm.git @@ -124,7 +124,7 @@ platform_packages = framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276 ; leave this commented out to avoid breaking Windows -upload_port = /dev/ttyUSB0 +;upload_port = /dev/ttyUSB0 ;monitor_port = /dev/ttyUSB0 ;upload_port = /dev/cu.SLAB_USBtoUART From 638d43a34121a351f58c1c4818b962d502eface9 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Tue, 28 Dec 2021 16:40:53 -0800 Subject: [PATCH 3/3] Roll back oled update --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index a3ab41283..1d35ddeb9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -68,7 +68,7 @@ debug_tool = jlink ; monitor adapter_khz 10000 lib_deps = - https://github.com/meshtastic/esp8266-oled-ssd1306.git#03c0015fc4621f7a76390fa6846de41380f1f9f9 ; ESP8266_SSD1306 + https://github.com/meshtastic/esp8266-oled-ssd1306.git#35d796226b853b0c0ff818b2f1aa3d35e7296a96 ; ESP8266_SSD1306 https://github.com/meshtastic/OneButton.git#3bcba9492d01e2a8a86f46700ab16f96dd2cf1f5 ; OneButton library for non-blocking button debounce 1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib https://github.com/meshtastic/arduino-fsm.git