Skip to content

Commit 54b281d

Browse files
committed
lora: Move from wip to examples
Signed-off-by: Alistair Francis <[email protected]>
1 parent cdb6ca7 commit 54b281d

File tree

9 files changed

+19
-13
lines changed

9 files changed

+19
-13
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
path = lvgl/lvgl
66
url = https://github.com/littlevgl/lvgl.git
77
[submodule "examples/lora/RadioLib"]
8-
path = wip/lora/RadioLib
8+
path = examples/lora/RadioLib
99
url = https://github.com/jgromes/RadioLib.git
1010
[submodule "libopenthread/openthread"]
1111
path = libopenthread/openthread
File renamed without changes.

wip/lora/sensor-receive/Makefile renamed to examples/lora/sensor-receive/Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ LIBS_rv32imac += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRa
2929
# building the application.
3030
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
3131

32-
../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
32+
../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
3333
cd ../RadioLib/examples/NonArduino/Tock/ && \
34-
rm -rf build-arm build-riscv && \
34+
rm -rf build-arm && \
3535
mkdir -p build-arm && cd build-arm && \
36-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
37-
$(MAKE) -j4 2> /dev/null || \
38-
cd ../ && \
36+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
37+
$(MAKE) -j4 2> /dev/null || true
38+
39+
../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
40+
cd ../RadioLib/examples/NonArduino/Tock/ && \
41+
rm -rf build-riscv && \
3942
mkdir -p build-riscv && cd build-riscv && \
40-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
43+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
4144
$(MAKE) -j4 2> /dev/null || true
File renamed without changes.
File renamed without changes.

wip/lora/sensor-transmit/Makefile renamed to examples/lora/sensor-transmit/Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ LIBS_rv32imac += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRa
2929
# building the application.
3030
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
3131

32-
../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
32+
../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
3333
cd ../RadioLib/examples/NonArduino/Tock/ && \
34-
rm -rf build-arm build-riscv && \
34+
rm -rf build-arm && \
3535
mkdir -p build-arm && cd build-arm && \
36-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
37-
$(MAKE) -j4 2> /dev/null || \
38-
cd ../ && \
36+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
37+
$(MAKE) -j4 2> /dev/null || true
38+
39+
../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
40+
cd ../RadioLib/examples/NonArduino/Tock/ && \
41+
rm -rf build-riscv && \
3942
mkdir -p build-riscv && cd build-riscv && \
40-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
43+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
4144
$(MAKE) -j4 2> /dev/null || true
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)