mirror of
https://github.com/meshtastic/firmware.git
synced 2025-09-10 05:04:42 +00:00
userPrefs.h
Added FixedGPS Added Fixed Bluetooth PIN
This commit is contained in:
parent
8fcfe7f28b
commit
a42fd96bdb
@ -246,6 +246,32 @@ NodeDB::NodeDB()
|
||||
config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
|
||||
config.position.gps_enabled = 0;
|
||||
}
|
||||
#ifdef USERPREFS_FIXED_GPS
|
||||
if (myNodeInfo.reboot_count == 1) { // Check if First boot ever or after Factory Reset.
|
||||
//LOG_INFO("Setting FIXED GPS");
|
||||
meshtastic_Position FixedGPS = meshtastic_Position_init_default;
|
||||
#ifdef USERPREFS_FIXED_GPS_LAT
|
||||
FixedGPS.latitude_i = (int32_t)(USERPREFS_FIXED_GPS_LAT * 1e7);
|
||||
FixedGPS.has_latitude_i = true;
|
||||
#endif
|
||||
#ifdef USERPREFS_FIXED_GPS_LON
|
||||
FixedGPS.longitude_i = (int32_t)(USERPREFS_FIXED_GPS_LON * 1e7);
|
||||
FixedGPS.has_longitude_i = true;
|
||||
#endif
|
||||
#ifdef USERPREFS_FIXED_GPS_ALT
|
||||
FixedGPS.altitude = USERPREFS_FIXED_GPS_ALT;
|
||||
FixedGPS.has_altitude = true;
|
||||
#endif
|
||||
#if defined(USERPREFS_FIXED_GPS_LAT) && defined(USERPREFS_FIXED_GPS_LON)
|
||||
FixedGPS.location_source = meshtastic_Position_LocSource_LOC_MANUAL;
|
||||
config.has_position = true;
|
||||
info->has_position = true;
|
||||
info->position = TypeConversions::ConvertToPositionLite(FixedGPS);
|
||||
nodeDB->setLocalPosition(FixedGPS);
|
||||
config.position.fixed_position = true;
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
saveToDisk(saveWhat);
|
||||
}
|
||||
|
||||
@ -438,8 +464,14 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
|
||||
#else
|
||||
bool hasScreen = screen_found.port != ScanI2C::I2CPort::NO_I2C;
|
||||
#endif
|
||||
#ifdef USERPREFS_FIXED_BLUETOOTH
|
||||
config.bluetooth.fixed_pin = USERPREFS_FIXED_BLUETOOTH;
|
||||
config.bluetooth.mode = meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN;
|
||||
//LOG_INFO("Setting FEXED PIN");
|
||||
#else
|
||||
config.bluetooth.mode = hasScreen ? meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN
|
||||
: meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN;
|
||||
#endif
|
||||
// for backward compat, default position flags are ALT+MSL
|
||||
config.position.position_flags =
|
||||
(meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE | meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE_MSL |
|
||||
|
16
userPrefs.h
16
userPrefs.h
@ -74,4 +74,20 @@ static unsigned char USERPREFS_ADMIN_KEY[] = {0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24
|
||||
0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, 0x04, 0x1a,
|
||||
0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c};
|
||||
*/
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
||||
/*
|
||||
* Set Fixed Bluetooth paring code
|
||||
*/
|
||||
//#define USERPREFS_FIXED_BLUETOOTH 121212
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user