lora: Update to use the new libtock-c layout

Signed-off-by: Alistair Francis <[email protected]>

Author: alistair23

wip/lora/RadioLib

@@ -30,4 +30,12 @@ LIBS_rv32imac += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRa
 include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
 
 ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
-	cd ../ && ./build-RadioLib.sh
+	cd ../RadioLib/examples/NonArduino/Tock/ && \
+		rm -rf build-arm build-riscv && \
+		mkdir -p build-arm && cd build-arm && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
+		$(MAKE) -j4 2> /dev/null || \
+		cd ../ && \
+		mkdir -p build-riscv && cd build-riscv && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
+		$(MAKE) -j4 2> /dev/null || true

wip/lora/build-RadioLib.sh

@@ -29,5 +29,13 @@ LIBS_rv32imac += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRa
 # building the application.
 include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
 
-../RadioLib/examples/NonArduino/Tock/build/RadioLib/libRadioLib.a:
-	cd ../ && ./build-RadioLib.sh
+../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
+	cd ../RadioLib/examples/NonArduino/Tock/ && \
+		rm -rf build-arm build-riscv && \
+		mkdir -p build-arm && cd build-arm && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
+		$(MAKE) -j4 2> /dev/null || \
+		cd ../ && \
+		mkdir -p build-riscv && cd build-riscv && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
+		$(MAKE) -j4 2> /dev/null || true

wip/lora/sensor-receive/Makefile

@@ -13,8 +13,8 @@
 #include "libtockHal.h"
 
 // Include some libtock-c helpers
-#include <sensors/humidity.h>
-#include <sensors/temperature.h>
+#include <libtock-sync/sensors/humidity.h>
+#include <libtock-sync/sensors/temperature.h>
 
 #define BUFFER_LEN 64
 
@@ -47,17 +47,17 @@ int main(void) {
   }
   printf("success!\r\n");
 
-  int temp      = 0;
-  unsigned humi = 0;
+  int temp = 0;
+  int humi = 0;
 
   // loop forever
   for ( ;;) {
     // Ensure there are no pending callbacks
     yield_no_wait();
 
     // Read some sensor data from the board
-    temperature_read_sync(&temp);
-    humidity_read_sync(&humi);
+    libtocksync_temperature_read(&temp);
+    libtocksync_humidity_read(&humi);
 
     snprintf(buffer, BUFFER_LEN, "Temp: %d, Hum: %u", temp, humi);