Merge branch 'dev' into t114-display
This commit is contained in:
61
boards/seeed-xiao-afruitnrf52-nrf52840.json
Normal file
61
boards/seeed-xiao-afruitnrf52-nrf52840.json
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
{
|
||||||
|
"build": {
|
||||||
|
"arduino": {
|
||||||
|
"ldscript": "nrf52840_s140_v7.ld"
|
||||||
|
},
|
||||||
|
"core": "nRF5",
|
||||||
|
"cpu": "cortex-m4",
|
||||||
|
"extra_flags": "-DARDUINO_Seeed_XIAO_nRF52840 -DNRF52840_XXAA -DSEEED_XIAO_NRF52840 ",
|
||||||
|
"f_cpu": "64000000L",
|
||||||
|
"hwids": [
|
||||||
|
[ "0x2886", "0x8044" ],
|
||||||
|
[ "0x2886", "0x0044" ]
|
||||||
|
],
|
||||||
|
"mcu": "nrf52840",
|
||||||
|
"variant": "Seeed_XIAO_nRF52840",
|
||||||
|
"softdevice": {
|
||||||
|
"sd_flags": "-DS140",
|
||||||
|
"sd_name": "s140",
|
||||||
|
"sd_version": "7.3.0",
|
||||||
|
"sd_fwid": "0x0123"
|
||||||
|
},
|
||||||
|
"bsp": {
|
||||||
|
"name": "adafruit"
|
||||||
|
},
|
||||||
|
"bootloader": {
|
||||||
|
"settings_addr": "0xFF000"
|
||||||
|
},
|
||||||
|
"usb_product": "XIAO nRF52840"
|
||||||
|
},
|
||||||
|
"connectivity": [
|
||||||
|
"bluetooth"
|
||||||
|
],
|
||||||
|
"debug": {
|
||||||
|
"jlink_device": "nRF52840_xxAA",
|
||||||
|
"openocd_target": "nrf52.cfg",
|
||||||
|
"svd_path": "nrf52840.svd"
|
||||||
|
},
|
||||||
|
"frameworks": [
|
||||||
|
"arduino"
|
||||||
|
],
|
||||||
|
"name": "Seeed Studio XIAO nRF52840",
|
||||||
|
"upload": {
|
||||||
|
"maximum_ram_size": 237568,
|
||||||
|
"maximum_size": 811008,
|
||||||
|
"protocol": "nrfutil",
|
||||||
|
"speed": 115200,
|
||||||
|
"protocols": [
|
||||||
|
"jlink",
|
||||||
|
"nrfjprog",
|
||||||
|
"nrfutil",
|
||||||
|
"cmsis-dap",
|
||||||
|
"sam-ba",
|
||||||
|
"blackmagic"
|
||||||
|
],
|
||||||
|
"use_1200bps_touch": true,
|
||||||
|
"require_upload_port": true,
|
||||||
|
"wait_for_upload_port": true
|
||||||
|
},
|
||||||
|
"url": "https://wiki.seeedstudio.com/XIAO_BLE",
|
||||||
|
"vendor": "Seeed Studio"
|
||||||
|
}
|
||||||
@@ -86,7 +86,7 @@ static uint32_t _atoi(const char* sp) {
|
|||||||
|
|
||||||
/*------------ Frame Protocol --------------*/
|
/*------------ Frame Protocol --------------*/
|
||||||
|
|
||||||
#define FIRMWARE_VER_CODE 3
|
#define FIRMWARE_VER_CODE 4
|
||||||
|
|
||||||
#ifndef FIRMWARE_BUILD_DATE
|
#ifndef FIRMWARE_BUILD_DATE
|
||||||
#define FIRMWARE_BUILD_DATE "7 Apr 2025"
|
#define FIRMWARE_BUILD_DATE "7 Apr 2025"
|
||||||
@@ -133,6 +133,7 @@ static uint32_t _atoi(const char* sp) {
|
|||||||
#define CMD_SIGN_FINISH 35
|
#define CMD_SIGN_FINISH 35
|
||||||
#define CMD_SEND_TRACE_PATH 36
|
#define CMD_SEND_TRACE_PATH 36
|
||||||
#define CMD_SET_DEVICE_PIN 37
|
#define CMD_SET_DEVICE_PIN 37
|
||||||
|
#define CMD_SET_OTHER_PARAMS 38
|
||||||
|
|
||||||
#define RESP_CODE_OK 0
|
#define RESP_CODE_OK 0
|
||||||
#define RESP_CODE_ERR 1
|
#define RESP_CODE_ERR 1
|
||||||
@@ -167,6 +168,7 @@ static uint32_t _atoi(const char* sp) {
|
|||||||
#define PUSH_CODE_STATUS_RESPONSE 0x87
|
#define PUSH_CODE_STATUS_RESPONSE 0x87
|
||||||
#define PUSH_CODE_LOG_RX_DATA 0x88
|
#define PUSH_CODE_LOG_RX_DATA 0x88
|
||||||
#define PUSH_CODE_TRACE_DATA 0x89
|
#define PUSH_CODE_TRACE_DATA 0x89
|
||||||
|
#define PUSH_CODE_NEW_ADVERT 0x8A
|
||||||
|
|
||||||
#define ERR_CODE_UNSUPPORTED_CMD 1
|
#define ERR_CODE_UNSUPPORTED_CMD 1
|
||||||
#define ERR_CODE_NOT_FOUND 2
|
#define ERR_CODE_NOT_FOUND 2
|
||||||
@@ -187,7 +189,7 @@ struct NodePrefs { // persisted to file
|
|||||||
uint8_t sf;
|
uint8_t sf;
|
||||||
uint8_t cr;
|
uint8_t cr;
|
||||||
uint8_t reserved1;
|
uint8_t reserved1;
|
||||||
uint8_t reserved2;
|
uint8_t manual_add_contacts;
|
||||||
float bw;
|
float bw;
|
||||||
uint8_t tx_power_dbm;
|
uint8_t tx_power_dbm;
|
||||||
uint8_t unused[3];
|
uint8_t unused[3];
|
||||||
@@ -502,11 +504,19 @@ protected:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isAutoAddEnabled() const override {
|
||||||
|
return (_prefs.manual_add_contacts & 1) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
void onDiscoveredContact(ContactInfo& contact, bool is_new) override {
|
void onDiscoveredContact(ContactInfo& contact, bool is_new) override {
|
||||||
if (_serial->isConnected()) {
|
if (_serial->isConnected()) {
|
||||||
out_frame[0] = PUSH_CODE_ADVERT;
|
if (!isAutoAddEnabled() && is_new) {
|
||||||
memcpy(&out_frame[1], contact.id.pub_key, PUB_KEY_SIZE);
|
writeContactRespFrame(PUSH_CODE_NEW_ADVERT, contact);
|
||||||
_serial->writeFrame(out_frame, 1 + PUB_KEY_SIZE);
|
} else {
|
||||||
|
out_frame[0] = PUSH_CODE_ADVERT;
|
||||||
|
memcpy(&out_frame[1], contact.id.pub_key, PUB_KEY_SIZE);
|
||||||
|
_serial->writeFrame(out_frame, 1 + PUB_KEY_SIZE);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
soundBuzzer();
|
soundBuzzer();
|
||||||
}
|
}
|
||||||
@@ -666,6 +676,10 @@ protected:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void onRawDataRecv(mesh::Packet* packet) override {
|
void onRawDataRecv(mesh::Packet* packet) override {
|
||||||
|
if (packet->payload_len + 4 > sizeof(out_frame)) {
|
||||||
|
MESH_DEBUG_PRINTLN("onRawDataRecv(), payload_len too long: %d", packet->payload_len);
|
||||||
|
return;
|
||||||
|
}
|
||||||
int i = 0;
|
int i = 0;
|
||||||
out_frame[i++] = PUSH_CODE_RAW_DATA;
|
out_frame[i++] = PUSH_CODE_RAW_DATA;
|
||||||
out_frame[i++] = (int8_t)(_radio->getLastSNR() * 4);
|
out_frame[i++] = (int8_t)(_radio->getLastSNR() * 4);
|
||||||
@@ -749,7 +763,7 @@ public:
|
|||||||
file.read((uint8_t *) &_prefs.sf, sizeof(_prefs.sf)); // 60
|
file.read((uint8_t *) &_prefs.sf, sizeof(_prefs.sf)); // 60
|
||||||
file.read((uint8_t *) &_prefs.cr, sizeof(_prefs.cr)); // 61
|
file.read((uint8_t *) &_prefs.cr, sizeof(_prefs.cr)); // 61
|
||||||
file.read((uint8_t *) &_prefs.reserved1, sizeof(_prefs.reserved1)); // 62
|
file.read((uint8_t *) &_prefs.reserved1, sizeof(_prefs.reserved1)); // 62
|
||||||
file.read((uint8_t *) &_prefs.reserved2, sizeof(_prefs.reserved2)); // 63
|
file.read((uint8_t *) &_prefs.manual_add_contacts, sizeof(_prefs.manual_add_contacts)); // 63
|
||||||
file.read((uint8_t *) &_prefs.bw, sizeof(_prefs.bw)); // 64
|
file.read((uint8_t *) &_prefs.bw, sizeof(_prefs.bw)); // 64
|
||||||
file.read((uint8_t *) &_prefs.tx_power_dbm, sizeof(_prefs.tx_power_dbm)); // 68
|
file.read((uint8_t *) &_prefs.tx_power_dbm, sizeof(_prefs.tx_power_dbm)); // 68
|
||||||
file.read((uint8_t *) _prefs.unused, sizeof(_prefs.unused)); // 69
|
file.read((uint8_t *) _prefs.unused, sizeof(_prefs.unused)); // 69
|
||||||
@@ -850,7 +864,7 @@ public:
|
|||||||
file.write((uint8_t *) &_prefs.sf, sizeof(_prefs.sf)); // 60
|
file.write((uint8_t *) &_prefs.sf, sizeof(_prefs.sf)); // 60
|
||||||
file.write((uint8_t *) &_prefs.cr, sizeof(_prefs.cr)); // 61
|
file.write((uint8_t *) &_prefs.cr, sizeof(_prefs.cr)); // 61
|
||||||
file.write((uint8_t *) &_prefs.reserved1, sizeof(_prefs.reserved1)); // 62
|
file.write((uint8_t *) &_prefs.reserved1, sizeof(_prefs.reserved1)); // 62
|
||||||
file.write((uint8_t *) &_prefs.reserved2, sizeof(_prefs.reserved2)); // 63
|
file.write((uint8_t *) &_prefs.manual_add_contacts, sizeof(_prefs.manual_add_contacts)); // 63
|
||||||
file.write((uint8_t *) &_prefs.bw, sizeof(_prefs.bw)); // 64
|
file.write((uint8_t *) &_prefs.bw, sizeof(_prefs.bw)); // 64
|
||||||
file.write((uint8_t *) &_prefs.tx_power_dbm, sizeof(_prefs.tx_power_dbm)); // 68
|
file.write((uint8_t *) &_prefs.tx_power_dbm, sizeof(_prefs.tx_power_dbm)); // 68
|
||||||
file.write((uint8_t *) _prefs.unused, sizeof(_prefs.unused)); // 69
|
file.write((uint8_t *) _prefs.unused, sizeof(_prefs.unused)); // 69
|
||||||
@@ -891,12 +905,15 @@ public:
|
|||||||
out_frame[i++] = MAX_LORA_TX_POWER;
|
out_frame[i++] = MAX_LORA_TX_POWER;
|
||||||
memcpy(&out_frame[i], self_id.pub_key, PUB_KEY_SIZE); i += PUB_KEY_SIZE;
|
memcpy(&out_frame[i], self_id.pub_key, PUB_KEY_SIZE); i += PUB_KEY_SIZE;
|
||||||
|
|
||||||
int32_t lat, lon, alt = 0;
|
int32_t lat, lon;
|
||||||
lat = (_prefs.node_lat * 1000000.0);
|
lat = (_prefs.node_lat * 1000000.0);
|
||||||
lon = (_prefs.node_lon * 1000000.0);
|
lon = (_prefs.node_lon * 1000000.0);
|
||||||
memcpy(&out_frame[i], &lat, 4); i += 4;
|
memcpy(&out_frame[i], &lat, 4); i += 4;
|
||||||
memcpy(&out_frame[i], &lon, 4); i += 4;
|
memcpy(&out_frame[i], &lon, 4); i += 4;
|
||||||
memcpy(&out_frame[i], &alt, 4); i += 4;
|
out_frame[i++] = 0; // reserved
|
||||||
|
out_frame[i++] = 0; // reserved
|
||||||
|
out_frame[i++] = 0; // reserved
|
||||||
|
out_frame[i++] = _prefs.manual_add_contacts;
|
||||||
|
|
||||||
uint32_t freq = _prefs.freq * 1000;
|
uint32_t freq = _prefs.freq * 1000;
|
||||||
memcpy(&out_frame[i], &freq, 4); i += 4;
|
memcpy(&out_frame[i], &freq, 4); i += 4;
|
||||||
@@ -1180,6 +1197,10 @@ public:
|
|||||||
_prefs.airtime_factor = ((float)af) / 1000.0f;
|
_prefs.airtime_factor = ((float)af) / 1000.0f;
|
||||||
savePrefs();
|
savePrefs();
|
||||||
writeOKFrame();
|
writeOKFrame();
|
||||||
|
} else if (cmd_frame[0] == CMD_SET_OTHER_PARAMS) {
|
||||||
|
_prefs.manual_add_contacts = cmd_frame[1];
|
||||||
|
savePrefs();
|
||||||
|
writeOKFrame();
|
||||||
} else if (cmd_frame[0] == CMD_REBOOT && memcmp(&cmd_frame[1], "reboot", 6) == 0) {
|
} else if (cmd_frame[0] == CMD_REBOOT && memcmp(&cmd_frame[1], "reboot", 6) == 0) {
|
||||||
board.reboot();
|
board.reboot();
|
||||||
} else if (cmd_frame[0] == CMD_GET_BATTERY_VOLTAGE) {
|
} else if (cmd_frame[0] == CMD_GET_BATTERY_VOLTAGE) {
|
||||||
|
|||||||
@@ -101,6 +101,12 @@ void Dispatcher::checkRecv() {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
pkt->header = raw[i++];
|
pkt->header = raw[i++];
|
||||||
|
if (pkt->hasTransportCodes()) {
|
||||||
|
memcpy(&pkt->transport_codes[0], &raw[i], 2); i += 2;
|
||||||
|
memcpy(&pkt->transport_codes[1], &raw[i], 2); i += 2;
|
||||||
|
} else {
|
||||||
|
pkt->transport_codes[0] = pkt->transport_codes[1] = 0;
|
||||||
|
}
|
||||||
pkt->path_len = raw[i++];
|
pkt->path_len = raw[i++];
|
||||||
|
|
||||||
if (pkt->path_len > MAX_PATH_SIZE || i + pkt->path_len > len) {
|
if (pkt->path_len > MAX_PATH_SIZE || i + pkt->path_len > len) {
|
||||||
@@ -132,7 +138,7 @@ void Dispatcher::checkRecv() {
|
|||||||
#if MESH_PACKET_LOGGING
|
#if MESH_PACKET_LOGGING
|
||||||
Serial.print(getLogDateTime());
|
Serial.print(getLogDateTime());
|
||||||
Serial.printf(": RX, len=%d (type=%d, route=%s, payload_len=%d) SNR=%d RSSI=%d score=%d",
|
Serial.printf(": RX, len=%d (type=%d, route=%s, payload_len=%d) SNR=%d RSSI=%d score=%d",
|
||||||
2 + pkt->path_len + pkt->payload_len, pkt->getPayloadType(), pkt->isRouteDirect() ? "D" : "F", pkt->payload_len,
|
pkt->getRawLength(), pkt->getPayloadType(), pkt->isRouteDirect() ? "D" : "F", pkt->payload_len,
|
||||||
(int)pkt->getSNR(), (int)_radio->getLastRSSI(), (int)(score*1000));
|
(int)pkt->getSNR(), (int)_radio->getLastRSSI(), (int)(score*1000));
|
||||||
|
|
||||||
static uint8_t packet_hash[MAX_HASH_SIZE];
|
static uint8_t packet_hash[MAX_HASH_SIZE];
|
||||||
@@ -147,7 +153,7 @@ void Dispatcher::checkRecv() {
|
|||||||
Serial.printf("\n");
|
Serial.printf("\n");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
logRx(pkt, 2 + pkt->path_len + pkt->payload_len, score); // hook for custom logging
|
logRx(pkt, pkt->getRawLength(), score); // hook for custom logging
|
||||||
|
|
||||||
if (pkt->isRouteFlood()) {
|
if (pkt->isRouteFlood()) {
|
||||||
n_recv_flood++;
|
n_recv_flood++;
|
||||||
@@ -212,6 +218,10 @@ void Dispatcher::checkSend() {
|
|||||||
raw[len++] = NODE_ID;
|
raw[len++] = NODE_ID;
|
||||||
#endif
|
#endif
|
||||||
raw[len++] = outbound->header;
|
raw[len++] = outbound->header;
|
||||||
|
if (outbound->hasTransportCodes()) {
|
||||||
|
memcpy(&raw[len], &outbound->transport_codes[0], 2); len += 2;
|
||||||
|
memcpy(&raw[len], &outbound->transport_codes[1], 2); len += 2;
|
||||||
|
}
|
||||||
raw[len++] = outbound->path_len;
|
raw[len++] = outbound->path_len;
|
||||||
memcpy(&raw[len], outbound->path, outbound->path_len); len += outbound->path_len;
|
memcpy(&raw[len], outbound->path, outbound->path_len); len += outbound->path_len;
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ bool Mesh::allowPacketForward(const mesh::Packet* packet) {
|
|||||||
return false; // by default, Transport NOT enabled
|
return false; // by default, Transport NOT enabled
|
||||||
}
|
}
|
||||||
uint32_t Mesh::getRetransmitDelay(const mesh::Packet* packet) {
|
uint32_t Mesh::getRetransmitDelay(const mesh::Packet* packet) {
|
||||||
uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * 52 / 50) / 2;
|
uint32_t t = (_radio->getEstAirtimeFor(packet->getRawLength()) * 52 / 50) / 2;
|
||||||
|
|
||||||
return _rng->nextInt(0, 5)*t;
|
return _rng->nextInt(0, 5)*t;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ Packet::Packet() {
|
|||||||
payload_len = 0;
|
payload_len = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int Packet::getRawLength() const {
|
||||||
|
return 2 + path_len + payload_len + (hasTransportCodes() ? 4 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
void Packet::calculatePacketHash(uint8_t* hash) const {
|
void Packet::calculatePacketHash(uint8_t* hash) const {
|
||||||
SHA256 sha;
|
SHA256 sha;
|
||||||
uint8_t t = getPayloadType();
|
uint8_t t = getPayloadType();
|
||||||
@@ -24,6 +28,10 @@ void Packet::calculatePacketHash(uint8_t* hash) const {
|
|||||||
uint8_t Packet::writeTo(uint8_t dest[]) const {
|
uint8_t Packet::writeTo(uint8_t dest[]) const {
|
||||||
uint8_t i = 0;
|
uint8_t i = 0;
|
||||||
dest[i++] = header;
|
dest[i++] = header;
|
||||||
|
if (hasTransportCodes()) {
|
||||||
|
memcpy(&dest[i], &transport_codes[0], 2); i += 2;
|
||||||
|
memcpy(&dest[i], &transport_codes[1], 2); i += 2;
|
||||||
|
}
|
||||||
dest[i++] = path_len;
|
dest[i++] = path_len;
|
||||||
memcpy(&dest[i], path, path_len); i += path_len;
|
memcpy(&dest[i], path, path_len); i += path_len;
|
||||||
memcpy(&dest[i], payload, payload_len); i += payload_len;
|
memcpy(&dest[i], payload, payload_len); i += payload_len;
|
||||||
@@ -33,6 +41,12 @@ uint8_t Packet::writeTo(uint8_t dest[]) const {
|
|||||||
bool Packet::readFrom(const uint8_t src[], uint8_t len) {
|
bool Packet::readFrom(const uint8_t src[], uint8_t len) {
|
||||||
uint8_t i = 0;
|
uint8_t i = 0;
|
||||||
header = src[i++];
|
header = src[i++];
|
||||||
|
if (hasTransportCodes()) {
|
||||||
|
memcpy(&transport_codes[0], &src[i], 2); i += 2;
|
||||||
|
memcpy(&transport_codes[1], &src[i], 2); i += 2;
|
||||||
|
} else {
|
||||||
|
transport_codes[0] = transport_codes[1] = 0;
|
||||||
|
}
|
||||||
path_len = src[i++];
|
path_len = src[i++];
|
||||||
if (path_len > sizeof(path)) return false; // bad encoding
|
if (path_len > sizeof(path)) return false; // bad encoding
|
||||||
memcpy(path, &src[i], path_len); i += path_len;
|
memcpy(path, &src[i], path_len); i += path_len;
|
||||||
|
|||||||
20
src/Packet.h
20
src/Packet.h
@@ -11,10 +11,10 @@ namespace mesh {
|
|||||||
#define PH_VER_SHIFT 6
|
#define PH_VER_SHIFT 6
|
||||||
#define PH_VER_MASK 0x03 // 2-bits
|
#define PH_VER_MASK 0x03 // 2-bits
|
||||||
|
|
||||||
#define ROUTE_TYPE_RESERVED1 0x00 // FUTURE
|
#define ROUTE_TYPE_TRANSPORT_FLOOD 0x00 // flood mode + transport codes
|
||||||
#define ROUTE_TYPE_FLOOD 0x01 // flood mode, needs 'path' to be built up (max 64 bytes)
|
#define ROUTE_TYPE_FLOOD 0x01 // flood mode, needs 'path' to be built up (max 64 bytes)
|
||||||
#define ROUTE_TYPE_DIRECT 0x02 // direct route, 'path' is supplied
|
#define ROUTE_TYPE_DIRECT 0x02 // direct route, 'path' is supplied
|
||||||
#define ROUTE_TYPE_RESERVED2 0x03 // FUTURE
|
#define ROUTE_TYPE_TRANSPORT_DIRECT 0x03 // direct route + transport codes
|
||||||
|
|
||||||
#define PAYLOAD_TYPE_REQ 0x00 // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
|
#define PAYLOAD_TYPE_REQ 0x00 // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
|
||||||
#define PAYLOAD_TYPE_RESPONSE 0x01 // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
|
#define PAYLOAD_TYPE_RESPONSE 0x01 // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
|
||||||
@@ -43,6 +43,7 @@ public:
|
|||||||
|
|
||||||
uint8_t header;
|
uint8_t header;
|
||||||
uint16_t payload_len, path_len;
|
uint16_t payload_len, path_len;
|
||||||
|
uint16_t transport_codes[2];
|
||||||
uint8_t path[MAX_PATH_SIZE];
|
uint8_t path[MAX_PATH_SIZE];
|
||||||
uint8_t payload[MAX_PACKET_PAYLOAD];
|
uint8_t payload[MAX_PACKET_PAYLOAD];
|
||||||
int8_t _snr;
|
int8_t _snr;
|
||||||
@@ -58,8 +59,10 @@ public:
|
|||||||
*/
|
*/
|
||||||
uint8_t getRouteType() const { return header & PH_ROUTE_MASK; }
|
uint8_t getRouteType() const { return header & PH_ROUTE_MASK; }
|
||||||
|
|
||||||
bool isRouteFlood() const { return getRouteType() == ROUTE_TYPE_FLOOD; }
|
bool isRouteFlood() const { return getRouteType() == ROUTE_TYPE_FLOOD || getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD; }
|
||||||
bool isRouteDirect() const { return getRouteType() == ROUTE_TYPE_DIRECT; }
|
bool isRouteDirect() const { return getRouteType() == ROUTE_TYPE_DIRECT || getRouteType() == ROUTE_TYPE_TRANSPORT_DIRECT; }
|
||||||
|
|
||||||
|
bool hasTransportCodes() const { return getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD || getRouteType() == ROUTE_TYPE_TRANSPORT_DIRECT; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \returns one of PAYLOAD_TYPE_ values
|
* \returns one of PAYLOAD_TYPE_ values
|
||||||
@@ -76,6 +79,11 @@ public:
|
|||||||
|
|
||||||
float getSNR() const { return ((float)_snr) / 4.0f; }
|
float getSNR() const { return ((float)_snr) / 4.0f; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \returns the encoded/wire format length of this packet
|
||||||
|
*/
|
||||||
|
int getRawLength() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief save entire packet as a blob
|
* \brief save entire packet as a blob
|
||||||
* \param dest (OUT) destination buffer (assumed to be MAX_MTU_SIZE)
|
* \param dest (OUT) destination buffer (assumed to be MAX_MTU_SIZE)
|
||||||
|
|||||||
@@ -31,8 +31,29 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// save a copy of raw advert packet (to support "Share..." function)
|
||||||
|
int plen = packet->writeTo(temp_buf);
|
||||||
|
putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
|
||||||
|
|
||||||
bool is_new = false;
|
bool is_new = false;
|
||||||
if (from == NULL) {
|
if (from == NULL) {
|
||||||
|
if (!isAutoAddEnabled()) {
|
||||||
|
ContactInfo ci;
|
||||||
|
memset(&ci, 0, sizeof(ci));
|
||||||
|
ci.id = id;
|
||||||
|
ci.out_path_len = -1; // initially out_path is unknown
|
||||||
|
StrHelper::strncpy(ci.name, parser.getName(), sizeof(ci.name));
|
||||||
|
ci.type = parser.getType();
|
||||||
|
if (parser.hasLatLon()) {
|
||||||
|
ci.gps_lat = parser.getIntLat();
|
||||||
|
ci.gps_lon = parser.getIntLon();
|
||||||
|
}
|
||||||
|
ci.last_advert_timestamp = timestamp;
|
||||||
|
ci.lastmod = getRTCClock()->getCurrentTime();
|
||||||
|
onDiscoveredContact(ci, true); // let UI know
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
is_new = true;
|
is_new = true;
|
||||||
if (num_contacts < MAX_CONTACTS) {
|
if (num_contacts < MAX_CONTACTS) {
|
||||||
from = &contacts[num_contacts++];
|
from = &contacts[num_contacts++];
|
||||||
@@ -50,10 +71,6 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// save a copy of raw advert packet (to support "Share..." function)
|
|
||||||
int plen = packet->writeTo(temp_buf);
|
|
||||||
putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
|
|
||||||
|
|
||||||
// update
|
// update
|
||||||
StrHelper::strncpy(from->name, parser.getName(), sizeof(from->name));
|
StrHelper::strncpy(from->name, parser.getName(), sizeof(from->name));
|
||||||
from->type = parser.getType();
|
from->type = parser.getType();
|
||||||
@@ -252,7 +269,7 @@ int BaseChatMesh::sendMessage(const ContactInfo& recipient, uint32_t timestamp,
|
|||||||
mesh::Packet* pkt = composeMsgPacket(recipient, timestamp, attempt, text, expected_ack);
|
mesh::Packet* pkt = composeMsgPacket(recipient, timestamp, attempt, text, expected_ack);
|
||||||
if (pkt == NULL) return MSG_SEND_FAILED;
|
if (pkt == NULL) return MSG_SEND_FAILED;
|
||||||
|
|
||||||
uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
|
uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
|
||||||
|
|
||||||
int rc;
|
int rc;
|
||||||
if (recipient.out_path_len < 0) {
|
if (recipient.out_path_len < 0) {
|
||||||
@@ -279,7 +296,7 @@ int BaseChatMesh::sendCommandData(const ContactInfo& recipient, uint32_t timest
|
|||||||
auto pkt = createDatagram(PAYLOAD_TYPE_TXT_MSG, recipient.id, recipient.shared_secret, temp, 5 + text_len);
|
auto pkt = createDatagram(PAYLOAD_TYPE_TXT_MSG, recipient.id, recipient.shared_secret, temp, 5 + text_len);
|
||||||
if (pkt == NULL) return MSG_SEND_FAILED;
|
if (pkt == NULL) return MSG_SEND_FAILED;
|
||||||
|
|
||||||
uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
|
uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
|
||||||
int rc;
|
int rc;
|
||||||
if (recipient.out_path_len < 0) {
|
if (recipient.out_path_len < 0) {
|
||||||
sendFlood(pkt);
|
sendFlood(pkt);
|
||||||
@@ -362,7 +379,7 @@ int BaseChatMesh::sendLogin(const ContactInfo& recipient, const char* password,
|
|||||||
|
|
||||||
auto pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.shared_secret, temp, tlen);
|
auto pkt = createAnonDatagram(PAYLOAD_TYPE_ANON_REQ, self_id, recipient.id, recipient.shared_secret, temp, tlen);
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
|
uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
|
||||||
if (recipient.out_path_len < 0) {
|
if (recipient.out_path_len < 0) {
|
||||||
sendFlood(pkt);
|
sendFlood(pkt);
|
||||||
est_timeout = calcFloodTimeoutMillisFor(t);
|
est_timeout = calcFloodTimeoutMillisFor(t);
|
||||||
@@ -386,7 +403,7 @@ int BaseChatMesh::sendStatusRequest(const ContactInfo& recipient, uint32_t& est
|
|||||||
|
|
||||||
auto pkt = createDatagram(PAYLOAD_TYPE_REQ, recipient.id, recipient.shared_secret, temp, sizeof(temp));
|
auto pkt = createDatagram(PAYLOAD_TYPE_REQ, recipient.id, recipient.shared_secret, temp, sizeof(temp));
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
|
uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
|
||||||
if (recipient.out_path_len < 0) {
|
if (recipient.out_path_len < 0) {
|
||||||
sendFlood(pkt);
|
sendFlood(pkt);
|
||||||
est_timeout = calcFloodTimeoutMillisFor(t);
|
est_timeout = calcFloodTimeoutMillisFor(t);
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ protected:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 'UI' concepts, for sub-classes to implement
|
// 'UI' concepts, for sub-classes to implement
|
||||||
|
virtual bool isAutoAddEnabled() const { return true; }
|
||||||
virtual void onDiscoveredContact(ContactInfo& contact, bool is_new) = 0;
|
virtual void onDiscoveredContact(ContactInfo& contact, bool is_new) = 0;
|
||||||
virtual bool processAck(const uint8_t *data) = 0;
|
virtual bool processAck(const uint8_t *data) = 0;
|
||||||
virtual void onContactPathUpdated(const ContactInfo& contact) = 0;
|
virtual void onContactPathUpdated(const ContactInfo& contact) = 0;
|
||||||
|
|||||||
@@ -27,4 +27,5 @@ public:
|
|||||||
|
|
||||||
float getLastRSSI() const override { return ((CustomLR1110 *)_radio)->getRSSI(); }
|
float getLastRSSI() const override { return ((CustomLR1110 *)_radio)->getRSSI(); }
|
||||||
float getLastSNR() const override { return ((CustomLR1110 *)_radio)->getSNR(); }
|
float getLastSNR() const override { return ((CustomLR1110 *)_radio)->getSNR(); }
|
||||||
|
int16_t setRxBoostedGainMode(bool en) { return ((CustomLR1110 *)_radio)->setRxBoostedGainMode(en); };
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -29,9 +29,16 @@ public:
|
|||||||
|
|
||||||
uint16_t getBattMilliVolts() override {
|
uint16_t getBattMilliVolts() override {
|
||||||
#ifdef BATTERY_PIN
|
#ifdef BATTERY_PIN
|
||||||
|
#ifdef PIN_3V3_EN
|
||||||
|
digitalWrite(PIN_3V3_EN, HIGH);
|
||||||
|
#endif
|
||||||
analogReference(AR_INTERNAL_3_0);
|
analogReference(AR_INTERNAL_3_0);
|
||||||
analogReadResolution(12);
|
analogReadResolution(12);
|
||||||
|
delay(10);
|
||||||
float volts = (analogRead(BATTERY_PIN) * ADC_MULTIPLIER * AREF_VOLTAGE) / 4096;
|
float volts = (analogRead(BATTERY_PIN) * ADC_MULTIPLIER * AREF_VOLTAGE) / 4096;
|
||||||
|
#ifdef PIN_3V3_EN
|
||||||
|
digitalWrite(PIN_3V3_EN, LOW);
|
||||||
|
#endif
|
||||||
|
|
||||||
analogReference(AR_DEFAULT); // put back to default
|
analogReference(AR_DEFAULT); // put back to default
|
||||||
analogReadResolution(10);
|
analogReadResolution(10);
|
||||||
|
|||||||
95
src/helpers/nrf52/XiaoNrf52Board.cpp
Normal file
95
src/helpers/nrf52/XiaoNrf52Board.cpp
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
#ifdef XIAO_NRF52
|
||||||
|
|
||||||
|
#include <Arduino.h>
|
||||||
|
#include "XiaoNrf52Board.h"
|
||||||
|
|
||||||
|
#include <bluefruit.h>
|
||||||
|
#include <Wire.h>
|
||||||
|
|
||||||
|
static BLEDfu bledfu;
|
||||||
|
|
||||||
|
static void connect_callback(uint16_t conn_handle)
|
||||||
|
{
|
||||||
|
(void)conn_handle;
|
||||||
|
MESH_DEBUG_PRINTLN("BLE client connected");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
|
||||||
|
{
|
||||||
|
(void)conn_handle;
|
||||||
|
(void)reason;
|
||||||
|
|
||||||
|
MESH_DEBUG_PRINTLN("BLE client disconnected");
|
||||||
|
}
|
||||||
|
|
||||||
|
void XiaoNrf52Board::begin() {
|
||||||
|
// for future use, sub-classes SHOULD call this from their begin()
|
||||||
|
startup_reason = BD_STARTUP_NORMAL;
|
||||||
|
|
||||||
|
pinMode(PIN_VBAT, INPUT);
|
||||||
|
pinMode(VBAT_ENABLE, OUTPUT);
|
||||||
|
digitalWrite(VBAT_ENABLE, HIGH);
|
||||||
|
|
||||||
|
#if defined(PIN_WIRE_SDA) && defined(PIN_WIRE_SCL)
|
||||||
|
Wire.setPins(PIN_WIRE_SDA, PIN_WIRE_SCL);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Wire.begin();
|
||||||
|
|
||||||
|
#ifdef P_LORA_TX_LED
|
||||||
|
pinMode(P_LORA_TX_LED, OUTPUT);
|
||||||
|
digitalWrite(P_LORA_TX_LED, HIGH);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// pinMode(SX126X_POWER_EN, OUTPUT);
|
||||||
|
// digitalWrite(SX126X_POWER_EN, HIGH);
|
||||||
|
delay(10); // give sx1262 some time to power up
|
||||||
|
}
|
||||||
|
|
||||||
|
bool XiaoNrf52Board::startOTAUpdate(const char* id, char reply[]) {
|
||||||
|
// Config the peripheral connection with maximum bandwidth
|
||||||
|
// more SRAM required by SoftDevice
|
||||||
|
// Note: All config***() function must be called before begin()
|
||||||
|
Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
|
||||||
|
Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
|
||||||
|
|
||||||
|
Bluefruit.begin(1, 0);
|
||||||
|
// Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
|
||||||
|
Bluefruit.setTxPower(4);
|
||||||
|
// Set the BLE device name
|
||||||
|
Bluefruit.setName("XIAO_NRF52_OTA");
|
||||||
|
|
||||||
|
Bluefruit.Periph.setConnectCallback(connect_callback);
|
||||||
|
Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
|
||||||
|
|
||||||
|
// To be consistent OTA DFU should be added first if it exists
|
||||||
|
bledfu.begin();
|
||||||
|
|
||||||
|
// Set up and start advertising
|
||||||
|
// Advertising packet
|
||||||
|
Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
|
||||||
|
Bluefruit.Advertising.addTxPower();
|
||||||
|
Bluefruit.Advertising.addName();
|
||||||
|
|
||||||
|
/* Start Advertising
|
||||||
|
- Enable auto advertising if disconnected
|
||||||
|
- Interval: fast mode = 20 ms, slow mode = 152.5 ms
|
||||||
|
- Timeout for fast mode is 30 seconds
|
||||||
|
- Start(timeout) with timeout = 0 will advertise forever (until connected)
|
||||||
|
|
||||||
|
For recommended advertising interval
|
||||||
|
https://developer.apple.com/library/content/qa/qa1931/_index.html
|
||||||
|
*/
|
||||||
|
Bluefruit.Advertising.restartOnDisconnect(true);
|
||||||
|
Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
|
||||||
|
Bluefruit.Advertising.setFastTimeout(30); // number of seconds in fast mode
|
||||||
|
Bluefruit.Advertising.start(0); // 0 = Don't stop advertising after n seconds
|
||||||
|
|
||||||
|
strcpy(reply, "OK - started");
|
||||||
|
return true;
|
||||||
|
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
79
src/helpers/nrf52/XiaoNrf52Board.h
Normal file
79
src/helpers/nrf52/XiaoNrf52Board.h
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <MeshCore.h>
|
||||||
|
#include <Arduino.h>
|
||||||
|
|
||||||
|
#ifdef XIAO_NRF52
|
||||||
|
|
||||||
|
// LoRa radio module pins for Seeed Xiao-nrf52
|
||||||
|
#ifdef SX1262_XIAO_S3_VARIANT
|
||||||
|
#define P_LORA_DIO_1 D0
|
||||||
|
#define P_LORA_BUSY D1
|
||||||
|
#define P_LORA_RESET D2
|
||||||
|
#define P_LORA_NSS D3
|
||||||
|
#define LORA_TX_BOOST_PIN D4
|
||||||
|
#else
|
||||||
|
#define P_LORA_DIO_1 D1
|
||||||
|
#define P_LORA_BUSY D3
|
||||||
|
#define P_LORA_RESET D2
|
||||||
|
#define P_LORA_NSS D4
|
||||||
|
#define LORA_TX_BOOST_PIN D5
|
||||||
|
#endif
|
||||||
|
#define P_LORA_SCLK PIN_SPI_SCK
|
||||||
|
#define P_LORA_MISO PIN_SPI_MISO
|
||||||
|
#define P_LORA_MOSI PIN_SPI_MOSI
|
||||||
|
//#define SX126X_POWER_EN 37
|
||||||
|
|
||||||
|
#define SX126X_DIO2_AS_RF_SWITCH true
|
||||||
|
#define SX126X_DIO3_TCXO_VOLTAGE 1.8
|
||||||
|
|
||||||
|
|
||||||
|
class XiaoNrf52Board : public mesh::MainBoard {
|
||||||
|
protected:
|
||||||
|
uint8_t startup_reason;
|
||||||
|
|
||||||
|
public:
|
||||||
|
void begin();
|
||||||
|
uint8_t getStartupReason() const override { return startup_reason; }
|
||||||
|
|
||||||
|
#if defined(P_LORA_TX_LED)
|
||||||
|
void onBeforeTransmit() override {
|
||||||
|
digitalWrite(P_LORA_TX_LED, LOW); // turn TX LED on
|
||||||
|
}
|
||||||
|
void onAfterTransmit() override {
|
||||||
|
digitalWrite(P_LORA_TX_LED, HIGH); // turn TX LED off
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
uint16_t getBattMilliVolts() override {
|
||||||
|
// Please read befor going further ;)
|
||||||
|
// https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
|
||||||
|
|
||||||
|
pinMode(BAT_NOT_CHARGING, INPUT);
|
||||||
|
if (digitalRead(BAT_NOT_CHARGING) == HIGH) {
|
||||||
|
int adcvalue = 0;
|
||||||
|
analogReadResolution(12);
|
||||||
|
analogReference(AR_INTERNAL_3_0);
|
||||||
|
digitalWrite(VBAT_ENABLE, LOW);
|
||||||
|
delay(10);
|
||||||
|
adcvalue = analogRead(PIN_VBAT);
|
||||||
|
digitalWrite(VBAT_ENABLE, HIGH);
|
||||||
|
return (adcvalue * ADC_MULTIPLIER * AREF_VOLTAGE) / 4.096;
|
||||||
|
} else {
|
||||||
|
digitalWrite(VBAT_ENABLE, HIGH); // ensures high !
|
||||||
|
return 4200; // charging value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* getManufacturerName() const override {
|
||||||
|
return "Seeed Xiao-nrf52";
|
||||||
|
}
|
||||||
|
|
||||||
|
void reboot() override {
|
||||||
|
NVIC_SystemReset();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool startOTAUpdate(const char* id, char reply[]) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -16,7 +16,7 @@ build_flags = ${nrf52840_base.build_flags}
|
|||||||
-D SX126X_CURRENT_LIMIT=130
|
-D SX126X_CURRENT_LIMIT=130
|
||||||
-D SX126X_RX_BOOSTED_GAIN=1
|
-D SX126X_RX_BOOSTED_GAIN=1
|
||||||
build_src_filter = ${nrf52840_base.build_src_filter}
|
build_src_filter = ${nrf52840_base.build_src_filter}
|
||||||
+<helpers/nrf52/*.cpp>
|
+<helpers/nrf52/RAK4631Board.cpp>
|
||||||
+<../variants/rak4631>
|
+<../variants/rak4631>
|
||||||
lib_deps =
|
lib_deps =
|
||||||
${nrf52840_base.lib_deps}
|
${nrf52840_base.lib_deps}
|
||||||
@@ -86,7 +86,7 @@ build_flags =
|
|||||||
; -D MESH_DEBUG=1
|
; -D MESH_DEBUG=1
|
||||||
build_src_filter = ${rak4631.build_src_filter}
|
build_src_filter = ${rak4631.build_src_filter}
|
||||||
+<helpers/ui/SSD1306Display.cpp>
|
+<helpers/ui/SSD1306Display.cpp>
|
||||||
+<helpers/nrf52/*.cpp>
|
+<helpers/nrf52/SerialBLEInterface.cpp>
|
||||||
+<../examples/companion_radio>
|
+<../examples/companion_radio>
|
||||||
lib_deps =
|
lib_deps =
|
||||||
${rak4631.lib_deps}
|
${rak4631.lib_deps}
|
||||||
|
|||||||
@@ -83,13 +83,13 @@ void initVariant()
|
|||||||
pinMode(GPS_RTC_INT, OUTPUT);
|
pinMode(GPS_RTC_INT, OUTPUT);
|
||||||
pinMode(LED_PIN, OUTPUT);
|
pinMode(LED_PIN, OUTPUT);
|
||||||
|
|
||||||
digitalWrite(PIN_3V3_EN, HIGH);
|
digitalWrite(PIN_3V3_EN, LOW);
|
||||||
digitalWrite(PIN_3V3_ACC_EN, LOW);
|
digitalWrite(PIN_3V3_ACC_EN, LOW);
|
||||||
digitalWrite(BUZZER_EN, LOW);
|
digitalWrite(BUZZER_EN, LOW);
|
||||||
digitalWrite(SENSOR_EN, LOW);
|
digitalWrite(SENSOR_EN, LOW);
|
||||||
digitalWrite(GPS_EN, LOW);
|
digitalWrite(GPS_EN, LOW);
|
||||||
digitalWrite(GPS_RESET, LOW);
|
digitalWrite(GPS_RESET, LOW);
|
||||||
digitalWrite(GPS_VRTC_EN, HIGH);
|
digitalWrite(GPS_VRTC_EN, LOW);
|
||||||
digitalWrite(GPS_SLEEP_INT, HIGH);
|
digitalWrite(GPS_SLEEP_INT, HIGH);
|
||||||
digitalWrite(GPS_RTC_INT, LOW);
|
digitalWrite(GPS_RTC_INT, LOW);
|
||||||
digitalWrite(LED_PIN, LOW);
|
digitalWrite(LED_PIN, LOW);
|
||||||
|
|||||||
81
variants/xiao_nrf52/platformio.ini
Normal file
81
variants/xiao_nrf52/platformio.ini
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
[nrf52840_xiao]
|
||||||
|
extends = nrf52_base
|
||||||
|
platform_packages =
|
||||||
|
toolchain-gccarmnoneeabi@~1.100301.0
|
||||||
|
framework-arduinoadafruitnrf52
|
||||||
|
board = seeed-xiao-afruitnrf52-nrf52840
|
||||||
|
board_build.ldscript = boards/nrf52840_s140_v7.ld
|
||||||
|
build_flags = ${nrf52_base.build_flags}
|
||||||
|
-D NRF52_PLATFORM -D XIAO_NRF52
|
||||||
|
-I lib/nrf52/s140_nrf52_7.3.0_API/include
|
||||||
|
-I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
|
||||||
|
lib_ignore =
|
||||||
|
BluetoothOTA
|
||||||
|
lvgl
|
||||||
|
lib5b4
|
||||||
|
lib_deps =
|
||||||
|
${nrf52_base.lib_deps}
|
||||||
|
rweather/Crypto @ ^0.4.0
|
||||||
|
|
||||||
|
[Xiao_nrf52]
|
||||||
|
extends = nrf52840_xiao
|
||||||
|
;board_build.ldscript = boards/nrf52840_s140_v7.ld
|
||||||
|
build_flags = ${nrf52840_xiao.build_flags}
|
||||||
|
-D P_LORA_TX_LED=11
|
||||||
|
-I variants/xiao_nrf52
|
||||||
|
-I src/helpers/nrf52
|
||||||
|
-D RADIO_CLASS=CustomSX1262
|
||||||
|
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
||||||
|
-D LORA_TX_POWER=22
|
||||||
|
-D SX126X_CURRENT_LIMIT=130
|
||||||
|
-D SX126X_RX_BOOSTED_GAIN=1
|
||||||
|
build_src_filter = ${nrf52840_xiao.build_src_filter}
|
||||||
|
+<helpers/*.cpp>
|
||||||
|
+<helpers/nrf52/XiaoNrf52Board.cpp>
|
||||||
|
+<../variants/xiao_nrf52>
|
||||||
|
debug_tool = jlink
|
||||||
|
upload_protocol = nrfutil
|
||||||
|
|
||||||
|
[env:Xiao_nrf52_companion_radio_ble]
|
||||||
|
extends = Xiao_nrf52
|
||||||
|
build_flags =
|
||||||
|
${Xiao_nrf52.build_flags}
|
||||||
|
-D MAX_CONTACTS=100
|
||||||
|
-D MAX_GROUP_CHANNELS=8
|
||||||
|
-D BLE_PIN_CODE=123456
|
||||||
|
; -D BLE_DEBUG_LOGGING=1
|
||||||
|
; -D ENABLE_PRIVATE_KEY_IMPORT=1
|
||||||
|
; -D ENABLE_PRIVATE_KEY_EXPORT=1
|
||||||
|
-D MESH_PACKET_LOGGING=1
|
||||||
|
-D MESH_DEBUG=1
|
||||||
|
build_src_filter = ${Xiao_nrf52.build_src_filter}
|
||||||
|
+<helpers/nrf52/SerialBLEInterface.cpp>
|
||||||
|
+<../examples/companion_radio/main.cpp>
|
||||||
|
lib_deps =
|
||||||
|
${Xiao_nrf52.lib_deps}
|
||||||
|
densaugeo/base64 @ ~1.4.0
|
||||||
|
|
||||||
|
[env:Xiao_nrf52_alt_pinout_companion_radio_ble]
|
||||||
|
extends = env:Xiao_nrf52_companion_radio_ble
|
||||||
|
build_flags =
|
||||||
|
${env:Xiao_nrf52_companion_radio_ble.build_flags}
|
||||||
|
-D SX1262_XIAO_S3_VARIANT
|
||||||
|
|
||||||
|
[env:Xiao_nrf52_repeater]
|
||||||
|
extends = Xiao_nrf52
|
||||||
|
build_flags =
|
||||||
|
${Xiao_nrf52.build_flags}
|
||||||
|
-D ADVERT_NAME='"Xiao_nrf52 Repeater"'
|
||||||
|
-D ADVERT_LAT=0.0
|
||||||
|
-D ADVERT_LON=0.0
|
||||||
|
-D ADMIN_PASSWORD='"password"'
|
||||||
|
; -D MESH_PACKET_LOGGING=1
|
||||||
|
; -D MESH_DEBUG=1
|
||||||
|
build_src_filter = ${Xiao_nrf52.build_src_filter}
|
||||||
|
+<../examples/simple_repeater/main.cpp>
|
||||||
|
|
||||||
|
[env:Xiao_nrf52_alt_pinout_repeater]
|
||||||
|
extends = env:Xiao_nrf52_repeater
|
||||||
|
build_flags =
|
||||||
|
${env:Xiao_nrf52_repeater.build_flags}
|
||||||
|
-D SX1262_XIAO_S3_VARIANT
|
||||||
68
variants/xiao_nrf52/target.cpp
Normal file
68
variants/xiao_nrf52/target.cpp
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
#include <Arduino.h>
|
||||||
|
#include "target.h"
|
||||||
|
#include <helpers/ArduinoHelpers.h>
|
||||||
|
|
||||||
|
XiaoNrf52Board board;
|
||||||
|
|
||||||
|
RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
|
||||||
|
|
||||||
|
WRAPPER_CLASS radio_driver(radio, board);
|
||||||
|
|
||||||
|
VolatileRTCClock rtc_clock;
|
||||||
|
|
||||||
|
#ifndef LORA_CR
|
||||||
|
#define LORA_CR 5
|
||||||
|
#endif
|
||||||
|
|
||||||
|
bool radio_init() {
|
||||||
|
// rtc_clock.begin(Wire);
|
||||||
|
|
||||||
|
#ifdef SX126X_DIO3_TCXO_VOLTAGE
|
||||||
|
float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
|
||||||
|
#else
|
||||||
|
float tcxo = 1.6f;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
|
||||||
|
SPI.begin();
|
||||||
|
int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, tcxo);
|
||||||
|
if (status != RADIOLIB_ERR_NONE) {
|
||||||
|
Serial.print("ERROR: radio init failed: ");
|
||||||
|
Serial.println(status);
|
||||||
|
return false; // fail
|
||||||
|
}
|
||||||
|
|
||||||
|
radio.setCRC(1);
|
||||||
|
|
||||||
|
#ifdef SX126X_CURRENT_LIMIT
|
||||||
|
radio.setCurrentLimit(SX126X_CURRENT_LIMIT);
|
||||||
|
#endif
|
||||||
|
#ifdef SX126X_DIO2_AS_RF_SWITCH
|
||||||
|
radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
|
||||||
|
#endif
|
||||||
|
#ifdef SX126X_RX_BOOSTED_GAIN
|
||||||
|
radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return true; // success
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t radio_get_rng_seed() {
|
||||||
|
return radio.random(0x7FFFFFFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
|
||||||
|
radio.setFrequency(freq);
|
||||||
|
radio.setSpreadingFactor(sf);
|
||||||
|
radio.setBandwidth(bw);
|
||||||
|
radio.setCodingRate(cr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void radio_set_tx_power(uint8_t dbm) {
|
||||||
|
radio.setOutputPower(dbm);
|
||||||
|
}
|
||||||
|
|
||||||
|
mesh::LocalIdentity radio_new_identity() {
|
||||||
|
RadioNoiseListener rng(radio);
|
||||||
|
return mesh::LocalIdentity(&rng); // create new random identity
|
||||||
|
}
|
||||||
18
variants/xiao_nrf52/target.h
Normal file
18
variants/xiao_nrf52/target.h
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define RADIOLIB_STATIC_ONLY 1
|
||||||
|
#include <RadioLib.h>
|
||||||
|
#include <helpers/RadioLibWrappers.h>
|
||||||
|
#include <helpers/nrf52/XiaoNrf52Board.h>
|
||||||
|
#include <helpers/CustomSX1262Wrapper.h>
|
||||||
|
#include <helpers/ArduinoHelpers.h>
|
||||||
|
|
||||||
|
extern XiaoNrf52Board board;
|
||||||
|
extern WRAPPER_CLASS radio_driver;
|
||||||
|
extern VolatileRTCClock rtc_clock;
|
||||||
|
|
||||||
|
bool radio_init();
|
||||||
|
uint32_t radio_get_rng_seed();
|
||||||
|
void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
|
||||||
|
void radio_set_tx_power(uint8_t dbm);
|
||||||
|
mesh::LocalIdentity radio_new_identity();
|
||||||
78
variants/xiao_nrf52/variant.cpp
Normal file
78
variants/xiao_nrf52/variant.cpp
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
#include "variant.h"
|
||||||
|
#include "wiring_constants.h"
|
||||||
|
#include "wiring_digital.h"
|
||||||
|
#include "nrf.h"
|
||||||
|
|
||||||
|
const uint32_t g_ADigitalPinMap[] =
|
||||||
|
{
|
||||||
|
// D0 .. D10
|
||||||
|
2, // D0 is P0.02 (A0)
|
||||||
|
3, // D1 is P0.03 (A1)
|
||||||
|
28, // D2 is P0.28 (A2)
|
||||||
|
29, // D3 is P0.29 (A3)
|
||||||
|
4, // D4 is P0.04 (A4,SDA)
|
||||||
|
5, // D5 is P0.05 (A5,SCL)
|
||||||
|
43, // D6 is P1.11 (TX)
|
||||||
|
44, // D7 is P1.12 (RX)
|
||||||
|
45, // D8 is P1.13 (SCK)
|
||||||
|
46, // D9 is P1.14 (MISO)
|
||||||
|
47, // D10 is P1.15 (MOSI)
|
||||||
|
|
||||||
|
// LEDs
|
||||||
|
26, // D11 is P0.26 (LED RED)
|
||||||
|
6, // D12 is P0.06 (LED BLUE)
|
||||||
|
30, // D13 is P0.30 (LED GREEN)
|
||||||
|
14, // D14 is P0.14 (READ_BAT)
|
||||||
|
|
||||||
|
// LSM6DS3TR
|
||||||
|
40, // D15 is P1.08 (6D_PWR)
|
||||||
|
27, // D16 is P0.27 (6D_I2C_SCL)
|
||||||
|
7, // D17 is P0.07 (6D_I2C_SDA)
|
||||||
|
11, // D18 is P0.11 (6D_INT1)
|
||||||
|
|
||||||
|
// MIC
|
||||||
|
42, // D19 is P1.10 (MIC_PWR)
|
||||||
|
32, // D20 is P1.00 (PDM_CLK)
|
||||||
|
16, // D21 is P0.16 (PDM_DATA)
|
||||||
|
|
||||||
|
// BQ25100
|
||||||
|
13, // D22 is P0.13 (HICHG)
|
||||||
|
17, // D23 is P0.17 (~CHG)
|
||||||
|
|
||||||
|
//
|
||||||
|
21, // D24 is P0.21 (QSPI_SCK)
|
||||||
|
25, // D25 is P0.25 (QSPI_CSN)
|
||||||
|
20, // D26 is P0.20 (QSPI_SIO_0 DI)
|
||||||
|
24, // D27 is P0.24 (QSPI_SIO_1 DO)
|
||||||
|
22, // D28 is P0.22 (QSPI_SIO_2 WP)
|
||||||
|
23, // D29 is P0.23 (QSPI_SIO_3 HOLD)
|
||||||
|
|
||||||
|
// NFC
|
||||||
|
9, // D30 is P0.09 (NFC1)
|
||||||
|
10, // D31 is P0.10 (NFC2)
|
||||||
|
|
||||||
|
// VBAT
|
||||||
|
31, // D32 is P0.31 (VBAT)
|
||||||
|
};
|
||||||
|
|
||||||
|
void initVariant()
|
||||||
|
{
|
||||||
|
// Disable reading of the BAT voltage.
|
||||||
|
// https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
|
||||||
|
pinMode(VBAT_ENABLE, OUTPUT);
|
||||||
|
digitalWrite(VBAT_ENABLE, HIGH);
|
||||||
|
|
||||||
|
// Low charging current.
|
||||||
|
// https://wiki.seeedstudio.com/XIAO_BLE#battery-charging-current
|
||||||
|
pinMode(PIN_CHARGING_CURRENT, INPUT);
|
||||||
|
|
||||||
|
pinMode(PIN_QSPI_CS, OUTPUT);
|
||||||
|
digitalWrite(PIN_QSPI_CS, HIGH);
|
||||||
|
|
||||||
|
pinMode(LED_RED, OUTPUT);
|
||||||
|
digitalWrite(LED_RED, HIGH);
|
||||||
|
pinMode(LED_GREEN, OUTPUT);
|
||||||
|
digitalWrite(LED_GREEN, HIGH);
|
||||||
|
pinMode(LED_BLUE, OUTPUT);
|
||||||
|
digitalWrite(LED_BLUE, HIGH);
|
||||||
|
}
|
||||||
149
variants/xiao_nrf52/variant.h
Normal file
149
variants/xiao_nrf52/variant.h
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
#ifndef _SEEED_XIAO_NRF52840_H_
|
||||||
|
#define _SEEED_XIAO_NRF52840_H_
|
||||||
|
|
||||||
|
/** Master clock frequency */
|
||||||
|
#define VARIANT_MCK (64000000ul)
|
||||||
|
|
||||||
|
#define USE_LFXO // Board uses 32khz crystal for LF
|
||||||
|
//#define USE_LFRC // Board uses RC for LF
|
||||||
|
|
||||||
|
/*----------------------------------------------------------------------------
|
||||||
|
* Headers
|
||||||
|
*----------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
#include "WVariant.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
#endif // __cplusplus
|
||||||
|
|
||||||
|
#define PINS_COUNT (33)
|
||||||
|
#define NUM_DIGITAL_PINS (33)
|
||||||
|
#define NUM_ANALOG_INPUTS (8)
|
||||||
|
#define NUM_ANALOG_OUTPUTS (0)
|
||||||
|
|
||||||
|
// LEDs
|
||||||
|
#define PIN_LED (LED_RED)
|
||||||
|
#define LED_PWR (PINS_COUNT)
|
||||||
|
#define PIN_NEOPIXEL (PINS_COUNT)
|
||||||
|
#define NEOPIXEL_NUM (0)
|
||||||
|
|
||||||
|
#define LED_BUILTIN (PIN_LED)
|
||||||
|
|
||||||
|
#define LED_RED (11)
|
||||||
|
#define LED_GREEN (13)
|
||||||
|
#define LED_BLUE (12)
|
||||||
|
|
||||||
|
#define LED_STATE_ON (1) // State when LED is litted
|
||||||
|
|
||||||
|
// Buttons
|
||||||
|
#define PIN_BUTTON1 (PINS_COUNT)
|
||||||
|
|
||||||
|
// Digital PINs
|
||||||
|
static const uint8_t D0 = 0 ;
|
||||||
|
static const uint8_t D1 = 1 ;
|
||||||
|
static const uint8_t D2 = 2 ;
|
||||||
|
static const uint8_t D3 = 3 ;
|
||||||
|
static const uint8_t D4 = 4 ;
|
||||||
|
static const uint8_t D5 = 5 ;
|
||||||
|
static const uint8_t D6 = 6 ;
|
||||||
|
static const uint8_t D7 = 7 ;
|
||||||
|
static const uint8_t D8 = 8 ;
|
||||||
|
static const uint8_t D9 = 9 ;
|
||||||
|
static const uint8_t D10 = 10;
|
||||||
|
|
||||||
|
#define VBAT_ENABLE (14) // Output LOW to enable reading of the BAT voltage.
|
||||||
|
// https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
|
||||||
|
|
||||||
|
#define PIN_CHARGING_CURRENT (22) // Battery Charging current
|
||||||
|
// https://wiki.seeedstudio.com/XIAO_BLE#battery-charging-current
|
||||||
|
|
||||||
|
// Analog pins
|
||||||
|
#define PIN_A0 (0)
|
||||||
|
#define PIN_A1 (1)
|
||||||
|
#define PIN_A2 (2)
|
||||||
|
#define PIN_A3 (3)
|
||||||
|
#define PIN_A4 (4)
|
||||||
|
#define PIN_A5 (5)
|
||||||
|
#define PIN_VBAT (32) // Read the BAT voltage.
|
||||||
|
// https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
|
||||||
|
|
||||||
|
#define BAT_NOT_CHARGING (23) // LOW when charging
|
||||||
|
|
||||||
|
#define AREF_VOLTAGE (3.0)
|
||||||
|
#define ADC_MULTIPLIER (3.0F) // 1M, 512k divider bridge
|
||||||
|
|
||||||
|
static const uint8_t A0 = PIN_A0;
|
||||||
|
static const uint8_t A1 = PIN_A1;
|
||||||
|
static const uint8_t A2 = PIN_A2;
|
||||||
|
static const uint8_t A3 = PIN_A3;
|
||||||
|
static const uint8_t A4 = PIN_A4;
|
||||||
|
static const uint8_t A5 = PIN_A5;
|
||||||
|
|
||||||
|
#define ADC_RESOLUTION (12)
|
||||||
|
|
||||||
|
// Other pins
|
||||||
|
#define PIN_NFC1 (30)
|
||||||
|
#define PIN_NFC2 (31)
|
||||||
|
|
||||||
|
// Serial interfaces
|
||||||
|
#define PIN_SERIAL1_RX (7)
|
||||||
|
#define PIN_SERIAL1_TX (6)
|
||||||
|
|
||||||
|
// SPI Interfaces
|
||||||
|
#define SPI_INTERFACES_COUNT (2)
|
||||||
|
|
||||||
|
#define PIN_SPI_MISO (9)
|
||||||
|
#define PIN_SPI_MOSI (10)
|
||||||
|
#define PIN_SPI_SCK (8)
|
||||||
|
|
||||||
|
static const uint8_t SS = D3; // NSS for sx ?
|
||||||
|
static const uint8_t MOSI = PIN_SPI_MOSI;
|
||||||
|
static const uint8_t MISO = PIN_SPI_MISO;
|
||||||
|
static const uint8_t SCK = PIN_SPI_SCK ;
|
||||||
|
|
||||||
|
#define PIN_SPI1_MISO (25)
|
||||||
|
#define PIN_SPI1_MOSI (26)
|
||||||
|
#define PIN_SPI1_SCK (29)
|
||||||
|
|
||||||
|
// Wire Interfaces
|
||||||
|
#define WIRE_INTERFACES_COUNT (1)
|
||||||
|
|
||||||
|
#define PIN_WIRE_SDA (17) // 4 and 5 are used for the sx1262 !
|
||||||
|
#define PIN_WIRE_SCL (16) // use WIRE1_SDA
|
||||||
|
|
||||||
|
static const uint8_t SDA = PIN_WIRE_SDA;
|
||||||
|
static const uint8_t SCL = PIN_WIRE_SCL;
|
||||||
|
|
||||||
|
//#define PIN_WIRE1_SDA (17)
|
||||||
|
//#define PIN_WIRE1_SCL (16)
|
||||||
|
#define PIN_LSM6DS3TR_C_POWER (15)
|
||||||
|
#define PIN_LSM6DS3TR_C_INT1 (18)
|
||||||
|
|
||||||
|
// PDM Interfaces
|
||||||
|
#define PIN_PDM_PWR (19)
|
||||||
|
#define PIN_PDM_CLK (20)
|
||||||
|
#define PIN_PDM_DIN (21)
|
||||||
|
|
||||||
|
// QSPI Pins
|
||||||
|
#define PIN_QSPI_SCK (24)
|
||||||
|
#define PIN_QSPI_CS (25)
|
||||||
|
#define PIN_QSPI_IO0 (26)
|
||||||
|
#define PIN_QSPI_IO1 (27)
|
||||||
|
#define PIN_QSPI_IO2 (28)
|
||||||
|
#define PIN_QSPI_IO3 (29)
|
||||||
|
|
||||||
|
// On-board QSPI Flash
|
||||||
|
#define EXTERNAL_FLASH_DEVICES (P25Q16H)
|
||||||
|
#define EXTERNAL_FLASH_USE_QSPI
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*----------------------------------------------------------------------------
|
||||||
|
* Arduino objects - C++ only
|
||||||
|
*----------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user