RadioLib/RadioLib: Use new Tock HAL names

Signed-off-by: Alistair Francis <[email protected]>
tock · Nov 7, 2024 · e54c7f0 · e54c7f0
1 parent 90a7091
commit e54c7f0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -9,4 +9,4 @@
 	url = https://github.com/openthread/openthread.git
 [submodule "RadioLib/RadioLib"]
 	path = RadioLib/RadioLib
-	url = https://github.com/jgromes/RadioLib.git
+	url = https://github.com/alistair23/RadioLib.git
diff --git a/RadioLib/RadioLib b/RadioLib/RadioLib
diff --git a/examples/lora/sensor-lorawan/main.cc b/examples/lora/sensor-lorawan/main.cc
@@ -35,7 +35,7 @@ int main(void) {
   printf("[SX1261] Initialising Radio ... \r\n");
 
   // create a new instance of the HAL class
-  TockHal* hal = new TockHal();
+  TockRadioLibHal* hal = new TockRadioLibHal();
   int state;
 
   // now we can create the radio module
@@ -44,7 +44,8 @@ int main(void) {
   // DIO1 pin:  2
   // NRST pin:  4
   // BUSY pin:  1
-  SX1262 tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY);
+  SX1262 tock_module = new Module(hal, RADIOLIB_RADIO_NSS, RADIOLIB_RADIO_DIO_1, RADIOLIB_RADIO_RESET,
+                                  RADIOLIB_RADIO_BUSY);
   LoRaWANNode node(&tock_module, Region, subBand);
 
   // Setup the radio
@@ -69,8 +70,8 @@ int main(void) {
 
   printf("success!\r\n");
 
-  hal->detachInterrupt(RADIO_DIO_1);
-  hal->pinMode(RADIO_DIO_1, PIN_INPUT);
+  hal->detachInterrupt(RADIOLIB_RADIO_DIO_1);
+  hal->pinMode(RADIOLIB_RADIO_DIO_1, TOCK_RADIOLIB_PIN_INPUT);
 
   int temp = 0;
   int humi = 0;

diff --git a/examples/lora/sensor-receive/main.cc b/examples/lora/sensor-receive/main.cc
@@ -21,16 +21,17 @@ int main(void) {
   printf("[SX1261] Initialising Radio ... \n");
 
   // create a new instance of the HAL class
-  TockHal* hal = new TockHal();
+  TockRadioLibHal* hal = new TockRadioLibHal();
 
   // now we can create the radio module
   // pinout corresponds to the SparkFun LoRa Thing Plus - expLoRaBLE
   // NSS pin:   0
   // DIO1 pin:  2
   // NRST pin:  4
   // BUSY pin:  1
-  Module* tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY);
-  SX1262* radio       = new SX1262(tock_module);
+  Module* tock_module = new Module(hal, RADIOLIB_RADIO_NSS, RADIOLIB_RADIO_DIO_1, RADIOLIB_RADIO_RESET,
+                                   RADIOLIB_RADIO_BUSY);
+  SX1262* radio = new SX1262(tock_module);
 
   // Setup the radio
   // The settings here work for the SparkFun LoRa Thing Plus - expLoRaBLE

diff --git a/examples/lora/sensor-transmit/main.cc b/examples/lora/sensor-transmit/main.cc
@@ -25,16 +25,17 @@ int main(void) {
   printf("[SX1261] Initialising Radio ... \n");
 
   // create a new instance of the HAL class
-  TockHal* hal = new TockHal();
+  TockRadioLibHal* hal = new TockRadioLibHal();
 
   // now we can create the radio module
   // pinout corresponds to the SparkFun LoRa Thing Plus - expLoRaBLE
   // NSS pin:   0
   // DIO1 pin:  2
   // NRST pin:  4
   // BUSY pin:  1
-  Module* tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY);
-  SX1262* radio       = new SX1262(tock_module);
+  Module* tock_module = new Module(hal, RADIOLIB_RADIO_NSS, RADIOLIB_RADIO_DIO_1, RADIOLIB_RADIO_RESET,
+                                   RADIOLIB_RADIO_BUSY);
+  SX1262* radio = new SX1262(tock_module);
 
   // Setup the radio
   // The settings here work for the SparkFun LoRa Thing Plus - expLoRaBLE
+1 −1		.github/ISSUE_TEMPLATE/bug_report.md
+1 −1		.github/ISSUE_TEMPLATE/feature_request.md
+1 −1		.github/ISSUE_TEMPLATE/module-not-working.md
+1 −1		.github/ISSUE_TEMPLATE/regular-issue.md
+1 −1		README.md
+1 −0		keywords.txt
+7 −1		src/RadioLib.h
+25 −41		src/hal/Tock/libtockHal.h
+4 −0		src/modules/RF69/RF69.cpp
+8 −0		src/modules/RF69/RF69.h
+4 −0		src/modules/SX127x/SX127x.cpp
+8 −0		src/modules/SX127x/SX127x.h