Git-Mirrors/RNode_Firmware_CE
1
0
Fork 0
mirror of https://github.com/liberatedsystems/RNode_Firmware_CE.git synced 2025-04-25 01:49:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test RAK4631 and fix freeze from updating modem parameters when online

Browse Source
This commit is contained in:
jacob.eva 2025-01-04 10:04:36 +00:00
parent 9c8f5cbfef
commit 8473594d02
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
3 changed files with 29 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Boards.h
View File

@ -711,7 +711,7 @@
#define INTERFACE_COUNT 1
// first interface in list is the primary
const uint8_t interfaces[INTERFACE_COUNT] = {SX1262};
const uint8_t interfaces[INTERFACE_COUNT] = {INT_SX1262};
const bool interface_cfg[INTERFACE_COUNT][3] = {
// SX1262
{

74
RNode_Firmware_CE.ino
View File

@ -578,8 +578,7 @@ bool startRadio(PhysicalLayer* radio, uint8_t index) {
struct radio_vars* config = &radio_details[index];
//update_radio_lock(radio);
//if (modems_installed && !console_active) {
//if (!radio->getRadioLock() && hw_ready) {
if (!config->radio_online) {
int16_t status = 0;
switch (interfaces[index]) {
@ -656,12 +655,13 @@ bool startRadio(PhysicalLayer* radio, uint8_t index) {
// led_indicate_warning(3);
// return false;
//}
//} else {
// // If radio is already on, we silently
// // ignore the request.
// kiss_indicate_radiostate(radio);
// return true;
//}
} else {
// If the radio is already initialised then update the parameters and bitrate.
update_radio_params(radio, &radio_details[index]);
update_bitrate(radio, index);
kiss_indicate_radiostate(index);
return true;
}
}
void stopRadio(PhysicalLayer* radio, uint8_t index) {
@ -918,13 +918,11 @@ void serialCallback(uint8_t sbyte) {
if (radio_details[interface].radio_online) {
if (op_mode == MODE_HOST) status = selected_radio->setFrequency(freq_f);
}
if (status == RADIOLIB_ERR_NONE) {
radio_details[interface].freq = freq_f;
}
radio_details[interface].freq = freq_f;
kiss_indicate_frequency(interface);
}
interface = 0;
}
interface = 0;
} else if (command == CMD_BANDWIDTH) {
if (sbyte == FESC) {
ESCAPE = true;
@ -946,18 +944,13 @@ void serialCallback(uint8_t sbyte) {
kiss_indicate_bandwidth(interface);
} else {
float bw_f = bw / 1000.0;
if (radio_details[interface].radio_online) {
if (op_mode == MODE_HOST) set_bandwidth(selected_radio, interface, bw_f);
update_bitrate(selected_radio, interface);
kiss_indicate_phy_stats(interface);
} else {
radio_details[interface].bw = bw_f;
}
radio_details[interface].bw = bw_f;
sort_interfaces();
kiss_indicate_bandwidth(interface);
}
interface = 0;
}
interface = 0;
} else if (command == CMD_TXPOWER) {
selected_radio = interface_obj[interface];
@ -966,11 +959,8 @@ void serialCallback(uint8_t sbyte) {
} else {
int8_t txp = (int8_t)sbyte;
if (radio_details[interface].radio_online) {
if (op_mode == MODE_HOST) setTXPower(selected_radio, interface, txp);
} else {
radio_details[interface].txp = txp;
}
if (op_mode == MODE_HOST) setTXPower(selected_radio, interface, txp);
//radio_details[interface].txp = txp; todo fix this path
kiss_indicate_txpower(interface);
}
interface = 0;
@ -984,13 +974,7 @@ void serialCallback(uint8_t sbyte) {
if (sf < 5) sf = 5;
if (sf > 12) sf = 12;
if (radio_details[interface].radio_online) {
if (op_mode == MODE_HOST) set_spreading_factor(selected_radio, interface, sf);
update_bitrate(selected_radio, interface);
kiss_indicate_phy_stats(interface);
} else {
radio_details[interface].sf = sf;
}
radio_details[interface].sf = sf;
sort_interfaces();
kiss_indicate_spreadingfactor(interface);
}
@ -1004,13 +988,7 @@ void serialCallback(uint8_t sbyte) {
if (cr < 5) cr = 5;
if (cr > 8) cr = 8;
if (radio_details[interface].radio_online) {
if (op_mode == MODE_HOST) set_coding_rate(selected_radio, interface, cr);
update_bitrate(selected_radio, interface);
kiss_indicate_phy_stats(interface);
} else {
radio_details[interface].cr = cr;
}
radio_details[interface].cr = cr;
sort_interfaces();
kiss_indicate_codingrate(interface);
}
@ -1051,16 +1029,16 @@ void serialCallback(uint8_t sbyte) {
}
if (frame_len == 2) {
uint16_t at = (uint16_t)cmdbuf[0] << 8 | (uint16_t)cmdbuf[1];
uint16_t at = (uint16_t)cmdbuf[0] << 8 | (uint16_t)cmdbuf[1];
if (at == 0) {
radio_details[interface].st_airtime_limit = 0.0;
} else {
int st_airtime_limit = (float)at/(100.0*100.0);
if (st_airtime_limit >= 1.0) { st_airtime_limit = 0.0; }
radio_details[interface].st_airtime_limit = st_airtime_limit;
}
kiss_indicate_st_alock(interface);
if (at == 0) {
radio_details[interface].st_airtime_limit = 0.0;
} else {
int st_airtime_limit = (float)at/(100.0*100.0);
if (st_airtime_limit >= 1.0) { st_airtime_limit = 0.0; }
radio_details[interface].st_airtime_limit = st_airtime_limit;
}
kiss_indicate_st_alock(interface);
}
interface = 0;
} else if (command == CMD_LT_ALOCK) {

4
Utilities.h
View File

@ -971,8 +971,8 @@ void update_radio_params(PhysicalLayer* radio, struct radio_vars* config) {
params.lora.bandwidth = config->bw;
int16_t status = radio->setDataRate(params);
if (status != RADIOLIB_ERR_NONE) {
kiss_indicate_error(ERROR_INITRADIO);
led_indicate_error(0);
kiss_indicate_error(ERROR_INITRADIO);
led_indicate_error(0);
}
}