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

Merge pull request #183 from liamcottle/dev

Browse Source 
Show version in build info for devices with a screen
This commit is contained in:
ripplebiz
2025-04-08 21:37:45 +10:00
committed by GitHub
parent 348db9b82f c4d32eba74
commit b98668150b
9 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/companion_radio/UITask.cpp
View File

@@ -25,16 +25,26 @@ 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(DisplayDriver* display, const char* node_name, const char* build_date, uint32_t pin_code) { void UITask::begin(DisplayDriver* display, const char* node_name, const char* build_date, const char* firmware_version, uint32_t pin_code) {
_display = display; _display = display;
_auto_off = millis() + AUTO_OFF_MILLIS; _auto_off = millis() + AUTO_OFF_MILLIS;
clearMsgPreview(); clearMsgPreview();
_node_name = node_name; _node_name = node_name;
_build_date = build_date;
_pin_code = pin_code; _pin_code = pin_code;
if (_display != NULL) { if (_display != NULL) {
_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::msgRead(int msgcount) { void UITask::msgRead(int msgcount) {
@@ -91,9 +101,8 @@ void UITask::renderCurrScreen() {
_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);
if (_connected) { if (_connected) {
//_display->printf("freq : %03.2f sf %d\n", _prefs.freq, _prefs.sf); //_display->printf("freq : %03.2f sf %d\n", _prefs.freq, _prefs.sf);

4
examples/companion_radio/UITask.h
View File

@@ -11,7 +11,7 @@ class UITask {
bool _connected; bool _connected;
uint32_t _pin_code; uint32_t _pin_code;
const char* _node_name; const char* _node_name;
const char* _build_date; char _version_info[32];
char _origin[62]; char _origin[62];
char _msg[80]; char _msg[80];
int _msgcount; int _msgcount;
@@ -26,7 +26,7 @@ public:
_next_refresh = 0; _next_refresh = 0;
_connected = false; _connected = false;
} }
void begin(DisplayDriver* display, const char* node_name, const char* build_date, uint32_t pin_code); void begin(DisplayDriver* display, const char* node_name, const char* build_date, const char* firmware_version, uint32_t pin_code);
void setHasConnection(bool connected) { _connected = connected; } void setHasConnection(bool connected) { _connected = connected; }
bool hasDisplay() const { return _display != NULL; } bool hasDisplay() const { return _display != NULL; }

2
examples/companion_radio/main.cpp
View File

@@ -1505,7 +1505,7 @@ void setup() {
#endif #endif
#ifdef HAS_UI #ifdef HAS_UI
ui_task.begin(disp, the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, the_mesh.getBLEPin()); ui_task.begin(disp, the_mesh.getNodeName(), FIRMWARE_BUILD_DATE, FIRMWARE_VERSION, the_mesh.getBLEPin());
#endif #endif
} }

18
examples/simple_repeater/UITask.cpp
View File

@@ -20,25 +20,33 @@ 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;
_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("< Repeater >"); _display->print("< Repeater >");
//_display->printf("freq : %03.2f sf %d\n", _prefs.freq, _prefs.sf); //_display->printf("freq : %03.2f sf %d\n", _prefs.freq, _prefs.sf);

4
examples/simple_repeater/UITask.h
View File

@@ -7,12 +7,12 @@ class UITask {
unsigned long _next_read, _next_refresh, _auto_off; unsigned long _next_read, _next_refresh, _auto_off;
int _prevBtnState; int _prevBtnState;
const char* _node_name; const char* _node_name;
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_repeater/main.cpp
View File

@@ -658,7 +658,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

18
examples/simple_room_server/UITask.cpp
View File

@@ -20,25 +20,33 @@ 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;
_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);

4
examples/simple_room_server/UITask.h
View File

@@ -7,12 +7,12 @@ class UITask {
unsigned long _next_read, _next_refresh, _auto_off; unsigned long _next_read, _next_refresh, _auto_off;
int _prevBtnState; int _prevBtnState;
const char* _node_name; const char* _node_name;
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