pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-19 19:42:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #3015 from meshtastic/esp32s2fix

Browse Source 
ESP32-S2 fix
This commit is contained in:
Thomas Göttgens 2023-12-14 18:24:00 +01:00 committed by GitHub
commit ded1cbf4dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/AdminModule.cpp
View File

@ -622,12 +622,12 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
#if HAS_BLUETOOTH #if HAS_BLUETOOTH
conn.has_bluetooth = true; conn.has_bluetooth = true;
conn.bluetooth.pin = config.bluetooth.fixed_pin; conn.bluetooth.pin = config.bluetooth.fixed_pin;
#endif
#ifdef ARCH_ESP32 #ifdef ARCH_ESP32
conn.bluetooth.is_connected = nimbleBluetooth->isConnected(); conn.bluetooth.is_connected = nimbleBluetooth->isConnected();
conn.bluetooth.rssi = nimbleBluetooth->getRssi(); conn.bluetooth.rssi = nimbleBluetooth->getRssi();
#elif defined(ARCH_NRF52) #elif defined(ARCH_NRF52)
conn.bluetooth.is_connected = nrf52Bluetooth->isConnected(); conn.bluetooth.is_connected = nrf52Bluetooth->isConnected();
#endif
#endif #endif
conn.has_serial = true; // No serial-less devices conn.has_serial = true; // No serial-less devices
conn.serial.is_connected = powerFSM.getState() == &stateSERIAL; conn.serial.is_connected = powerFSM.getState() == &stateSERIAL;
@ -699,4 +699,4 @@ AdminModule::AdminModule() : ProtobufModule("Admin", meshtastic_PortNum_ADMIN_AP
{ {
// restrict to the admin channel for rx // restrict to the admin channel for rx
boundChannel = Channels::adminChannel; boundChannel = Channels::adminChannel;
} }