diff --git a/src/ButtonThread.cpp b/src/ButtonThread.cpp index 7522fa776..238359952 100644 --- a/src/ButtonThread.cpp +++ b/src/ButtonThread.cpp @@ -1,5 +1,5 @@ -#include "../userPrefs.h" #include "ButtonThread.h" +#include "../userPrefs.h" #include "configuration.h" #if !MESHTASTIC_EXCLUDE_GPS #include "GPS.h" @@ -41,7 +41,7 @@ ButtonThread::ButtonThread() : OSThread("Button") } #elif defined(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 #ifdef USERPREFS_BUTTON_PIN int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 79535c08a..165cf6fb8 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -270,7 +270,7 @@ NodeDB::NodeDB() config.position.fixed_position = true; #endif } -#endif +#endif saveToDisk(saveWhat); } diff --git a/userPrefs.h b/userPrefs.h index ff97f0a8d..c105e6b52 100644 --- a/userPrefs.h +++ b/userPrefs.h @@ -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 */ -//#define USERPREFS_FIXED_GPS -//#define USERPREFS_FIXED_GPS_LAT 48.85873920 -//#define USERPREFS_FIXED_GPS_LON 2.294508368 -//#define USERPREFS_FIXED_GPS_ALT 0 +// #define USERPREFS_FIXED_GPS +// #define USERPREFS_FIXED_GPS_LAT 48.85873920 +// #define USERPREFS_FIXED_GPS_LON 2.294508368 +// #define USERPREFS_FIXED_GPS_ALT 0 /* * Set Fixed Bluetooth paring code */ -//#define USERPREFS_FIXED_BLUETOOTH 121212 +// #define USERPREFS_FIXED_BLUETOOTH 121212 /* * Will overwrite BUTTON_PIN if set */ -//#define USERPREFS_BUTTON_PIN 36 +// #define USERPREFS_BUTTON_PIN 36 #endif \ No newline at end of file