From 6637b804007018589448a1f75c9ebe0a0b466a01 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Thu, 2 Jan 2025 19:55:39 +0100 Subject: [PATCH 1/4] Some small typo fixes --- lib/obp60task/OBP60Hardware.h | 4 ++-- lib/obp60task/OBPSensorTask.cpp | 2 +- lib/obp60task/obp60task.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/obp60task/OBP60Hardware.h b/lib/obp60task/OBP60Hardware.h index 4782b4c..292068b 100644 --- a/lib/obp60task/OBP60Hardware.h +++ b/lib/obp60task/OBP60Hardware.h @@ -54,7 +54,7 @@ #define TONE3 3500 // 3500Hz #define TONE4 4000 // 4000Hz // Analog Input - #define OBP_ANALOG0 4 // Analog input for voltage power supplay + #define OBP_ANALOG0 4 // Analog input for voltage power supply #define MIN_VOLTAGE 10.0 // Min voltage for under voltage detection (then goto deep sleep) #define POWER_FAIL_TIME 2 // in [ms] Accept min voltage until 2 x 1ms (for under voltage gaps by engine start) // Touch buttons @@ -69,7 +69,7 @@ #define NUM_FLASH_LED 1 // Number of flash LED #define OBP_FLASH_LED 7 // GPIO port // Backlight LEDs (6x WS2812B) - #define NUM_BACKLIGHT_LED 6 // Numebr of Backlight LEDs + #define NUM_BACKLIGHT_LED 6 // Number of Backlight LEDs #define OBP_BACKLIGHT_LED 15 // GPIO port // Power Rail #define OBP_POWER_50 5 // 5.0V power rail diff --git a/lib/obp60task/OBPSensorTask.cpp b/lib/obp60task/OBPSensorTask.cpp index 9466463..e2faa5d 100644 --- a/lib/obp60task/OBPSensorTask.cpp +++ b/lib/obp60task/OBPSensorTask.cpp @@ -456,7 +456,7 @@ void sensorTask(void *param){ } } - // Send supplay voltage value all 1s + // Send supply voltage value all 1s if(millis() > starttime5 + 1000 && String(powsensor1) == "off"){ starttime5 = millis(); sensors.batteryVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20; // Vin = 1/20 diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index dca6202..85f9a07 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -246,7 +246,7 @@ void underVoltageDetection(GwApi *api, CommonData &common){ // Read settings float vslope = uint(api->getConfig()->getConfigItem(api->getConfig()->vSlope,true)->asFloat()); float voffset = uint(api->getConfig()->getConfigItem(api->getConfig()->vOffset,true)->asFloat()); - // Read supplay voltage + // Read supply voltage float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20; // V = 1/20 * Vin actVoltage = actVoltage * vslope + voffset; if(actVoltage < MIN_VOLTAGE){ From b142470c1de8aa4d48868d8091951fca3abec2c1 Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Sat, 4 Jan 2025 22:24:33 +0100 Subject: [PATCH 2/4] Docu --- lib/obp60task/OBP60Extensions.cpp | 1 + lib/obp60task/obp60task.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/obp60task/OBP60Extensions.cpp b/lib/obp60task/OBP60Extensions.cpp index c288bd8..bae2602 100644 --- a/lib/obp60task/OBP60Extensions.cpp +++ b/lib/obp60task/OBP60Extensions.cpp @@ -472,6 +472,7 @@ void generatorGraphic(uint x, uint y, int pcolor, int bcolor){ } // Function to handle HTTP image request +// http://192.168.15.1/api/user/OBP60Task/screenshot void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUMBER], AsyncWebServerRequest *request) { GwLog *logger = api->getLogger(); diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index 85f9a07..73bd9fe 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -394,6 +394,8 @@ void OBP60Task(GwApi *api){ } } + // Display screenshot handler for HTTP request + // http://192.168.15.1/api/user/OBP60Task/screenshot api->registerRequestHandler("screenshot", [api, &pageNumber, pages](AsyncWebServerRequest *request) { doImageRequest(api, &pageNumber, pages, request); }); From a8d10804290125dd6b61f1f1e1145355aae64c42 Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Sat, 4 Jan 2025 22:26:15 +0100 Subject: [PATCH 3/4] Delete FastLED includes --- lib/obp60task/OBP60Extensions.cpp | 5 +---- lib/obp60task/OBP60Extensions.h | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/obp60task/OBP60Extensions.cpp b/lib/obp60task/OBP60Extensions.cpp index bae2602..26e5c2b 100644 --- a/lib/obp60task/OBP60Extensions.cpp +++ b/lib/obp60task/OBP60Extensions.cpp @@ -1,9 +1,6 @@ #ifdef BOARD_OBP60S3 #include -#define FASTLED_ALL_PINS_HARDWARE_SPI -#define FASTLED_ESP32_SPI_BUS FSPI -#define FASTLED_ESP32_FLASH_LOCK 1 #include // Driver for PCF8574 output modul from Horter #include // I2C #include // Driver for DS1388 RTC @@ -468,7 +465,7 @@ void generatorGraphic(uint x, uint y, int pcolor, int bcolor){ getdisplay().setTextColor(pcolor); getdisplay().setFont(&Ubuntu_Bold32pt7b); getdisplay().setCursor(xb-22, yb+20); - getdisplay().print("G"); + getdisplay().print("G");Function to handle HTTP image request } // Function to handle HTTP image request diff --git a/lib/obp60task/OBP60Extensions.h b/lib/obp60task/OBP60Extensions.h index 79695ef..5ab4caa 100644 --- a/lib/obp60task/OBP60Extensions.h +++ b/lib/obp60task/OBP60Extensions.h @@ -3,9 +3,6 @@ #include #include "OBP60Hardware.h" -#define FASTLED_ALL_PINS_HARDWARE_SPI -#define FASTLED_ESP32_SPI_BUS FSPI -#define FASTLED_ESP32_FLASH_LOCK 1 #include "LedSpiTask.h" #include // E-paper lib V2 #include // I2C FRAM From 83f3e6f24bc2d666dd2f9f4e1dff5257441512f0 Mon Sep 17 00:00:00 2001 From: norbert-walter Date: Sat, 4 Jan 2025 22:32:19 +0100 Subject: [PATCH 4/4] Fix error --- lib/obp60task/OBP60Extensions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/obp60task/OBP60Extensions.cpp b/lib/obp60task/OBP60Extensions.cpp index 26e5c2b..2fa4bc6 100644 --- a/lib/obp60task/OBP60Extensions.cpp +++ b/lib/obp60task/OBP60Extensions.cpp @@ -465,7 +465,7 @@ void generatorGraphic(uint x, uint y, int pcolor, int bcolor){ getdisplay().setTextColor(pcolor); getdisplay().setFont(&Ubuntu_Bold32pt7b); getdisplay().setCursor(xb-22, yb+20); - getdisplay().print("G");Function to handle HTTP image request + getdisplay().print("G"); } // Function to handle HTTP image request