NonArduino/Tock: Update to latest libtock-c

Update to the latest libtock-c commit. libtock-c now includes a libtockHal.h, so we can use that instead of the version here. Signed-off-by: Alistair Francis <[email protected]>
jgromes · Nov 13, 2024 · ff12e94 · ff12e94
1 parent 15a3f39
commit ff12e94
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 219 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -247,7 +247,7 @@ jobs:
         run: |
           cd $PWD/examples/NonArduino/Tock
           git clone https://github.com/tock/libtock-c.git
-          cd libtock-c; git checkout dbee65a56d74b4bad166317f199e80b959f7c82c; cd ../
+          cd libtock-c; git checkout c0202f9ab78da4a6e95f136cf5250701e3778f63; cd ../
           LIBTOCK_C_DIRECTORY="$(pwd)/libtock-c" ./build.sh
 
   rpi-build:

diff --git a/examples/NonArduino/Tock/CMakeLists.txt b/examples/NonArduino/Tock/CMakeLists.txt
@@ -50,7 +50,21 @@ add_executable(${PROJECT_NAME} main.cpp)
 # The build system for libtock-c is a bit odd and the version of libraries
 # built changes based on compiler version.
 if (RISCV_BUILD)
-    if(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
+    if(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0")
+        target_link_libraries(${PROJECT_NAME} PUBLIC
+            RadioLib
+            $ENV{LIBTOCK_C_DIRECTORY}/libtock/build/rv32imc/libtock.a
+            $ENV{LIBTOCK_C_DIRECTORY}/libtock-sync/build/rv32imc/libtocksync.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/riscv/lib/gcc/riscv64-unknown-elf/14.1.0/rv32i/ilp32/libgcc.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/riscv/riscv64-unknown-elf/lib/rv32i/ilp32/libstdc++.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/riscv/riscv64-unknown-elf/lib/rv32i/ilp32/libc.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/riscv/riscv64-unknown-elf/lib/rv32i/ilp32/libm.a
+        )
+
+        target_include_directories(RadioLib AFTER PUBLIC
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.3.0.20230120/riscv/riscv64-unknown-elf/include/
+        )
+    elseif(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
         target_link_libraries(${PROJECT_NAME} PUBLIC
             RadioLib
             $ENV{LIBTOCK_C_DIRECTORY}/libtock/build/rv32imc/libtock.a
@@ -80,7 +94,17 @@ if (RISCV_BUILD)
         )
     endif()
 else()
-    if(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
+    if (EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0")
+        target_link_libraries(${PROJECT_NAME} PUBLIC
+            RadioLib
+            $ENV{LIBTOCK_C_DIRECTORY}/libtock/build/cortex-m4/libtock.a
+            $ENV{LIBTOCK_C_DIRECTORY}/libtock-sync/build/cortex-m4/libtocksync.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/arm/lib/gcc/arm-none-eabi/14.1.0/libgcc.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/arm/arm-none-eabi/lib/libstdc++.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/arm/arm-none-eabi/lib/libc.a
+            $ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/arm/arm-none-eabi/lib/libm.a
+        )
+    elseif(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
         target_link_libraries(${PROJECT_NAME} PUBLIC
             RadioLib
             $ENV{LIBTOCK_C_DIRECTORY}/libtock/build/cortex-m4/libtock.a

diff --git a/examples/NonArduino/Tock/README.md b/examples/NonArduino/Tock/README.md
@@ -23,7 +23,7 @@ The RadioLib example can be built with:
 $ git clone https://github.com/jgromes/RadioLib.git
 $ cd RadioLib/examples/NonArduino/Tock/
 $ git clone https://github.com/tock/libtock-c.git
-$ cd libtock-c; git checkout dbee65a56d74b4bad166317f199e80b959f7c82c; cd ../
+$ cd libtock-c; git checkout c0202f9ab78da4a6e95f136cf5250701e3778f63; cd ../
 $ LIBTOCK_C_DIRECTORY="$(pwd)/libtock-c" ./build.sh
 ```
 

diff --git a/examples/NonArduino/Tock/build.sh b/examples/NonArduino/Tock/build.sh
@@ -3,9 +3,9 @@ set -e
 
 rm -rf ./build-*
 
-cd libtock-c/examples/cxx_hello
+pushd ${LIBTOCK_C_DIRECTORY}/examples/cxx_hello
 make -j4
-cd ../../../
+popd
 
 mkdir -p build-arm
 cd build-arm

diff --git a/examples/NonArduino/Tock/main.cpp b/examples/NonArduino/Tock/main.cpp
@@ -28,22 +28,22 @@
 #include <RadioLib.h>
 
 // include the hardware abstraction layer
-#include "hal/Tock/libtockHal.h"
+#include "RadioLib/libtockHal.h"
 
 // the entry point for the program
 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();
 
   // 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);
+  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

diff --git a/src/hal/Tock/libtockHal.h b/src/hal/Tock/libtockHal.h