rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 10:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates to work with latest adafruit nrf52 arduino

Browse Source
This commit is contained in:
Kevin Hester
2021-08-12 15:50:54 -07:00
parent 6d2cd73599
commit 04d3f44179
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nrf52/main-nrf52.cpp
View File

@@ -5,6 +5,7 @@
#include <ble_gap.h>
#include <memory.h>
#include <stdio.h>
#include <Adafruit_USBD_Device.h>
#include "NRF52Bluetooth.h"
#include "error.h"
@@ -20,7 +21,8 @@ static inline void debugger_break(void)
}
bool loopCanSleep() {
return !tud_cdc_connected();
// turn off sleep only while connected via USB
return !(TinyUSBDevice.mounted() && !TinyUSBDevice.suspended());
}
// handle standard gcc assert failures
@@ -37,7 +39,7 @@ void getMacAddr(uint8_t *dmac)
ble_gap_addr_t addr;
if (sd_ble_gap_addr_get(&addr) == NRF_SUCCESS) {
memcpy(dmac, addr.addr, 6);
} else {
} else {
const uint8_t *src = (const uint8_t *)NRF_FICR->DEVICEADDR;
dmac[5] = src[0];
dmac[4] = src[1];