pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-10 05:04:42 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Trunk

Browse Source
This commit is contained in:
gjelsoe 2024-11-13 17:14:32 +01:00
parent 72f45b028d
commit 377c07d6b0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ButtonThread.cpp
View File

@ -1,5 +1,5 @@
#include "../userPrefs.h"
#include "ButtonThread.h" #include "ButtonThread.h"
#include "../userPrefs.h"
#include "configuration.h" #include "configuration.h"
#if !MESHTASTIC_EXCLUDE_GPS #if !MESHTASTIC_EXCLUDE_GPS
#include "GPS.h" #include "GPS.h"
@ -41,7 +41,7 @@ ButtonThread::ButtonThread() : OSThread("Button")
} }
#elif defined(BUTTON_PIN) #elif defined(BUTTON_PIN)
#if !defined(USERPREFS_BUTTON_PIN) #if !defined(USERPREFS_BUTTON_PIN)
int pin = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN; // Resolved button pin int pin = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN; // Resolved button pin
#endif #endif
#ifdef USERPREFS_BUTTON_PIN #ifdef USERPREFS_BUTTON_PIN
int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin

2
src/mesh/NodeDB.cpp
View File

@ -270,7 +270,7 @@ NodeDB::NodeDB()
config.position.fixed_position = true; config.position.fixed_position = true;
#endif #endif
} }
#endif #endif
saveToDisk(saveWhat); saveToDisk(saveWhat);
} }

16
userPrefs.h
View File

@ -76,23 +76,23 @@ static unsigned char USERPREFS_ADMIN_KEY[] = {0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24
*/ */
/* /*
* USERPREF_FIXED_GPS_LAT and USERPREF_FIXED_GPS_LON must be set, USERPREF_FIXED_GPS_ALT is optional * USERPREF_FIXED_GPS_LAT and USERPREF_FIXED_GPS_LON must be set, USERPREF_FIXED_GPS_ALT is optional
* *
* Fixed GPS is Eiffel Tower, Paris, France * Fixed GPS is Eiffel Tower, Paris, France
*/ */
//#define USERPREFS_FIXED_GPS // #define USERPREFS_FIXED_GPS
//#define USERPREFS_FIXED_GPS_LAT 48.85873920 // #define USERPREFS_FIXED_GPS_LAT 48.85873920
//#define USERPREFS_FIXED_GPS_LON 2.294508368 // #define USERPREFS_FIXED_GPS_LON 2.294508368
//#define USERPREFS_FIXED_GPS_ALT 0 // #define USERPREFS_FIXED_GPS_ALT 0
/* /*
* Set Fixed Bluetooth paring code * Set Fixed Bluetooth paring code
*/ */
//#define USERPREFS_FIXED_BLUETOOTH 121212 // #define USERPREFS_FIXED_BLUETOOTH 121212
/* /*
* Will overwrite BUTTON_PIN if set * Will overwrite BUTTON_PIN if set
*/ */
//#define USERPREFS_BUTTON_PIN 36 // #define USERPREFS_BUTTON_PIN 36
#endif #endif