DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into rx_delay

Browse Source
This commit is contained in:
Scott Powell
2025-02-06 10:54:52 +11:00
parent b428ecf31f cc0ba10cf1
commit 55f14d968f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/companion_radio/main.cpp
View File

@@ -619,8 +619,8 @@ public:
memcpy(&freq, &cmd_frame[i], 4); i += 4; memcpy(&freq, &cmd_frame[i], 4); i += 4;
uint32_t bw; uint32_t bw;
memcpy(&bw, &cmd_frame[i], 4); i += 4; memcpy(&bw, &cmd_frame[i], 4); i += 4;
uint8_t sf = out_frame[i++]; uint8_t sf = cmd_frame[i++];
uint8_t cr = out_frame[i++]; uint8_t cr = cmd_frame[i++];
if (freq >= 300000 && freq <= 2500000 && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7000 && bw <= 500000) { if (freq >= 300000 && freq <= 2500000 && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7000 && bw <= 500000) {
_prefs.sf = sf; _prefs.sf = sf;
@@ -630,6 +630,7 @@ public:
savePrefs(); savePrefs();
writeOKFrame(); // reboot now required! writeOKFrame(); // reboot now required!
} else { } else {
MESH_DEBUG_PRINTLN("Error: CMD_SET_RADIO_PARAMS: f=%d, bw=%d, sf=%d, cr=%d", freq, bw, (uint32_t)sf, (uint32_t)cr);
writeErrFrame(); writeErrFrame();
} }
} else if (cmd_frame[0] == CMD_SET_RADIO_TX_POWER) { } else if (cmd_frame[0] == CMD_SET_RADIO_TX_POWER) {

2
src/helpers/nrf52/RAK4631Board.h
View File

@@ -18,7 +18,7 @@
// built-ins // built-ins
#define PIN_VBAT_READ 5 #define PIN_VBAT_READ 5
#define ADC_MULTIPLIER (3 * 1.73 * 1000) #define ADC_MULTIPLIER (3 * 1.73 * 1.187 * 1000)
class RAK4631Board : public mesh::MainBoard { class RAK4631Board : public mesh::MainBoard {
protected: protected: