Skip to content

Commit ff12e94

Browse files
committed
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]>
1 parent 15a3f39 commit ff12e94

File tree

6 files changed

+33
-219
lines changed

6 files changed

+33
-219
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
run: |
248248
cd $PWD/examples/NonArduino/Tock
249249
git clone https://github.com/tock/libtock-c.git
250-
cd libtock-c; git checkout dbee65a56d74b4bad166317f199e80b959f7c82c; cd ../
250+
cd libtock-c; git checkout c0202f9ab78da4a6e95f136cf5250701e3778f63; cd ../
251251
LIBTOCK_C_DIRECTORY="$(pwd)/libtock-c" ./build.sh
252252
253253
rpi-build:

examples/NonArduino/Tock/CMakeLists.txt

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,21 @@ add_executable(${PROJECT_NAME} main.cpp)
5050
# The build system for libtock-c is a bit odd and the version of libraries
5151
# built changes based on compiler version.
5252
if (RISCV_BUILD)
53-
if(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
53+
if(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0")
54+
target_link_libraries(${PROJECT_NAME} PUBLIC
55+
RadioLib
56+
$ENV{LIBTOCK_C_DIRECTORY}/libtock/build/rv32imc/libtock.a
57+
$ENV{LIBTOCK_C_DIRECTORY}/libtock-sync/build/rv32imc/libtocksync.a
58+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/riscv/lib/gcc/riscv64-unknown-elf/14.1.0/rv32i/ilp32/libgcc.a
59+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/riscv/riscv64-unknown-elf/lib/rv32i/ilp32/libstdc++.a
60+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/riscv/riscv64-unknown-elf/lib/rv32i/ilp32/libc.a
61+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/riscv/riscv64-unknown-elf/lib/rv32i/ilp32/libm.a
62+
)
63+
64+
target_include_directories(RadioLib AFTER PUBLIC
65+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.3.0.20230120/riscv/riscv64-unknown-elf/include/
66+
)
67+
elseif(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
5468
target_link_libraries(${PROJECT_NAME} PUBLIC
5569
RadioLib
5670
$ENV{LIBTOCK_C_DIRECTORY}/libtock/build/rv32imc/libtock.a
@@ -80,7 +94,17 @@ if (RISCV_BUILD)
8094
)
8195
endif()
8296
else()
83-
if(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
97+
if (EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0")
98+
target_link_libraries(${PROJECT_NAME} PUBLIC
99+
RadioLib
100+
$ENV{LIBTOCK_C_DIRECTORY}/libtock/build/cortex-m4/libtock.a
101+
$ENV{LIBTOCK_C_DIRECTORY}/libtock-sync/build/cortex-m4/libtocksync.a
102+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/arm/lib/gcc/arm-none-eabi/14.1.0/libgcc.a
103+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-14.1.0/arm/arm-none-eabi/lib/libstdc++.a
104+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/arm/arm-none-eabi/lib/libc.a
105+
$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-newlib-4.4.0.20231231/arm/arm-none-eabi/lib/libm.a
106+
)
107+
elseif(EXISTS "$ENV{LIBTOCK_C_DIRECTORY}/lib/libtock-libc++-13.2.0")
84108
target_link_libraries(${PROJECT_NAME} PUBLIC
85109
RadioLib
86110
$ENV{LIBTOCK_C_DIRECTORY}/libtock/build/cortex-m4/libtock.a

examples/NonArduino/Tock/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The RadioLib example can be built with:
2323
$ git clone https://github.com/jgromes/RadioLib.git
2424
$ cd RadioLib/examples/NonArduino/Tock/
2525
$ git clone https://github.com/tock/libtock-c.git
26-
$ cd libtock-c; git checkout dbee65a56d74b4bad166317f199e80b959f7c82c; cd ../
26+
$ cd libtock-c; git checkout c0202f9ab78da4a6e95f136cf5250701e3778f63; cd ../
2727
$ LIBTOCK_C_DIRECTORY="$(pwd)/libtock-c" ./build.sh
2828
```
2929

examples/NonArduino/Tock/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ set -e
33

44
rm -rf ./build-*
55

6-
cd libtock-c/examples/cxx_hello
6+
pushd ${LIBTOCK_C_DIRECTORY}/examples/cxx_hello
77
make -j4
8-
cd ../../../
8+
popd
99

1010
mkdir -p build-arm
1111
cd build-arm

examples/NonArduino/Tock/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
#include <RadioLib.h>
2929

3030
// include the hardware abstraction layer
31-
#include "hal/Tock/libtockHal.h"
31+
#include "RadioLib/libtockHal.h"
3232

3333
// the entry point for the program
3434
int main(void) {
3535
printf("[SX1261] Initialising Radio ... \r\n");
3636

3737
// create a new instance of the HAL class
38-
TockHal* hal = new TockHal();
38+
TockRadioLibHal* hal = new TockRadioLibHal();
3939

4040
// now we can create the radio module
4141
// pinout corresponds to the SparkFun LoRa Thing Plus - expLoRaBLE
4242
// NSS pin: 0
4343
// DIO1 pin: 2
4444
// NRST pin: 4
4545
// BUSY pin: 1
46-
Module* tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY);
46+
Module* tock_module = new Module(hal, RADIOLIB_RADIO_NSS, RADIOLIB_RADIO_DIO_1, RADIOLIB_RADIO_RESET, RADIOLIB_RADIO_BUSY);
4747
SX1262* radio = new SX1262(tock_module);
4848

4949
// Setup the radio

src/hal/Tock/libtockHal.h

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)