Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Commit 032c558

Browse files
author
bboulet
committed
1.2.0 version
1 parent 81201fb commit 032c558

26 files changed

+3400
-2712
lines changed

README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,25 @@ https://lora-developers.semtech.com/library/tech-papers-and-guides/lora-edge-tra
3434

3535
To build the host softwares, proceed as follow:
3636

37-
- use the Keil project, or
38-
- execute the makefile (in gcc folder)
37+
- Use the Keil project lr1110_modem_tracker_sdk.uvprojx located in smtc_tracker_app/MDK-ARM
38+
- Execute the makefile (in gcc folder):
39+
- Install arm-none-eabi-gcc : https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads
40+
- Make -j
41+
- lora_edge_tracker_sdk.bin is created in the gcc/build folder
3942

4043
## 4. Changelog
4144

45+
### V 1.2.0 ###
46+
47+
- Fix the SNR reading which was wrong
48+
- Fix RNG module
49+
- Add Get date BLE command
50+
- Add Get/Flush Accumulated charge BLE command
51+
- Add Internal Log memory space remaining BLE command
52+
- Merge LoRaWAN commissioning files for tracker and lorawan app
53+
- Add empty GNSS scan in internal log
54+
- Update LR1110 Modem-E driver
55+
4256
### V 1.1.2 ###
4357

4458
- Add STM32WB SMPS (switched-mode power supply) configuration in application and bootloader

bin/lr1110_modem_tracker_sdk.bin

1.05 KB
Binary file not shown.

bin/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"url": "https://api.github.com/repos/Lora-net/radio_firmware_images/contents/lr1110/modem/lr1110_modem_1.0.7.h",
44
"hash": "e8244951e68f80b92a1f8f2bb852ca10"},
55
"tkr_app": {
6-
"version": "1.01.02",
6+
"version": "1.02.00",
77
"url": "https://api.github.com/repos/Lora-net/lora_edge_tracker_ref_design/contents/bin/lr1110_modem_tracker_sdk.bin",
8-
"hash": "48ca2d7733a4d954d7c0db54c2551579"}
8+
"hash": "60b621caeceeda9ac3e782b46dafad32"}
99
}

gcc/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ EVK_TARGET = lora_edge_tracker_sdk
1818

1919
#Choose the app to compile
2020
TRACKER_APP = 1
21-
LORAMAC_APP = 0
21+
LORAWAN_APP = 0
2222
GNSS_APP = 0
2323
WIFI_APP = 0
2424
TX_CONTINUOUS_APP = 0
@@ -120,6 +120,7 @@ ${TOP_DIR}/smtc_tracker_app/Src/radio/lr1110_modem/src/lr1110_modem_system.c \
120120
${TOP_DIR}/smtc_tracker_app/Src/radio/lr1110_modem/src/lr1110_modem_wifi.c \
121121
${TOP_DIR}/smtc_tracker_app/Src/radio/wifi/wifi_scan.c \
122122
${TOP_DIR}/smtc_tracker_app/Src/radio/gnss/gnss_scan.c \
123+
${TOP_DIR}/smtc_tracker_app/Src/radio/lorawan_config/lorawan_config.c \
123124
${TOP_DIR}/Drivers/BSP/Components/external_supply/external_supply.c \
124125
${TOP_DIR}/Drivers/BSP/Components/Leds/leds.c \
125126
${TOP_DIR}/Drivers/BSP/Components/lis2de12/lis2de12.c \
@@ -162,9 +163,9 @@ C_SOURCES += \
162163
${TOP_DIR}/Src/apps/Tracker/main_tracker.c
163164
endif
164165

165-
ifeq ($(LORAMAC_APP),1)
166+
ifeq ($(LORAMAC_WAN),1)
166167
C_SOURCES += \
167-
${TOP_DIR}/Src/apps/LoRaMac/classA/main_loramac_a.c
168+
${TOP_DIR}/Src/apps/LoRaWAN/main_lorawan.c
168169
endif
169170

170171
ifeq ($(GNSS_APP),1)
@@ -303,10 +304,11 @@ C_INCLUDES = \
303304
-I${TOP_DIR}/smtc_tracker_app/Inc/boards \
304305
-I${TOP_DIR}/smtc_tracker_app/Inc/ble/app \
305306
-I${TOP_DIR}/smtc_tracker_app/Src/radio \
307+
-I${TOP_DIR}/smtc_tracker_app/Src/radio/lorawan_config \
306308
-I${TOP_DIR}/smtc_tracker_app/Src/radio/wifi \
307309
-I${TOP_DIR}/smtc_tracker_app/Src/radio/gnss \
308310
-I${TOP_DIR}/smtc_tracker_app/Src/radio/lr1110_modem/src \
309-
-I${TOP_DIR}/smtc_tracker_app/Src/apps/LoRaMac/classA \
311+
-I${TOP_DIR}/smtc_tracker_app/Src/apps/LoRaWAN \
310312
-I${TOP_DIR}/smtc_tracker_app/Src/apps/Tracker \
311313
-I${TOP_DIR}/smtc_tracker_app/Src/apps/update_firmware \
312314

