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

Sweep up some missed trunk formatting

Browse Source
This commit is contained in:
Ben Meadors 2024-08-13 06:52:03 -05:00
parent e85a2e827b
commit 7740b4bccd
8 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gps/GPS.cpp
View File

@ -811,12 +811,9 @@ void GPS::setPowerState(GPSPowerState newState, uint32_t sleepTime)
LOG_INFO("GPS power state moving from %s to %s\n", getGPSPowerStateString(oldState), getGPSPowerStateString(newState)); LOG_INFO("GPS power state moving from %s to %s\n", getGPSPowerStateString(oldState), getGPSPowerStateString(newState));
#ifdef HELTEC_MESH_NODE_T114 #ifdef HELTEC_MESH_NODE_T114
if( (oldState==GPS_OFF || oldState==GPS_HARDSLEEP) && (newState!=GPS_OFF && newState!=GPS_HARDSLEEP) ) if ((oldState == GPS_OFF || oldState == GPS_HARDSLEEP) && (newState != GPS_OFF && newState != GPS_HARDSLEEP)) {
{
_serial_gps->begin(serialSpeeds[speedSelect]); _serial_gps->begin(serialSpeeds[speedSelect]);
} } else if ((newState == GPS_OFF || newState == GPS_HARDSLEEP) && (oldState != GPS_OFF && oldState != GPS_HARDSLEEP)) {
else if( (newState==GPS_OFF || newState==GPS_HARDSLEEP) && (oldState!=GPS_OFF && oldState!=GPS_HARDSLEEP) )
{
_serial_gps->end(); _serial_gps->end();
} }
#endif #endif

3
src/main.cpp
View File

@ -715,8 +715,7 @@ void setup()
#if !MESHTASTIC_EXCLUDE_GPS #if !MESHTASTIC_EXCLUDE_GPS
// If we're taking on the repeater role, ignore GPS // If we're taking on the repeater role, ignore GPS
#ifdef SENSOR_GPS_CONFLICT #ifdef SENSOR_GPS_CONFLICT
if(sensor_detected==false) if (sensor_detected == false) {
{
#endif #endif
if (HAS_GPS) { if (HAS_GPS) {
if (config.device.role != meshtastic_Config_DeviceConfig_Role_REPEATER && if (config.device.role != meshtastic_Config_DeviceConfig_Role_REPEATER &&

6
src/platform/nrf52/NRF52Bluetooth.cpp
View File

@ -199,10 +199,8 @@ void NRF52Bluetooth::shutdown()
// Shutdown bluetooth for minimum power draw // Shutdown bluetooth for minimum power draw
LOG_INFO("Disable NRF52 bluetooth\n"); LOG_INFO("Disable NRF52 bluetooth\n");
uint8_t connection_num = Bluefruit.connected(); uint8_t connection_num = Bluefruit.connected();
if(connection_num) if (connection_num) {
{ for (uint8_t i = 0; i < connection_num; i++) {
for(uint8_t i=0;i<connection_num;i++)
{
LOG_INFO("NRF52 bluetooth disconnecting handle %d\n", i); LOG_INFO("NRF52 bluetooth disconnecting handle %d\n", i);
Bluefruit.disconnect(i); Bluefruit.disconnect(i);
} }