thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Merge pull request #145 from thooge/master 

Fix warning and FRAM code on system page
This commit is contained in:
Norbert Walter 2025-01-21 22:43:35 +01:00 committed by GitHub
parent 535f1cd7c4 464d6879a3
commit 988e7ccbc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/obp60task/OBP60Extensions.h
View File

@ -10,6 +10,7 @@
// FRAM address reservations 32kB: 0x0000 - 0x7FFF
// 0x0000 - 0x03ff: single variables
#define FRAM_PAGE_NO 0x0002
#define FRAM_SYSTEM_MODE 0x009
// Voltage page
#define FRAM_VOLTAGE_AVG 0x000A
#define FRAM_VOLTAGE_TREND 0x000B

7
lib/obp60task/PageSystem.cpp
View File

@ -3,7 +3,7 @@
#include "Pagedata.h"
#include "OBP60Extensions.h"
#include "images/logo64.xbm"
#include <esp_clk.h>
#include <esp32/clk.h>
#define STRINGIZE_IMPL(x) #x
#define STRINGIZE(x) STRINGIZE_IMPL(x)
@ -31,6 +31,9 @@ public:
PageSystem(CommonData &common){
commonData = &common;
common.logger->logDebug(GwLog::LOG,"Instantiate PageSystem");
if (hasFRAM) {
mode = fram.read(FRAM_SYSTEM_MODE);
}
chipid = ESP.getEfuseMac();
simulation = common.config->getBool(common.config->useSimuData);
buzzer_mode = common.config->getString(common.config->buzzerMode);
@ -60,7 +63,7 @@ public:
} else {
mode = 'N';
}
if (hasFRAM) fram.write(FRAM_VOLTAGE_MODE, mode);
if (hasFRAM) fram.write(FRAM_SYSTEM_MODE, mode);
return 0;
}
// grab cursor keys to disable page navigation

27
lib/obp60task/PageWhite.cpp
View File

@ -2,15 +2,34 @@
#include "Pagedata.h"
#include "OBP60Extensions.h"
#include "MFD_OBP60_400x300_sw.h" // MFD with logo
#include "Logo_OBP_400x300_sw.h" // OBP Logo
class PageWhite : public Page
{
public:
char mode = 'W'; // display mode (W)hite | (L)ogo | (M)FD logo
public:
PageWhite(CommonData &common){
commonData = &common;
common.logger->logDebug(GwLog::LOG,"Instantiate PageWhite");
}
virtual int handleKey(int key) {
// Change display mode
if (key == 1) {
if (mode == 'W') {
mode = 'L';
} else if (mode == 'L') {
mode = 'M';
} else {
mode = 'W';
}
return 0;
}
return key;
}
virtual void displayPage(PageData &pageData){
GwConfigHandler *config = commonData->config;
GwLog *logger = commonData->logger;
@ -36,6 +55,12 @@ class PageWhite : public Page
// Set display in partial refresh mode
getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
if (mode == 'L') {
getdisplay().drawBitmap(0, 0, gImage_Logo_OBP_400x300_sw, getdisplay().width(), getdisplay().height(), commonData->fgcolor);
} else if (mode == 'M') {
getdisplay().drawBitmap(0, 0, gImage_MFD_OBP60_400x300_sw, getdisplay().width(), getdisplay().height(), commonData->fgcolor);
}
// Update display
getdisplay().nextPage(); // Partial update (fast)

20
lib/obp60task/config.json
View File

@ -938,7 +938,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1198,7 +1198,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1456,7 +1456,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1710,7 +1710,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1961,7 +1961,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2209,7 +2209,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2454,7 +2454,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2696,7 +2696,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2935,7 +2935,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -3171,7 +3171,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",

20
lib/obp60task/config_obp40.json
View File

@ -953,7 +953,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1213,7 +1213,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1471,7 +1471,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1725,7 +1725,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -1976,7 +1976,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2224,7 +2224,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2469,7 +2469,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2711,7 +2711,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -2950,7 +2950,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",
@ -3186,7 +3186,7 @@
"ThreeValues",
"TwoValues",
"Voltage",
"White",
"WhitePage",
"Wind",
"WindRose",
"WindRoseFlex",

4
lib/obp60task/gen_set.py
View File

@ -28,7 +28,7 @@ no_of_fields_per_page = {
"ThreeValues": 3,
"TwoValues": 2,
"Voltage": 0,
"White": 0,
"WhitePage": 0,
"WindRose": 0,
"WindRoseFlex": 6,
# "SixValues" : 6,
@ -127,4 +127,4 @@ json_output = json.dumps(output, indent=4)
#print(json_output[1:-1])
# print omitting first line containing [ of JSON array
print(json_output[1:])
# print(",")
# print(",")