pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-08 05:31:25 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Don't use a static decleration in a header file (#4944)

Browse Source 
* Don't use a static decleration in a header file

* Actually add the rest of the commit
This commit is contained in:
Jonathan Bennett 2024-10-04 12:06:02 -05:00 committed by GitHub
parent e7cfadacd8
commit 4db0c75c8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@ -120,6 +120,8 @@ float tcxoVoltage = SX126X_DIO3_TCXO_VOLTAGE; // if TCXO is optional, put this h
using namespace concurrency; using namespace concurrency;
volatile static const char slipstreamTZString[] = USERPREFS_TZ_STRING;
// We always create a screen object, but we only init it if we find the hardware // We always create a screen object, but we only init it if we find the hardware
graphics::Screen *screen = nullptr; graphics::Screen *screen = nullptr;
@ -707,15 +709,15 @@ void setup()
// setup TZ prior to time actions. // setup TZ prior to time actions.
#if !MESHTASTIC_EXCLUDE_TZ #if !MESHTASTIC_EXCLUDE_TZ
LOG_DEBUG("Using compiled/slipstreamed %s\n", USERPREFS_TZ_STRING); // important, removing this clobbers our magic string LOG_DEBUG("Using compiled/slipstreamed %s\n", slipstreamTZString); // important, removing this clobbers our magic string
if (*config.device.tzdef && config.device.tzdef[0] != 0) { if (*config.device.tzdef && config.device.tzdef[0] != 0) {
LOG_DEBUG("Saved TZ: %s \n", config.device.tzdef); LOG_DEBUG("Saved TZ: %s \n", config.device.tzdef);
setenv("TZ", config.device.tzdef, 1); setenv("TZ", config.device.tzdef, 1);
} else { } else {
if (strncmp((const char *)USERPREFS_TZ_STRING, "tzpl", 4) == 0) { if (strncmp((const char *)slipstreamTZString, "tzpl", 4) == 0) {
setenv("TZ", "GMT0", 1); setenv("TZ", "GMT0", 1);
} else { } else {
setenv("TZ", (const char *)USERPREFS_TZ_STRING, 1); setenv("TZ", (const char *)slipstreamTZString, 1);
} }
} }
tzset(); tzset();

6
userPrefs.h
View File

@ -1,6 +1,10 @@
#ifndef _USERPREFS_ #ifndef _USERPREFS_
#define _USERPREFS_ #define _USERPREFS_
volatile static const char USERPREFS_TZ_STRING[] = "tzplaceholder ";
// Slipstream values:
#define USERPREFS_TZ_STRING "tzplaceholder "
// Uncomment and modify to set device defaults // Uncomment and modify to set device defaults
// #define USERPREFS_EVENT_MODE 1 // #define USERPREFS_EVENT_MODE 1