Skip to content

Commit f19c885

Browse files
alistair23alistair23
committed
RadioLib: Move to top level
Signed-off-by: Alistair Francis <[email protected]>
1 parent b55ed4f commit f19c885

File tree

6 files changed

+64
-70
lines changed

6 files changed

+64
-70
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
[submodule "lvgl/lvgl"]
55
path = lvgl/lvgl
66
url = https://github.com/littlevgl/lvgl.git
7-
[submodule "examples/lora/RadioLib"]
8-
path = examples/lora/RadioLib
9-
url = https://github.com/jgromes/RadioLib.git
107
[submodule "libopenthread/openthread"]
118
path = libopenthread/openthread
129
url = https://github.com/openthread/openthread.git
10+
[submodule "libradio/RadioLib"]
11+
path = libradio/RadioLib
12+
url = https://github.com/jgromes/RadioLib.git

‎examples/lora/RadioLib‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/lora/sensor-receive/Makefile‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,63 +7,55 @@ TOCK_USERLAND_BASE_DIR = ../../../
77
CXX_SRCS := $(wildcard *.cc)
88

99
# Include the core RadioLib headers
10-
override CPPFLAGS += -isystem ../RadioLib/src
10+
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src
1111

1212
# Include the Tock specific headers
13-
override CPPFLAGS += -isystem ../RadioLib/examples/NonArduino/Tock
13+
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock
1414

1515
# Include the base of libtock-c to fix the libtock/ includes from RadioLib
1616
override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/
1717

1818
ifeq ($(CMAKE),1)
1919
# Use the RadioLib cmake build infrastructure
20-
LIBS_cortex-m += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
21-
LIBS_cortex-m0 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
22-
LIBS_cortex-m3 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
23-
LIBS_cortex-m4 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
24-
LIBS_cortex-m7 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
20+
LIBS_cortex-m += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
21+
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
22+
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
23+
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
24+
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
2525

26-
LIBS_rv32i += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
27-
LIBS_rv32imc += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
28-
LIBS_rv32imac += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
26+
LIBS_rv32i += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
27+
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
28+
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
2929

3030
# Include userland master makefile. Contains rules and flags for actually
3131
# building the application.
3232
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
3333

34-
../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
35-
cd ../RadioLib/examples/NonArduino/Tock/ && \
34+
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
35+
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
3636
rm -rf build-arm && \
3737
mkdir -p build-arm && cd build-arm && \
38-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
38+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" .. && \
3939
$(MAKE) -j4 2> /dev/null || true
4040

41-
../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
42-
cd ../RadioLib/examples/NonArduino/Tock/ && \
41+
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
42+
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
4343
rm -rf build-riscv && \
4444
mkdir -p build-riscv && cd build-riscv && \
45-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
45+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
4646
$(MAKE) -j4 2> /dev/null || true
4747
else
4848
# Use the libtock-c Make system
49-
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m0/RadioLib.a
50-
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m3/RadioLib.a
51-
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m4/RadioLib.a
52-
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m7/RadioLib.a
49+
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m0/RadioLib.a
50+
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m3/RadioLib.a
51+
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m4/RadioLib.a
52+
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m7/RadioLib.a
5353

54-
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/rv32imc/RadioLib.a
55-
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/rv32imac/RadioLib.a
54+
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imc/RadioLib.a
55+
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imac/RadioLib.a
5656

57-
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
58-
59-
LIBNAME := RadioLib
60-
61-
$(LIBNAME)_DIR := $(TOCK_USERLAND_BASE_DIR)/examples/lora/$(LIBNAME)
57+
EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib
58+
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile
6259

63-
$(LIBNAME)_SRCS := \
64-
$(wildcard $($(LIBNAME)_DIR)/src/*.cpp) \
65-
$(wildcard $($(LIBNAME)_DIR)/src/*/*.cpp) \
66-
$(wildcard $($(LIBNAME)_DIR)/src/*/*/*.cpp)
67-
68-
include $(TOCK_USERLAND_BASE_DIR)/TockLibrary.mk
60+
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
6961
endif

‎examples/lora/sensor-transmit/Makefile‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,63 +7,55 @@ TOCK_USERLAND_BASE_DIR = ../../../
77
CXX_SRCS := $(wildcard *.cc)
88

99
# Include the core RadioLib headers
10-
override CPPFLAGS += -isystem ../RadioLib/src
10+
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/src
1111

