Git-Mirrors/RNode_Firmware_CE
1
0
Fork 0
mirror of https://github.com/liberatedsystems/RNode_Firmware_CE.git synced 2025-07-21 05:51:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable SX1272/6/8 support again

Browse source
This commit is contained in:
jacob.eva 2025-01-01 17:29:47 +00:00
parent e68fe37fb1
commit 9c8f5cbfef
No known key found for this signature in database
GPG key ID: 0B92E083BBCCAA1E
3 changed files with 32 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Boards.h
View file

@ -290,7 +290,7 @@
}; };
#elif BOARD_MODEL == BOARD_LORA32_V2_1 #elif BOARD_MODEL == BOARD_LORA32_V2_1
#define HAS_DISPLAY true #define HAS_DISPLAY false
#define DISPLAY OLED #define DISPLAY OLED
#define HAS_BLUETOOTH true #define HAS_BLUETOOTH true
#define HAS_BLE true #define HAS_BLE true
@ -299,7 +299,7 @@
#define HAS_EEPROM true #define HAS_EEPROM true
#define INTERFACE_COUNT 1 #define INTERFACE_COUNT 1
const uint8_t interfaces[INTERFACE_COUNT] = {SX127X}; const uint8_t interfaces[INTERFACE_COUNT] = {INT_SX1276};
#if HAS_TCXO == true #if HAS_TCXO == true
const bool interface_cfg[INTERFACE_COUNT][3] = { const bool interface_cfg[INTERFACE_COUNT][3] = {
// SX127X // SX127X

5
Interfaces.h
View file

@ -1,6 +1,7 @@
#define INT_SX127X 0x00 #define INT_SX127X 0x00
#define INT_SX1276 0x01 #define INT_SX1272 0x01
#define INT_SX1278 0x02 #define INT_SX1276 0x02
#define INT_SX1278 0x03
#define INT_SX126X 0x10 #define INT_SX126X 0x10
#define INT_SX1262 0x11 #define INT_SX1262 0x11
#define INT_SX128X 0x20 #define INT_SX128X 0x20

63
RNode_Firmware_CE.ino
View file

@ -88,6 +88,19 @@ char sbuf[128];
uint8_t *packet_queue[INTERFACE_COUNT]; uint8_t *packet_queue[INTERFACE_COUNT];
void ISR_VECT packet_received() {
if (!tx_flag) {
for (int i = 0; i < INTERFACE_COUNT; i++) {
if (digitalRead(interface_pins[i][5])) {
receive_callback(interface_obj[i], i, interface_obj[i]->getPacketLength());
break;
}
}
} else {
tx_flag = false;
}
}
void setup() { void setup() {
#if MCU_VARIANT == MCU_ESP32 #if MCU_VARIANT == MCU_ESP32
boot_seq(); boot_seq();
@ -205,8 +218,7 @@ void setup() {
break; break;
} }
// \todo CURRENTLY NOT SUPPORTED DUE TO REQUIREMENT FOR DIO1 pin in RadioLib, should be fixed soon... case INT_SX1272:
/*case INT_SX1272:
{ {
SX1272* radio; SX1272* radio;
if (interface_cfg[i][0]) { if (interface_cfg[i][0]) {
@ -227,7 +239,7 @@ void setup() {
config->bw = 125.0; config->bw = 125.0;
status = radio->begin(config->freq, config->bw, config->sf, config->cr, 0x12, config->txp); status = radio->begin(config->freq, config->bw, config->sf, config->cr, 0x12, config->txp);
radio->setDio1Action(packet_received); radio->setDio1Action(packet_received, RISING);
if (status == RADIOLIB_ERR_NONE) { if (status == RADIOLIB_ERR_NONE) {
status = radio->explicitHeader(); status = radio->explicitHeader();
} }
@ -248,8 +260,8 @@ void setup() {
if (interface_cfg[i][0]) { if (interface_cfg[i][0]) {
radio = new SX1276(new Module(interface_pins[i][0], interface_pins[i][5], interface_pins[i][6], RADIOLIB_NC)); radio = new SX1276(new Module(interface_pins[i][0], interface_pins[i][5], interface_pins[i][6], RADIOLIB_NC));
} else { } else {
radio = new SX1276(new Module(interface_pins[i][0], interface_pins[i][5], interface_pins[i][6], RADIOLIB_NC, interface_spi[0]));
interface_spi[0].begin(); interface_spi[0].begin();
}radio = new SX1276(new Module(interface_pins[i][0], interface_pins[i][5], interface_pins[i][6], RADIOLIB_NC, interface_spi[0]));
} }
interface_obj[i] = (PhysicalLayer*)radio; interface_obj[i] = (PhysicalLayer*)radio;
@ -261,9 +273,10 @@ void setup() {
config->sf = 7; config->sf = 7;
config->cr = 7; config->cr = 7;
config->bw = 125.0; config->bw = 125.0;
config->txp = 2; // txpower can only be set to minimum of 2dBm on this model
status = radio->begin(config->freq, config->bw, config->sf, config->cr, 0x12, config->txp); status = radio->begin(config->freq, config->bw, config->sf, config->cr, 0x12, config->txp);
radio->setDio1Action(packet_received); radio->setDio0Action(packet_received, RISING);
if (status == RADIOLIB_ERR_NONE) { if (status == RADIOLIB_ERR_NONE) {
status = radio->explicitHeader(); status = radio->explicitHeader();
} }
@ -299,7 +312,7 @@ void setup() {
config->bw = 125.0; config->bw = 125.0;
status = radio->begin(config->freq, config->bw, config->sf, config->cr, 0x12, config->txp); status = radio->begin(config->freq, config->bw, config->sf, config->cr, 0x12, config->txp);
radio->setDio1Action(packet_received); radio->setDio1Action(packet_received, RISING);
if (status == RADIOLIB_ERR_NONE) { if (status == RADIOLIB_ERR_NONE) {
status = radio->explicitHeader(); status = radio->explicitHeader();
} }
@ -314,7 +327,6 @@ void setup() {
} }
break; break;
} }
*/
case INT_SX1280: case INT_SX1280:
{ {
@ -454,19 +466,6 @@ void setup() {
validate_status(); validate_status();
} }
void ISR_VECT packet_received() {
if (!tx_flag) {
for (int i = 0; i < INTERFACE_COUNT; i++) {
if (digitalRead(interface_pins[i][5])) {
receive_callback(interface_obj[i], i, interface_obj[i]->getPacketLength());
break;
}
}
} else {
tx_flag = false;
}
}
inline void kiss_write_packet(int index) { inline void kiss_write_packet(int index) {
// We need to convert the interface index to the command byte representation // We need to convert the interface index to the command byte representation
uint8_t cmd_byte = getInterfaceCommandByte(index); uint8_t cmd_byte = getInterfaceCommandByte(index);
@ -593,9 +592,16 @@ bool startRadio(PhysicalLayer* radio, uint8_t index) {
update_radio_params(radio, config); update_radio_params(radio, config);
radio->setFrequency(config->freq); radio->setFrequency(config->freq);
break; break;
case INT_SX1272:
case INT_SX1276: case INT_SX1276:
case INT_SX1278: case INT_SX1278:
// \todo // wake up module
digitalWrite(interface_pins[index][0], LOW);
delay(10);
digitalWrite(interface_pins[index][0], HIGH);
status = radio->standby();
update_radio_params(radio, config);
radio->setFrequency(config->freq);
break; break;
case INT_SX1280: case INT_SX1280:
// wake up module // wake up module
@ -1288,21 +1294,6 @@ void serialCallback(uint8_t sbyte) {
} }
#endif #endif
} else if (command == CMD_FW_LENGTH) {
if (sbyte == FESC) {
ESCAPE = true;
} else {
if (ESCAPE) {
if (sbyte == TFEND) sbyte = FEND;
if (sbyte == TFESC) sbyte = FESC;
ESCAPE = false;
}
if (frame_len < CMD_L) cmdbuf[frame_len++] = sbyte;
}
if (frame_len == FW_LENGTH_LEN) {
set_fw_length(cmdbuf);
}
} }
} }
} }