From c4d32eba7416954d6db8b372a3f59434e5fa27d8 Mon Sep 17 00:00:00 2001 From: liamcottle Date: Tue, 8 Apr 2025 23:17:22 +1200 Subject: [PATCH] remove unused variables --- examples/companion_radio/UITask.cpp | 6 ++---- examples/companion_radio/UITask.h | 2 -- examples/simple_repeater/UITask.cpp | 3 +-- examples/simple_repeater/UITask.h | 1 - examples/simple_room_server/UITask.cpp | 3 +-- examples/simple_room_server/UITask.h | 1 - 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/examples/companion_radio/UITask.cpp b/examples/companion_radio/UITask.cpp index cfe08cf7..2d2e95a6 100644 --- a/examples/companion_radio/UITask.cpp +++ b/examples/companion_radio/UITask.cpp @@ -30,8 +30,6 @@ void UITask::begin(DisplayDriver* display, const char* node_name, const char* bu _auto_off = millis() + AUTO_OFF_MILLIS; clearMsgPreview(); _node_name = node_name; - _build_date = build_date; - _firmware_version = firmware_version; _pin_code = pin_code; if (_display != NULL) { _display->turnOn(); @@ -39,14 +37,14 @@ void UITask::begin(DisplayDriver* display, const char* node_name, const char* bu // 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 *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); + sprintf(_version_info, "%s (%s)", version, build_date); } void UITask::msgRead(int msgcount) { diff --git a/examples/companion_radio/UITask.h b/examples/companion_radio/UITask.h index 8fe0145e..4cba1fca 100644 --- a/examples/companion_radio/UITask.h +++ b/examples/companion_radio/UITask.h @@ -11,8 +11,6 @@ class UITask { bool _connected; uint32_t _pin_code; const char* _node_name; - const char* _build_date; - const char* _firmware_version; char _version_info[32]; char _origin[62]; char _msg[80]; diff --git a/examples/simple_repeater/UITask.cpp b/examples/simple_repeater/UITask.cpp index 4597a344..6fff675e 100644 --- a/examples/simple_repeater/UITask.cpp +++ b/examples/simple_repeater/UITask.cpp @@ -24,7 +24,6 @@ void UITask::begin(const char* node_name, const char* build_date, const char* fi _prevBtnState = HIGH; _auto_off = millis() + AUTO_OFF_MILLIS; _node_name = node_name; - _build_date = build_date; _display->turnOn(); // strip off dash and commit hash by changing dash to null terminator @@ -36,7 +35,7 @@ void UITask::begin(const char* node_name, const char* build_date, const char* fi } // v1.2.3 (1 Jan 2025) - sprintf(_version_info, "%s (%s)", version, _build_date); + sprintf(_version_info, "%s (%s)", version, build_date); } void UITask::renderCurrScreen() { diff --git a/examples/simple_repeater/UITask.h b/examples/simple_repeater/UITask.h index e087b86c..13005957 100644 --- a/examples/simple_repeater/UITask.h +++ b/examples/simple_repeater/UITask.h @@ -7,7 +7,6 @@ class UITask { unsigned long _next_read, _next_refresh, _auto_off; int _prevBtnState; const char* _node_name; - const char* _build_date; char _version_info[32]; void renderCurrScreen(); diff --git a/examples/simple_room_server/UITask.cpp b/examples/simple_room_server/UITask.cpp index eb2e4a00..eb7be78e 100644 --- a/examples/simple_room_server/UITask.cpp +++ b/examples/simple_room_server/UITask.cpp @@ -24,7 +24,6 @@ void UITask::begin(const char* node_name, const char* build_date, const char* fi _prevBtnState = HIGH; _auto_off = millis() + AUTO_OFF_MILLIS; _node_name = node_name; - _build_date = build_date; _display->turnOn(); // strip off dash and commit hash by changing dash to null terminator @@ -36,7 +35,7 @@ void UITask::begin(const char* node_name, const char* build_date, const char* fi } // v1.2.3 (1 Jan 2025) - sprintf(_version_info, "%s (%s)", version, _build_date); + sprintf(_version_info, "%s (%s)", version, build_date); } void UITask::renderCurrScreen() { diff --git a/examples/simple_room_server/UITask.h b/examples/simple_room_server/UITask.h index e087b86c..13005957 100644 --- a/examples/simple_room_server/UITask.h +++ b/examples/simple_room_server/UITask.h @@ -7,7 +7,6 @@ class UITask { unsigned long _next_read, _next_refresh, _auto_off; int _prevBtnState; const char* _node_name; - const char* _build_date; char _version_info[32]; void renderCurrScreen();