thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-24 03:03:06 +01:00
Code Releases Activity

Switch to current webserver version and some small fixes

Browse Source
This commit is contained in:
Thomas Hooge
2025-08-26 17:17:48 +02:00
parent 8e72537286
commit 22e3ca3875
9 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gwupdate/GwUpdate.cpp
View File

@@ -79,7 +79,7 @@ GwUpdate::GwUpdate(GwLog *log, GwWebServer *webserver, PasswordChecker ckr)
}
if (!param->hasError())
{
AsyncWebParameter *hash=request->getParam("_hash");
const AsyncWebParameter *hash=request->getParam("_hash");
if (! hash){
hash=request->getParam("_hash",true);
}
@@ -141,4 +141,4 @@ GwUpdate::GwUpdate(GwLog *log, GwWebServer *webserver, PasswordChecker ckr)
}
}
});
}
}

2
lib/gwwebserver/GwWebServer.cpp
View File

@@ -27,7 +27,7 @@ void sendEmbeddedFile(String name,String contentType,AsyncWebServerRequest *requ
std::map<String,EmbeddedFile*>::iterator it=embeddedFiles.find(name);
if (it != embeddedFiles.end()){
EmbeddedFile* found=it->second;
AsyncWebServerResponse *response=request->beginResponse_P(200,contentType,found->start,found->len);
AsyncWebServerResponse *response=request->beginResponse(200, contentType, found->start, found->len);
response->addHeader(F("Content-Encoding"), F("gzip"));
request->send(response);
}

2
lib/obp60task/LedSpiTask.cpp
View File

@@ -254,7 +254,7 @@ void handleSpiLeds(void *param){
void createSpiLedTask(LedTaskData *param) {
TaskHandle_t xHandle = NULL;
GwLog *logger = shared->api->getLogger();
GwLog *logger = param->api->getLogger();
esp_err_t err = xTaskCreate(handleSpiLeds, "handleLeds", configMINIMAL_STACK_SIZE + 2048, param, 3, &xHandle);
if (err != pdPASS) {
logger->logDebug(GwLog::ERROR, "Failed to create spiled task! (err=%d)", err);

2
lib/obp60task/OBP60Extensions.cpp
View File

@@ -922,7 +922,7 @@ void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUM
createPBM(fb, &imageBuffer, GxEPD_WIDTH, GxEPD_HEIGHT);
}
AsyncWebServerResponse *response = request->beginResponse_P(200, mimetype, (const uint8_t*)imageBuffer.data(), imageBuffer.size());
AsyncWebServerResponse *response = request->beginResponse(200, mimetype, (const uint8_t*)imageBuffer.data(), imageBuffer.size());
response->addHeader("Content-Disposition", "inline; filename=" + filename);
request->send(response);

2
lib/obp60task/OBP60Formatter.h
View File

@@ -2,6 +2,8 @@
#ifndef _OBP60FORMATTER_H
#define _OBP60FORMATTER_H
#include "GwApi.h"
#include "Pagedata.h"
#include <unordered_map>
/*

7
lib/obp60task/OBPKeyboardTask.cpp
View File

@@ -2,6 +2,7 @@
#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
#include <Arduino.h>
#include "OBP60Hardware.h"
#include "OBP60Extensions.h" // for buzzer
#include "OBPKeyboardTask.h"
// Global vars
@@ -60,7 +61,7 @@ void initKeys(CommonData &commonData) {
#ifdef HARDWARE_V21
// Keypad functions for original OBP60 hardware
int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) {
int readKeypad(GwLog* logger, uint thSensitivity) {
// Touch sensor values
// 35000 - Not touched
@@ -315,7 +316,11 @@ void keyboardTask(void *param) {
data->logger->logDebug(GwLog::LOG, "Start keyboard task");
while (true) {
#ifdef BOARD_OBP40S3
keycode = readKeypad(data->logger, data->sensitivity, data->use_syspage);
#else
keycode = readKeypad(data->logger, data->sensitivity);
#endif
//send a key event
if (keycode != 0) {
xQueueSend(data->queue, &keycode, 0);

1
lib/obp60task/hbuffer.cpp
View File

@@ -83,5 +83,6 @@ public:
~History() {
}
void *addSeries() {
return nullptr;
}
};

6
lib/obp60task/platformio.ini
View File

@@ -22,14 +22,11 @@ lib_deps =
Wire
SPI
ESP32time
esphome/AsyncTCP-esphome@2.0.1
robtillaart/PCF8574@0.3.9
adafruit/Adafruit Unified Sensor @ 1.1.13
blemasle/MCP23017@2.0.0
adafruit/Adafruit BusIO@1.5.0
adafruit/Adafruit GFX Library@1.11.9
#zinggjm/GxEPD2@1.5.8
#https://github.com/ZinggJM/GxEPD2
https://github.com/thooge/GxEPD2
sstaub/Ticker@4.4.0
adafruit/Adafruit BMP280 Library@2.6.2
@@ -73,14 +70,11 @@ lib_deps =
Wire
SPI
ESP32time
esphome/AsyncTCP-esphome@2.0.1
robtillaart/PCF8574@0.3.9
adafruit/Adafruit Unified Sensor @ 1.1.13
blemasle/MCP23017@2.0.0
adafruit/Adafruit BusIO@1.5.0
adafruit/Adafruit GFX Library@1.11.9
#zinggjm/GxEPD2@1.5.8
#https://github.com/ZinggJM/GxEPD2
https://github.com/thooge/GxEPD2
sstaub/Ticker@4.4.0
adafruit/Adafruit BMP280 Library@2.6.2

4
platformio.ini
View File

@@ -21,8 +21,8 @@ lib_deps =
ttlappalainen/NMEA2000-library @ 4.22.0
ttlappalainen/NMEA0183 @ 1.10.1
ArduinoJson @ 6.18.5
AsyncTCP-esphome @ 2.0.1
ottowinter/ESPAsyncWebServer-esphome@2.0.1
ESP32Async/AsyncTCP @ 3.4.7
ESP32Async/ESPAsyncWebServer @ 3.8.0
FS
Preferences
ESPmDNS