DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show firmware version and build date on room server screen

Browse Source
This commit is contained in:
liamcottle
2025-04-08 23:09:55 +12:00
parent 4a51cb98c6
commit bc820ae93e
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/simple_room_server/UITask.cpp
View File

@@ -20,25 +20,34 @@ static const uint8_t meshcore_logo [] PROGMEM = {
0xe3, 0xe3, 0x8f, 0xff, 0x1f, 0xfc, 0x3c, 0x0e, 0x1f, 0xf8, 0xff, 0xf8, 0x70, 0x3c, 0x7f, 0xf8, 0xe3, 0xe3, 0x8f, 0xff, 0x1f, 0xfc, 0x3c, 0x0e, 0x1f, 0xf8, 0xff, 0xf8, 0x70, 0x3c, 0x7f, 0xf8,
}; };
void UITask::begin(const char* node_name, const char* build_date) { void UITask::begin(const char* node_name, const char* build_date, const char* firmware_version) {
_prevBtnState = HIGH; _prevBtnState = HIGH;
_auto_off = millis() + AUTO_OFF_MILLIS; _auto_off = millis() + AUTO_OFF_MILLIS;
_node_name = node_name; _node_name = node_name;
_build_date = build_date; _build_date = build_date;
_display->turnOn(); _display->turnOn();
// strip off dash and commit hash by changing dash to null terminator
// e.g: v1.2.3-abcdef -> v1.2.3
char *version = strdup(firmware_version);
char *dash = strchr(version, '-');
if(dash){
*dash = 0;
}
// v1.2.3 (1 Jan 2025)
sprintf(_version_info, "%s (%s)", version, _build_date);
} }
void UITask::renderCurrScreen() { void UITask::renderCurrScreen() {
char tmp[80];
// render 'home' screen // render 'home' screen
_display->drawXbm(0, 0, meshcore_logo, 128, 13); _display->drawXbm(0, 0, meshcore_logo, 128, 13);
_display->setCursor(0, 20); _display->setCursor(0, 20);
_display->setTextSize(1); _display->setTextSize(1);
_display->print(_node_name); _display->print(_node_name);
sprintf(tmp, "Build: %s", _build_date);
_display->setCursor(0, 32); _display->setCursor(0, 32);
_display->print(tmp); _display->print(_version_info);
_display->setCursor(0, 43); _display->setCursor(0, 43);
_display->print("< Room Server >"); _display->print("< Room Server >");
//_display->printf("freq : %03.2f sf %d\n", _prefs.freq, _prefs.sf); //_display->printf("freq : %03.2f sf %d\n", _prefs.freq, _prefs.sf);

3
examples/simple_room_server/UITask.h
View File

@@ -8,11 +8,12 @@ class UITask {
int _prevBtnState; int _prevBtnState;
const char* _node_name; const char* _node_name;
const char* _build_date; const char* _build_date;
char _version_info[32];
void renderCurrScreen(); void renderCurrScreen();
public: public:
UITask(DisplayDriver& display) : _display(&display) { _next_read = _next_refresh = 0; } UITask(DisplayDriver& display) : _display(&display) { _next_read = _next_refresh = 0; }
void begin(const char* node_name, const char* build_date); void begin(const char* node_name, const char* build_date, const char* firmware_version);
void loop(); void loop();
}; };

2
examples/simple_room_server/main.cpp
View File

@@ -887,7 +887,7 @@ void setup() {
the_mesh.begin(fs); the_mesh.begin(fs);
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE); ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION);
#endif #endif
// send out initial Advertisement to the mesh // send out initial Advertisement to the mesh