lora: Move from wip to examples

Signed-off-by: Alistair Francis <[email protected]>
tock · May 16, 2024 · 2fff49e · 2fff49e
1 parent 91aafb4
commit 2fff49e
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,7 +5,7 @@
 	path = lvgl/lvgl
 	url = https://github.com/littlevgl/lvgl.git
 [submodule "examples/lora/RadioLib"]
-	path = wip/lora/RadioLib
+	path = examples/lora/RadioLib
 	url = https://github.com/jgromes/RadioLib.git
 [submodule "libopenthread/openthread"]
 	path = libopenthread/openthread

diff --git a/wip/lora/README.md → examples/lora/README.md b/wip/lora/README.md → examples/lora/README.md
diff --git a/wip/lora/RadioLib → examples/lora/RadioLib b/wip/lora/RadioLib → examples/lora/RadioLib
diff --git a/wip/lora/sensor-receive/Makefile → examples/lora/sensor-receive/Makefile b/wip/lora/sensor-receive/Makefile → examples/lora/sensor-receive/Makefile
@@ -29,13 +29,16 @@ 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-arm/RadioLib/libRadioLib.a ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
+../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
 	cd ../RadioLib/examples/NonArduino/Tock/ && \
-		rm -rf build-arm build-riscv && \
+		rm -rf build-arm && \
 		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 ../ && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
+		$(MAKE) -j4 2> /dev/null || true
+
+../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
+	cd ../RadioLib/examples/NonArduino/Tock/ && \
+		rm -rf build-riscv && \
 		mkdir -p build-riscv && cd build-riscv && \
-		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
 		$(MAKE) -j4 2> /dev/null || true
diff --git a/wip/lora/sensor-receive/README.md → examples/lora/sensor-receive/README.md b/wip/lora/sensor-receive/README.md → examples/lora/sensor-receive/README.md
diff --git a/wip/lora/sensor-receive/main.cc → examples/lora/sensor-receive/main.cc b/wip/lora/sensor-receive/main.cc → examples/lora/sensor-receive/main.cc
diff --git a/wip/lora/sensor-transmit/Makefile → examples/lora/sensor-transmit/Makefile b/wip/lora/sensor-transmit/Makefile → examples/lora/sensor-transmit/Makefile
@@ -29,13 +29,16 @@ 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-arm/RadioLib/libRadioLib.a ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
+../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
 	cd ../RadioLib/examples/NonArduino/Tock/ && \
-		rm -rf build-arm build-riscv && \
+		rm -rf build-arm && \
 		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 ../ && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
+		$(MAKE) -j4 2> /dev/null || true
+
+../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
+	cd ../RadioLib/examples/NonArduino/Tock/ && \
+		rm -rf build-riscv && \
 		mkdir -p build-riscv && cd build-riscv && \
-		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
+		LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
 		$(MAKE) -j4 2> /dev/null || true
diff --git a/wip/lora/sensor-transmit/README.md → examples/lora/sensor-transmit/README.md b/wip/lora/sensor-transmit/README.md → examples/lora/sensor-transmit/README.md
diff --git a/wip/lora/sensor-transmit/main.cc → examples/lora/sensor-transmit/main.cc b/wip/lora/sensor-transmit/main.cc → examples/lora/sensor-transmit/main.cc