hex_merged/lr1110_modem_tracker_EU868.hex

Lines changed: 1248 additions & 1214 deletions
Large diffs are not rendered by default.

hex_merged/lr1110_modem_tracker_US915.hex

Lines changed: 1248 additions & 1214 deletions
Large diffs are not rendered by default.

hex_merged/lr1110_modem_tracker_tx_continuous.hex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,7 +1948,7 @@
19481948
:20F3C00038B180480068806818B17E49096888688047EAE07B48006838B17A480068C06844
19491949
:20F3E00018B178490968C8688047DEE07548006848B174480068006928B19DF80E00714A7B
19501950
:20F40000126811698847D0E06E48006878B36D480068406958B39DF80E00403847B29DF8B6
1951-
:20F420000F0080004FFA80F804E0C7E0BEE05BE0BAE085E09DF810909DF811A0BDF80E04D7
1951+
:20F420000F0040B24FEAA00804E0C7E0BEE05BE0BAE085E09DF810909DF811A0BDF80E0445
19521952
:20F44000001FC5B2002006E00DF10E01021D8A5C0A54411CC8B2A842F6DB0DF10E00CDE94C
19531953
:20F4600000055848006803E04AE079E084E007E053464A464146D0F814C03846E04700BF1E
19541954
:20F4800093E05048006890B14E480068806970B19DF80E00C0F301159DF80E0000F00F079B
@@ -2018,7 +2018,7 @@
20182018
:20FC80000C2201A900903846FFF734FE04B0BDE8F087000098B000BFFEF700FCFEF728FC75
20192019
:20FCA0002148089008A92148FFF76CFA00BF20A0FEF767FD20A0FEF764FD00BF00BF20A0A1
20202020
:20FCC000FEF75FFD20A0FEF75CFD2148FEF759FD17A0FEF756FD00BF04A91448FFF7C5FC93
2021-
:20FCE000BDF81C101BA0FEF74CFD20A00699FEF748FD24A00499FEF744FD03210B48FFF78D
2021+
:20FCE000BDF81C101BA0FEF74CFD20A00699FEF748FD24A00499FEF744FD01210B48FFF78F
20222022
:20FD0000CBFE0A48FFF766FF33200021009101231622CDE9011021490448FFF785FF02E033
20232023
:20FD20000248FFF7FBFAFBE715FA0008E40200201B5B306D000000000D0A0D0A000000004E
20242024
:20FD40001B5B303B33326D00494E464F203A2000C00301084C4F524157414E2020202020CA

hex_merged/lr1110_modem_tracker_update_modem_to_modem.hex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1975,7 +1975,7 @@
19751975
:20F720008047F6E08148006838B180480068806818B17E49096888688047EAE07B4800684D
19761976
:20F7400038B17A480068C06818B178490968C8688047DEE07548006848B174480068006913
19771977
:20F7600028B19DF80E00714A126811698847D0E06E48006878B36D480068406958B39DF830
1978-
:20F780000E00403847B29DF80F0080004FFA80F804E0C7E0BEE05BE0BAE085E09DF810906D
1978+
:20F780000E00403847B29DF80F0040B24FEAA00804E0C7E0BEE05BE0BAE085E09DF81090DB
19791979
:20F7A0009DF811A0BDF80E04001FC5B2002006E00DF10E01021D8A5C0A54411CC8B2A8426F
19801980
:20F7C000F6DB0DF10E00CDE900055848006803E04AE079E084E007E053464A464146D0F860
19811981
:20F7E00014C03846E04700BF93E05048006890B14E480068806970B19DF80E00C0F30115A9

hex_merged/lr1110_modem_tracker_update_trx_to_modem.hex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1975,7 +1975,7 @@
19751975
:20F720008047F6E08148006838B180480068806818B17E49096888688047EAE07B4800684D
19761976
:20F7400038B17A480068C06818B178490968C8688047DEE07548006848B174480068006913
19771977
:20F7600028B19DF80E00714A126811698847D0E06E48006878B36D480068406958B39DF830
1978-
:20F780000E00403847B29DF80F0080004FFA80F804E0C7E0BEE05BE0BAE085E09DF810906D
1978+
:20F780000E00403847B29DF80F0040B24FEAA00804E0C7E0BEE05BE0BAE085E09DF81090DB
19791979
:20F7A0009DF811A0BDF80E04001FC5B2002006E00DF10E01021D8A5C0A54411CC8B2A8426F
19801980
:20F7C000F6DB0DF10E00CDE900055848006803E04AE079E084E007E053464A464146D0F860
19811981
:20F7E00014C03846E04700BF93E05048006890B14E480068806970B19DF80E00C0F30115A9

0 commit comments

Comments
 (0)