1212
# Include the Tock specific headers
13-
override CPPFLAGS += -isystem ../RadioLib/examples/NonArduino/Tock
13+
override CPPFLAGS += -isystem $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock
1414

1515
# Include the base of libtock-c to fix the libtock/ includes from RadioLib
1616
override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/
1717

1818
ifeq ($(CMAKE),1)
1919
# Use the RadioLib cmake build infrastructure
20-
LIBS_cortex-m += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
21-
LIBS_cortex-m0 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
22-
LIBS_cortex-m3 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
23-
LIBS_cortex-m4 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
24-
LIBS_cortex-m7 += ../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
20+
LIBS_cortex-m += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
21+
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
22+
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
23+
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
24+
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a
2525

26-
LIBS_rv32i += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
27-
LIBS_rv32imc += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
28-
LIBS_rv32imac += ../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
26+
LIBS_rv32i += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
27+
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
28+
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a
2929

3030
# Include userland master makefile. Contains rules and flags for actually
3131
# building the application.
3232
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
3333

34-
../RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
35-
cd ../RadioLib/examples/NonArduino/Tock/ && \
34+
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-arm/RadioLib/libRadioLib.a:
35+
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
3636
rm -rf build-arm && \
3737
mkdir -p build-arm && cd build-arm && \
38-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" .. && \
38+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" .. && \
3939
$(MAKE) -j4 2> /dev/null || true
4040

41-
../RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
42-
cd ../RadioLib/examples/NonArduino/Tock/ && \
41+
$(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/build-riscv/RadioLib/libRadioLib.a:
42+
cd $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/examples/NonArduino/Tock/ && \
4343
rm -rf build-riscv && \
4444
mkdir -p build-riscv && cd build-riscv && \
45-
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)/../../../" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
45+
LIBTOCK_C_DIRECTORY="$(TOCK_USERLAND_BASE_DIR)" cmake -G "CodeBlocks - Unix Makefiles" -DRISCV_BUILD=1 .. && \
4646
$(MAKE) -j4 2> /dev/null || true
4747
else
4848
# Use the libtock-c Make system
49-
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m0/RadioLib.a
50-
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m3/RadioLib.a
51-
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m4/RadioLib.a
52-
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/cortex-m7/RadioLib.a
49+
LIBS_cortex-m0 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m0/RadioLib.a
50+
LIBS_cortex-m3 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m3/RadioLib.a
51+
LIBS_cortex-m4 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m4/RadioLib.a
52+
LIBS_cortex-m7 += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/cortex-m7/RadioLib.a
5353

54-
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/rv32imc/RadioLib.a
55-
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/examples/lora/RadioLib/build/rv32imac/RadioLib.a
54+
LIBS_rv32imc += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imc/RadioLib.a
55+
LIBS_rv32imac += $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib/build/rv32imac/RadioLib.a
5656

57-
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
58-
59-
LIBNAME := RadioLib
60-
61-
$(LIBNAME)_DIR := $(TOCK_USERLAND_BASE_DIR)/examples/lora/$(LIBNAME)
57+
EXTERN_LIBS := $(TOCK_USERLAND_BASE_DIR)/libradio/RadioLib
58+
include $(TOCK_USERLAND_BASE_DIR)/libradio/Makefile
6259

63-
$(LIBNAME)_SRCS := \
64-
$(wildcard $($(LIBNAME)_DIR)/src/*.cpp) \
65-
$(wildcard $($(LIBNAME)_DIR)/src/*/*.cpp) \
66-
$(wildcard $($(LIBNAME)_DIR)/src/*/*/*.cpp)
67-
68-
include $(TOCK_USERLAND_BASE_DIR)/TockLibrary.mk
60+
include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk
6961
endif

‎libradio/Makefile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
LIBNAME := RadioLib
2+
3+
$(LIBNAME)_DIR := $(TOCK_USERLAND_BASE_DIR)/libradio/$(LIBNAME)
4+
5+
$(LIBNAME)_SRCS := \
6+
$(wildcard $($(LIBNAME)_DIR)/src/*.cpp) \
7+
$(wildcard $($(LIBNAME)_DIR)/src/*/*.cpp) \
8+
$(wildcard $($(LIBNAME)_DIR)/src/*/*/*.cpp)
9+
10+
include $(TOCK_USERLAND_BASE_DIR)/TockLibrary.mk

‎libradio/RadioLib‎

Submodule RadioLib added at 954477b

0 commit comments

Comments
 (0)