Skip to content

Commit e727fd5

Browse files
liamcottleliamcottle
authored
Merge pull request #2462 from meshcore-dev/target-dup-cleanup
Refactor: removed duplicated target code
2 parents 679fb9c + 0a8a0a4 commit e727fd5

165 files changed

Lines changed: 110 additions & 1397 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/companion_radio/MyMesh.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,8 +951,8 @@ void MyMesh::begin(bool has_display) {
951951
addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
952952
_store->loadChannels(this);
953953

954-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
955-
radio_set_tx_power(_prefs.tx_power_dbm);
954+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
955+
radio_driver.setTxPower(_prefs.tx_power_dbm);
956956
radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
957957
MESH_DEBUG_PRINTLN("RX Boosted Gain Mode: %s",
958958
radio_driver.getRxBoostedGainMode() ? "Enabled" : "Disabled");
@@ -1374,7 +1374,7 @@ void MyMesh::handleCmdFrame(size_t len) {
13741374
_prefs.client_repeat = repeat;
13751375
savePrefs();
13761376

1377-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
1377+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
13781378
MESH_DEBUG_PRINTLN("OK: CMD_SET_RADIO_PARAMS: f=%d, bw=%d, sf=%d, cr=%d", freq, bw, (uint32_t)sf,
13791379
(uint32_t)cr);
13801380

@@ -1391,7 +1391,7 @@ void MyMesh::handleCmdFrame(size_t len) {
13911391
} else {
13921392
_prefs.tx_power_dbm = power;
13931393
savePrefs();
1394-
radio_set_tx_power(_prefs.tx_power_dbm);
1394+
radio_driver.setTxPower(_prefs.tx_power_dbm);
13951395
writeOKFrame();
13961396
}
13971397
} else if (cmd_frame[0] == CMD_SET_TUNING_PARAMS) {

‎examples/companion_radio/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void setup() {
125125

126126
if (!radio_init()) { halt(); }
127127

128-
fast_rng.begin(radio_get_rng_seed());
128+
fast_rng.begin(radio_driver.getRngSeed());
129129

130130
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
131131
InternalFS.begin();

‎examples/kiss_modem/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ void loadOrCreateIdentity() {
5656
}
5757

5858
void onSetRadio(float freq, float bw, uint8_t sf, uint8_t cr) {
59-
radio_set_params(freq, bw, sf, cr);
59+
radio_driver.setParams(freq, bw, sf, cr);
6060
}
6161

6262
void onSetTxPower(uint8_t power) {
63-
radio_set_tx_power(power);
63+
radio_driver.setTxPower(power);
6464
}
6565

6666
float onGetCurrentRssi() {
@@ -82,7 +82,7 @@ void setup() {
8282

8383
radio_driver.begin();
8484

85-
rng.begin(radio_get_rng_seed());
85+
rng.begin(radio_driver.getRngSeed());
8686
loadOrCreateIdentity();
8787

8888
sensors.begin();

‎examples/simple_repeater/MyMesh.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -953,8 +953,8 @@ void MyMesh::begin(FILESYSTEM *fs) {
953953
}
954954
#endif
955955

956-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
957-
radio_set_tx_power(_prefs.tx_power_dbm);
956+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
957+
radio_driver.setTxPower(_prefs.tx_power_dbm);
958958

959959
radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
960960
MESH_DEBUG_PRINTLN("RX Boosted Gain Mode: %s",
@@ -1050,7 +1050,7 @@ void MyMesh::dumpLogFile() {
10501050
}
10511051

10521052
void MyMesh::setTxPower(int8_t power_dbm) {
1053-
radio_set_tx_power(power_dbm);
1053+
radio_driver.setTxPower(power_dbm);
10541054
}
10551055

10561056
#if defined(USE_SX1262) || defined(USE_SX1268)
@@ -1279,13 +1279,13 @@ void MyMesh::loop() {
12791279

12801280
if (set_radio_at && millisHasNowPassed(set_radio_at)) { // apply pending (temporary) radio params
12811281
set_radio_at = 0; // clear timer
1282-
radio_set_params(pending_freq, pending_bw, pending_sf, pending_cr);
1282+
radio_driver.setParams(pending_freq, pending_bw, pending_sf, pending_cr);
12831283
MESH_DEBUG_PRINTLN("Temp radio params");
12841284
}
12851285

12861286
if (revert_radio_at && millisHasNowPassed(revert_radio_at)) { // revert radio params to orig
12871287
revert_radio_at = 0; // clear timer
1288-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
1288+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
12891289
MESH_DEBUG_PRINTLN("Radio params restored");
12901290
}
12911291

‎examples/simple_repeater/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void setup() {
5757
halt();
5858
}
5959

60-
fast_rng.begin(radio_get_rng_seed());
60+
fast_rng.begin(radio_driver.getRngSeed());
6161

6262
FILESYSTEM* fs;
6363
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

‎examples/simple_room_server/MyMesh.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -691,8 +691,8 @@ void MyMesh::begin(FILESYSTEM *fs) {
691691
}
692692
}
693693

694-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
695-
radio_set_tx_power(_prefs.tx_power_dbm);
694+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
695+
radio_driver.setTxPower(_prefs.tx_power_dbm);
696696

697697
updateAdvertTimer();
698698
updateFloodAdvertTimer();
@@ -796,7 +796,7 @@ void MyMesh::dumpLogFile() {
796796
}
797797

798798
void MyMesh::setTxPower(int8_t power_dbm) {
799-
radio_set_tx_power(power_dbm);
799+
radio_driver.setTxPower(power_dbm);
800800
}
801801

802802
void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
@@ -999,13 +999,13 @@ void MyMesh::loop() {
999999

10001000
if (set_radio_at && millisHasNowPassed(set_radio_at)) { // apply pending (temporary) radio params
10011001
set_radio_at = 0; // clear timer
1002-
radio_set_params(pending_freq, pending_bw, pending_sf, pending_cr);
1002+
radio_driver.setParams(pending_freq, pending_bw, pending_sf, pending_cr);
10031003
MESH_DEBUG_PRINTLN("Temp radio params");
10041004
}
10051005

10061006
if (revert_radio_at && millisHasNowPassed(revert_radio_at)) { // revert radio params to orig
10071007
revert_radio_at = 0; // clear timer
1008-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
1008+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
10091009
MESH_DEBUG_PRINTLN("Radio params restored");
10101010
}
10111011

‎examples/simple_room_server/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void setup() {
3535

3636
if (!radio_init()) { halt(); }
3737

38-
fast_rng.begin(radio_get_rng_seed());
38+
fast_rng.begin(radio_driver.getRngSeed());
3939

4040
FILESYSTEM* fs;
4141
#if defined(NRF52_PLATFORM)

‎examples/simple_secure_chat/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void setup() {
562562

563563
if (!radio_init()) { halt(); }
564564

565-
fast_rng.begin(radio_get_rng_seed());
565+
fast_rng.begin(radio_driver.getRngSeed());
566566

567567
#if defined(NRF52_PLATFORM)
568568
InternalFS.begin();
@@ -577,8 +577,8 @@ void setup() {
577577
#error "need to define filesystem"
578578
#endif
579579

580-
radio_set_params(the_mesh.getFreqPref(), LORA_BW, LORA_SF, LORA_CR);
581-
radio_set_tx_power(the_mesh.getTxPowerPref());
580+
radio_driver.setParams(the_mesh.getFreqPref(), LORA_BW, LORA_SF, LORA_CR);
581+
radio_driver.setTxPower(the_mesh.getTxPowerPref());
582582

583583
the_mesh.showWelcome();
584584

‎examples/simple_sensor/SensorMesh.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,8 @@ void SensorMesh::begin(FILESYSTEM* fs) {
764764
}
765765
}
766766

767-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
768-
radio_set_tx_power(_prefs.tx_power_dbm);
767+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
768+
radio_driver.setTxPower(_prefs.tx_power_dbm);
769769

770770
updateAdvertTimer();
771771
updateFloodAdvertTimer();
@@ -842,7 +842,7 @@ void SensorMesh::updateFloodAdvertTimer() {
842842
}
843843

844844
void SensorMesh::setTxPower(int8_t power_dbm) {
845-
radio_set_tx_power(power_dbm);
845+
radio_driver.setTxPower(power_dbm);
846846
}
847847

848848
void SensorMesh::formatStatsReply(char *reply) {
@@ -908,13 +908,13 @@ void SensorMesh::loop() {
908908

909909
if (set_radio_at && millisHasNowPassed(set_radio_at)) { // apply pending (temporary) radio params
910910
set_radio_at = 0; // clear timer
911-
radio_set_params(pending_freq, pending_bw, pending_sf, pending_cr);
911+
radio_driver.setParams(pending_freq, pending_bw, pending_sf, pending_cr);
912912
MESH_DEBUG_PRINTLN("Temp radio params");
913913
}
914914

915915
if (revert_radio_at && millisHasNowPassed(revert_radio_at)) { // revert radio params to orig
916916
revert_radio_at = 0; // clear timer
917-
radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
917+
radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
918918
MESH_DEBUG_PRINTLN("Radio params restored");
919919
}
920920

‎examples/simple_sensor/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void setup() {
6868

6969
if (!radio_init()) { halt(); }
7070

71-
fast_rng.begin(radio_get_rng_seed());
71+
fast_rng.begin(radio_driver.getRngSeed());
7272

7373
FILESYSTEM* fs;
7474
#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)

0 commit comments

Comments
 (0)