Skip to content

Commit f67722f

Browse files
committed
v2.0.0
- Changed: Several configuration parameters are now set dynamically from the JSON configuration file: RSSI offset, concentrator clock source, radio type, TX gain table, network type. The HAL does not need to be recompiled any more to update those parameters. An example for IoT Starter Kit platform is provided in global_conf.json for basic, gps and beacon packet_forwarder. - Removed: Band frequency JSON configuration file has been removed. An example for EU 868MHz is provided in global_conf.json for basic, gps and beacon packet_forwarder. - Changed: Updated makefiles to allow cross compilation from environment variable (ARCH, CROSS_COMPILE). ** WARNING: ** ** Update your JSON configuration file with new dynamic parameters. **
1 parent 0011a60 commit f67722f

28 files changed

+1135
-1226
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.o
2+
*.swp
3+
*.bak

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
### Environment constants
22

3-
LGW_PATH := ../../lora_gateway/libloragw
4-
CROSS_COMPILE :=
3+
LGW_PATH ?= ../../lora_gateway/libloragw
4+
ARCH ?=
5+
CROSS_COMPILE ?=
56
export
67

78
### general build targets
@@ -22,4 +23,4 @@ clean:
2223
$(MAKE) clean -e -C util_sink
2324
$(MAKE) clean -e -C util_tx_test
2425

25-
### EOF
26+
### EOF

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.1
1+
2.0.0

basic_pkt_fwd/Makefile

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ APP_NAME := basic_pkt_fwd
44

55
### Environment constants
66

7-
LGW_PATH := ../../lora_gateway/libloragw
8-
CROSS_COMPILE :=
7+
LGW_PATH ?= ../../lora_gateway/libloragw
8+
ARCH ?=
9+
CROSS_COMPILE ?=
910

1011
### External constant definitions
1112
# must get library build option to know if mpsse must be linked or not
@@ -50,12 +51,11 @@ endif
5051

5152
### General build targets
5253

53-
all: $(APP_NAME) global_conf.json
54+
all: $(APP_NAME)
5455

5556
clean:
5657
rm -f obj/*.o
5758
rm -f $(APP_NAME)
58-
find . -name global_conf.json -exec rm -i {} \;
5959

6060
### Sub-modules compilation
6161

@@ -65,25 +65,6 @@ obj/base64.o: src/base64.c inc/base64.h
6565
obj/parson.o: src/parson.c inc/parson.h
6666
$(CC) -c $(CFLAGS) $< -o $@
6767

68-
### Select the proper configuration JSON for the program
69-
70-
ifeq ($(CFG_BAND),eu868)
71-
global_conf.json: cfg/global_conf.eu868.json
72-
cp $< $@
73-
else ifeq ($(CFG_BAND),us915)
74-
global_conf.json: cfg/global_conf.us915.json
75-
cp $< $@
76-
else ifeq ($(CFG_BAND),cn470)
77-
global_conf.json: cfg/global_conf.cn470.json
78-
cp $< $@
79-
else ifeq ($(CFG_BAND),eu433)
80-
global_conf.json: cfg/global_conf.eu433.json
81-
cp $< $@
82-
else
83-
global_conf.json: cfg/global_conf.empty.json
84-
cp $< $@
85-
endif
86-
8768
### Main program compilation and assembly
8869

8970
obj/$(APP_NAME).o: src/$(APP_NAME).c $(LGW_INC) inc/parson.h inc/base64.h
@@ -92,4 +73,4 @@ obj/$(APP_NAME).o: src/$(APP_NAME).c $(LGW_INC) inc/parson.h inc/base64.h
9273
$(APP_NAME): obj/$(APP_NAME).o $(LGW_PATH)/libloragw.a obj/parson.o obj/base64.o
9374
$(CC) -L$(LGW_PATH) $< obj/parson.o obj/base64.o -o $@ $(LIBS)
9475

95-
### EOF
76+
### EOF

basic_pkt_fwd/cfg/global_conf.cn470.json

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

basic_pkt_fwd/cfg/global_conf.empty.json

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

basic_pkt_fwd/cfg/global_conf.eu433.json

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

basic_pkt_fwd/cfg/global_conf.eu868.json

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

0 commit comments

Comments
 (0)