Skip to content

Commit

Permalink
Merge pull request #3015 from meshtastic/esp32s2fix
Browse files Browse the repository at this point in the history
ESP32-S2 fix
  • Loading branch information
caveman99 authored Dec 14, 2023
2 parents 4720b28 + 399b9f8 commit ded1cbf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/modules/AdminModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -622,12 +622,12 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
#if HAS_BLUETOOTH
conn.has_bluetooth = true;
conn.bluetooth.pin = config.bluetooth.fixed_pin;
#endif
#ifdef ARCH_ESP32
conn.bluetooth.is_connected = nimbleBluetooth->isConnected();
conn.bluetooth.rssi = nimbleBluetooth->getRssi();
#elif defined(ARCH_NRF52)
conn.bluetooth.is_connected = nrf52Bluetooth->isConnected();
#endif
#endif
conn.has_serial = true; // No serial-less devices
conn.serial.is_connected = powerFSM.getState() == &stateSERIAL;
Expand Down Expand Up @@ -699,4 +699,4 @@ AdminModule::AdminModule() : ProtobufModule("Admin", meshtastic_PortNum_ADMIN_AP
{
// restrict to the admin channel for rx
boundChannel = Channels::adminChannel;
}
}

0 comments on commit ded1cbf

Please sign in to comment.