Mirrors
/
RNode_Firmware
mirror of https://github.com/markqvist/RNode_Firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved T-Beam compatibility

This commit is contained in:
Mark Qvist 2022-01-14 21:41:10 +01:00
parent 1afc9fd2a9
commit 4511a10cc6
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config.h
View File

@ -4,7 +4,7 @@
#define CONFIG_H #define CONFIG_H
#define MAJ_VERS 0x01 #define MAJ_VERS 0x01
#define MIN_VERS 0x16 #define MIN_VERS 0x17
#define PLATFORM_AVR 0x90 #define PLATFORM_AVR 0x90
#define PLATFORM_ESP32 0x80 #define PLATFORM_ESP32 0x80

14
LoRa.cpp
View File

@ -242,7 +242,7 @@ uint8_t LoRaClass::packetRssiRaw() {
return pkt_rssi_value; return pkt_rssi_value;
} }
int LoRaClass::packetRssi() { int ISR_VECT LoRaClass::packetRssi() {
int pkt_rssi = (int)readRegister(REG_PKT_RSSI_VALUE) - RSSI_OFFSET; int pkt_rssi = (int)readRegister(REG_PKT_RSSI_VALUE) - RSSI_OFFSET;
int pkt_snr = packetSnr(); int pkt_snr = packetSnr();
@ -260,11 +260,11 @@ int LoRaClass::packetRssi() {
return pkt_rssi; return pkt_rssi;
} }
uint8_t LoRaClass::packetSnrRaw() { uint8_t ISR_VECT LoRaClass::packetSnrRaw() {
return readRegister(REG_PKT_SNR_VALUE); return readRegister(REG_PKT_SNR_VALUE);
} }
float LoRaClass::packetSnr() { float ISR_VECT LoRaClass::packetSnr() {
return ((int8_t)readRegister(REG_PKT_SNR_VALUE)) * 0.25; return ((int8_t)readRegister(REG_PKT_SNR_VALUE)) * 0.25;
} }
@ -312,12 +312,12 @@ size_t LoRaClass::write(const uint8_t *buffer, size_t size)
return size; return size;
} }
int LoRaClass::available() int ISR_VECT LoRaClass::available()
{ {
return (readRegister(REG_RX_NB_BYTES) - _packetIndex); return (readRegister(REG_RX_NB_BYTES) - _packetIndex);
} }
int LoRaClass::read() int ISR_VECT LoRaClass::read()
{ {
if (!available()) { if (!available()) {
return -1; return -1;
@ -623,7 +623,7 @@ void ISR_VECT LoRaClass::handleDio0Rise()
} }
} }
uint8_t LoRaClass::readRegister(uint8_t address) uint8_t ISR_VECT LoRaClass::readRegister(uint8_t address)
{ {
return singleTransfer(address & 0x7f, 0x00); return singleTransfer(address & 0x7f, 0x00);
} }
@ -633,7 +633,7 @@ void LoRaClass::writeRegister(uint8_t address, uint8_t value)
singleTransfer(address | 0x80, value); singleTransfer(address | 0x80, value);
} }
uint8_t LoRaClass::singleTransfer(uint8_t address, uint8_t value) uint8_t ISR_VECT LoRaClass::singleTransfer(uint8_t address, uint8_t value)
{ {
uint8_t response; uint8_t response;

10
RNode_Firmware.ino
View File

@ -193,10 +193,11 @@ void ISR_VECT receive_callback(int packet_size) {
#endif #endif
} }
} else { } else {
#if MCU_VARIANT != MCU_ESP32
// In promiscuous mode, raw packets are // In promiscuous mode, raw packets are
// output directly to the host // output directly to the host
read_len = 0; read_len = 0;
#if MCU_VARIANT != MCU_ESP32
last_rssi = LoRa.packetRssi(); last_rssi = LoRa.packetRssi();
last_snr_raw = LoRa.packetSnrRaw(); last_snr_raw = LoRa.packetSnrRaw();
getPacketData(packet_size); getPacketData(packet_size);
@ -210,7 +211,6 @@ void ISR_VECT receive_callback(int packet_size) {
kiss_write_packet(); kiss_write_packet();
#else #else
read_len = 0;
getPacketData(packet_size); getPacketData(packet_size);
packet_ready = true; packet_ready = true;
#endif #endif
@ -700,6 +700,12 @@ void loop() {
#if MCU_VARIANT == MCU_ESP32 #if MCU_VARIANT == MCU_ESP32
if (packet_ready) { if (packet_ready) {
portENTER_CRITICAL(&update_lock);
last_rssi = LoRa.packetRssi();
last_snr_raw = LoRa.packetSnrRaw();
portEXIT_CRITICAL(&update_lock);
kiss_indicate_stat_rssi();
kiss_indicate_stat_snr();
kiss_write_packet(); kiss_write_packet();
} }
#endif #endif