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

Compare commits

base: thooge:d963153b35caaf71ac8f9e7368ce1f760b972d70
Branches Tags
thooge:master
thooge:extended
thooge:system
thooge:scripts
thooge:precision
thooge:barograph
thooge:r20250120a-obp40
thooge:r20250116a-demo
..
compare: thooge:1e7368db4d0a3668bcc9ed7d0fdd27c80ac7c430
Branches Tags
thooge:extended
thooge:system
thooge:scripts
thooge:precision
thooge:master
thooge:barograph
thooge:r20250120a-obp40
thooge:r20250116a-demo

No commits in common. "d963153b35caaf71ac8f9e7368ce1f760b972d70" and "1e7368db4d0a3668bcc9ed7d0fdd27c80ac7c430" have entirely different histories.
d963153b35 ... 1e7368db4d

6 changed files with 21 additions and 3831 deletions
Show Stats Expand all files Collapse all files

14
extra_script.py
View File

@ -526,17 +526,3 @@ env.Append(
) )
#script does not run on clean yet - maybe in the future #script does not run on clean yet - maybe in the future
env.AddPostAction("clean",cleangenerated) env.AddPostAction("clean",cleangenerated)
#look for extra task scripts and include them here
for taskdir in userTaskDirs:
script = os.path.join(taskdir, "extra_task.py")
if os.path.isfile(script):
taskname = os.path.basename(os.path.normpath(taskdir))
print("#extra task script for '{}'".format(taskname))
with open(script) as fh:
try:
code = compile(fh.read(), taskname, 'exec')
except SyntaxError:
print("#ERROR: script does not compile")
continue
exec(code)

23
lib/obp60task/PageWhite.cpp
View File

@ -2,14 +2,8 @@
#include "Pagedata.h" #include "Pagedata.h"
#include "OBP60Extensions.h" #include "OBP60Extensions.h"
#include "MFD_OBP60_400x300_sw.h" // MFD with logo
#include "images/OBP_400x300.xbm" // OBP Logo #include "Logo_OBP_400x300_sw.h" // OBP Logo
#ifdef BOARD_OBP60S3
#include "images/OBP60_400x300.xbm" // MFD with logo
#endif
#ifdef BOARD_OBP40S3
#include "images/OBP40_400x300.xbm" // MFD with logo
#endif
class PageWhite : public Page class PageWhite : public Page
{ {
@ -67,21 +61,20 @@ public:
} }
if (mode == 'L') { if (mode == 'L') {
getdisplay().drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor); getdisplay().drawBitmap(0, 0, gImage_Logo_OBP_400x300_sw, getdisplay().width(), getdisplay().height(), commonData->fgcolor);
} else if (mode == 'M') { } else if (mode == 'M') {
#ifdef BOARD_OBP60S3 getdisplay().drawBitmap(0, 0, gImage_MFD_OBP60_400x300_sw, getdisplay().width(), getdisplay().height(), commonData->fgcolor);
getdisplay().drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
#endif
#ifdef BOARD_OBP40S3
getdisplay().drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
#endif
} }
// Update display
// getdisplay().nextPage();
int ret = PAGE_UPDATE; int ret = PAGE_UPDATE;
if (mode == 'W') { if (mode == 'W') {
//getdisplay().hibernate();
ret |= PAGE_HIBERNATE; ret |= PAGE_HIBERNATE;
} }
return ret; return ret;
}; };
}; };

1253
lib/obp60task/images/OBP40_400x300.xbm
View File

File diff suppressed because it is too large Load Diff

1253
lib/obp60task/images/OBP60_400x300.xbm
View File

File diff suppressed because it is too large Load Diff

1253
lib/obp60task/images/OBP_400x300.xbm
View File

File diff suppressed because it is too large Load Diff

56
lib/obp60task/obp60task.cpp
View File

@ -421,7 +421,7 @@ void OBP60Task(GwApi *api){
#endif #endif
#ifdef DISPLAY_GDEY042T81 #ifdef DISPLAY_GDEY042T81
getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse getdisplay().init(115200, true, 2, false); // Use this for Waveshare boards with "clever" reset circuit, 2ms reset pulse
#else #else
getdisplay().init(115200); // Init for normal displays getdisplay().init(115200); // Init for normal displays
#endif #endif
@ -747,22 +747,12 @@ void OBP60Task(GwApi *api){
starttime1 = millis(); starttime1 = millis();
starttime2 = millis(); starttime2 = millis();
getdisplay().setFullWindow(); // Set full update getdisplay().setFullWindow(); // Set full update
if(fastrefresh == "true"){ getdisplay().nextPage();
getdisplay().nextPage(); // Full update if(fastrefresh == "false"){
}
else{
getdisplay().fillScreen(commonData.fgcolor); // Clear display getdisplay().fillScreen(commonData.fgcolor); // Clear display
#ifdef DISPLAY_GDEY042T81
getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
#else
getdisplay().init(115200); // Init for normal displays
#endif
getdisplay().firstPage(); // Full update
getdisplay().nextPage(); // Full update getdisplay().nextPage(); // Full update
// getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update getdisplay().fillScreen(commonData.bgcolor); // Clear display
// getdisplay().fillScreen(commonData.bgcolor); // Clear display getdisplay().nextPage(); // Full update
// getdisplay().nextPage(); // Partial update
// getdisplay().nextPage(); // Partial update
} }
delayedDisplayUpdate = false; delayedDisplayUpdate = false;
} }
@ -774,22 +764,12 @@ void OBP60Task(GwApi *api){
starttime2 = millis(); starttime2 = millis();
LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh first 5 min"); LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh first 5 min");
getdisplay().setFullWindow(); // Set full update getdisplay().setFullWindow(); // Set full update
if(fastrefresh == "true"){ getdisplay().nextPage();
getdisplay().nextPage(); // Full update if(fastrefresh == "false"){
}
else{
getdisplay().fillScreen(commonData.fgcolor); // Clear display getdisplay().fillScreen(commonData.fgcolor); // Clear display
#ifdef DISPLAY_GDEY042T81
getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
#else
getdisplay().init(115200); // Init for normal displays
#endif
getdisplay().firstPage(); // Full update
getdisplay().nextPage(); // Full update getdisplay().nextPage(); // Full update
// getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update getdisplay().fillScreen(commonData.bgcolor); // Clear display
// getdisplay().fillScreen(commonData.bgcolor); // Clear display getdisplay().nextPage(); // Full update
// getdisplay().nextPage(); // Partial update
// getdisplay().nextPage(); // Partial update
} }
} }
@ -798,22 +778,12 @@ void OBP60Task(GwApi *api){
starttime2 = millis(); starttime2 = millis();
LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh"); LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh");
getdisplay().setFullWindow(); // Set full update getdisplay().setFullWindow(); // Set full update
if(fastrefresh == "true"){ getdisplay().nextPage();
getdisplay().nextPage(); // Full update if(fastrefresh == "false"){
}
else{
getdisplay().fillScreen(commonData.fgcolor); // Clear display getdisplay().fillScreen(commonData.fgcolor); // Clear display
#ifdef DISPLAY_GDEY042T81
getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
#else
getdisplay().init(115200); // Init for normal displays
#endif
getdisplay().firstPage(); // Full update
getdisplay().nextPage(); // Full update getdisplay().nextPage(); // Full update
// getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update getdisplay().fillScreen(commonData.bgcolor); // Clear display
// getdisplay().fillScreen(commonData.bgcolor); // Clear display getdisplay().nextPage(); // Full update
// getdisplay().nextPage(); // Partial update
// getdisplay().nextPage(); // Partial update
} }
} }