Release v2.0.0

README.md

@@ -1,21 +1,25 @@
-# LR1110 evaluation kit
+
+# LR1110 evaluation kit - demonstration application
 
 ## Introduction
 
-This repository provides everything you need to use a LR1110 evaluation kit.
+This repository proposes a demonstration application running on a **LR1110 evaluation kit**.
+
+Additional assets can be found in [the Wiki](https://github.com/Lora-net/lr1110_evk_demo_app/wiki/home) (software packages, command tool, etc.).
 
 ## Applicative Host
 
-This project needs an applicative companion software to be running on a computer.
+When using a **LR1110 transceiver**, an applicative companion software running on a computer shall be used.
+
 This section describes the steps to build/install/use it.
 
 ### Build & Install
 
-To build the host softwares, proceed as follow:
+To build the host software, proceed as follow:
 
 ```bash
 $ cd $TOP_DIR/host
-$ python ./setup.py sdist # Build the source distribution archive
+$ python ./setup.py sdist # Build the source distribution archive
 $ python -m pip install dist/<BUILT_SOURCE_DIST>.tar.gz # Install the previously built source distribution
 ```
 
@@ -33,10 +37,25 @@ In case of need, a short help page is available:
 $ Lr1110Demo --help
 ```
 
-## Wiki
+### AlmanacUpdate Usage
+
+The `AlmanacUpdate` command line program is to be used to execute a full almanac update operation of the LR1110 (both transceiver and modem).
+
+It can use almanac coming either from a DAS server or from a GLS server (default is DAS server).
+
+To use it, execute the following in a command line:
+
+```bash
+$ AlmanacUpdate -h
+# Display the help message with all possible flags
+
+$ AlmanacUpdate -d <EVK_COM_PORT> <DAS_TOKEN>
+# Update the almanac of an evaluation kit connected on <EVK_COM_PORT> using DAS server
+
+$ AlmancUpdate -g -d <EVK_COM_PORT> <GLS_TOKEN>
+# Update the almanac of an evaluation kit connected on <EVK_COM_PORT> using GLS server
+```
 
-The Wiki will give you all the information about this evaluation kit:
+A correct execution of the almanac update operation is determined by the trace being terminated with message *Check terminated*.
 
- - [Software packages](https://github.com/Lora-net/lr1110_evk/wiki/Software-packages)
- - [Demonstration examples](https://github.com/Lora-net/lr1110_evk/wiki/Demonstration-examples)
- - [Updater tool](https://github.com/Lora-net/lr1110_evk/wiki/Updater-tool)
+*Note: this command can also be used to update the almanacs of a **LoRa Basics Modem-E**.*

embedded/Makefile

@@ -49,6 +49,7 @@ BUILD_DIR = build
 # C sources
 C_SOURCES =  \
 application/src/lr1110_hal.c \
+application/src/lr1110_modem_hal.c \
 STM32L4xx_HAL_Driver/Src/stm32l4xx_ll_spi.c \
 STM32L4xx_HAL_Driver/Src/stm32l4xx_ll_tim.c \
 STM32L4xx_HAL_Driver/Src/stm32l4xx_ll_lptim.c \
@@ -82,7 +83,12 @@ lr1110_driver/src/lr1110_radio.c \
 lr1110_driver/src/lr1110_regmem.c \
 lr1110_driver/src/lr1110_system.c \
 lr1110_driver/src/lr1110_wifi.c \
-gcc/syscalls.c \
+lr1110_modem_driver/src/lr1110_modem_driver_version.c \
+lr1110_modem_driver/src/lr1110_modem_gnss.c \
+lr1110_modem_driver/src/lr1110_modem_lorawan.c \
+lr1110_modem_driver/src/lr1110_modem_system.c \
+lr1110_modem_driver/src/lr1110_modem_wifi.c \
+gcc/redirect.c \
 gcc/usart_redirect.c
 
 # Integration of the LVGL library
@@ -101,27 +107,44 @@ communication/src/communication_interface.cpp \
 communication/src/communication_print_only.cpp \
 communication/src/communication_demo.cpp \
 communication/src/communication_field_test.cpp \
+connectivity/src/connectivity_manager_interface.cpp \
+connectivity/src/connectivity_manager_modem.cpp \
+connectivity/src/connectivity_manager_transceiver.cpp \
 demo/src/environment_interface.cpp \
-demo/src/demo_base.cpp \
-demo/src/demo_transceiver_base.cpp \
-demo/src/demo_wifi_interface.cpp \
-demo/src/demo_wifi_scan.cpp \
-demo/src/demo_wifi_country_code.cpp \
-demo/src/demo_wifi_types.cpp \
-demo/src/demo_gnss_autonomous.cpp \
-demo/src/demo_gnss_base.cpp \
-demo/src/demo_gnss_assisted.cpp \
-demo/src/demo_radio_interface.cpp \
-demo/src/demo_ping_pong.cpp \
-demo/src/demo_tx_cw.cpp \
-demo/src/demo_radio_per.cpp \
-demo/src/demo.cpp\
-demo/src/device_base.cpp \
-demo/src/device_transceiver.cpp \
+demo/src/demo_modem_interface.cpp \
+demo/src/demo_modem_wifi.cpp \
+demo/src/demo_modem_gnss_interface.cpp \
+demo/src/demo_modem_gnss_autonomous.cpp \
+demo/src/demo_modem_gnss_assisted.cpp \
+demo/src/demo_modem_radio_tx_continuous.cpp \
+demo/src/demo_modem_radio_tx_cw.cpp \
+demo/src/demo_modem_radio_rx_continuous.cpp \
+embedded/demo/src/demo_modem_radio_converters.cpp \
+demo/src/demo_interface.cpp \
+demo/src/demo_transceiver_interface.cpp \
+demo/src/demo_transceiver_wifi_interface.cpp \
+demo/src/demo_transceiver_wifi_scan.cpp \
+demo/src/demo_transceiver_wifi_country_code.cpp \
+demo/src/demo_transceiver_gnss_autonomous.cpp \
+demo/src/demo_transceiver_gnss_interface.cpp \
+demo/src/demo_transceiver_gnss_assisted.cpp \
+demo/src/demo_transceiver_radio_interface.cpp \
+demo/src/demo_transceiver_radio_ping_pong.cpp \
+demo/src/demo_transceiver_radio_tx_cw.cpp \
+demo/src/demo_transceiver_radio_per.cpp \
+demo/src/demo_manager_interface.cpp \
+demo/src/demo_manager_transceiver.cpp \
+demo/src/demo_manager_modem.cpp \
+device/src/device_interface.cpp \
+device/src/device_transceiver.cpp \
+device/src/device_modem.cpp \
+demo/src/interruption_irq.cpp \
+demo/src/interruption_modem.cpp \
 gui/src/gui.cpp \
 gui/src/guiCommon.cpp \
 gui/src/guiMenuCommon.cpp \
 gui/src/guiMenu.cpp \
+gui/src/guiConnectivity.cpp \
 gui/src/guiMenuRadioTestModes.cpp \
 gui/src/guiConfigRadioTestModes.cpp \
 gui/src/guiRadioTxCw.cpp \
@@ -136,7 +159,10 @@ gui/src/guiTestGnss.cpp \
 gui/src/guiTestWifi.cpp \
 gui/src/guiConfigWifi.cpp \
 gui/src/guiConfigGnss.cpp \
+gui/src/guiConfigGnssAssistancePosition.cpp \
+gui/src/guiEui.cpp \
 supervisor/src/supervisor.cpp \
+connectivity/src/connectivity_conversions.cpp \
 hci/hci.cpp \
 hci/Command/Src/command_base.cpp \
 hci/Command/Src/command_factory.cpp \
@@ -215,9 +241,11 @@ AS_INCLUDES =
 C_INCLUDES =  \
 -Iapplication/inc \
 -Icommunication/inc \
+-Iconnectivity/inc \
 -ICMSIS/Device/ST/STM32L4xx/Include \
 -ICMSIS/Core/Include \
 -Idemo/inc \
+-Idevice/inc \
 -Idisplay_touch/inc \
 -Igui/inc\
 -Ilvgl \
@@ -233,6 +261,7 @@ C_INCLUDES =  \
 -Isupervisor/inc \
 -Isystem/inc \
 -Ilr1110_driver/src \
+-Ilr1110_modem_driver/src \
 -Ihci \
 -Ihci/Command/Inc
 

embedded/application/inc/configuration.h

@@ -32,8 +32,6 @@
 #ifndef _CONFIGURATION_H
 #define _CONFIGURATION_H
 
-#include "lr1110_hal.h"
-
 #include "stm32l4xx_ll_gpio.h"
 #include "stm32l4xx_ll_spi.h"
 

embedded/application/inc/version.h

@@ -32,23 +32,44 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#include "lr1110_system_types.h"
+#define DEMO_VERSION "v2.0.0"
 
-#ifndef DEMO_VERSION
-#warning "No demo version provided"
-#define DEMO_VERSION "v1.4.0"
-#endif
+#define VERSION_STRING_LENGTH 10
+#define EUI_LENGTH 8
+#define PIN_LENGTH 4
+
+typedef enum
+{
+    VERSION_DEVICE_TRANSCEIVER,
+    VERSION_DEVICE_MODEM,
+} version_device_type_t;
 
 typedef struct
 {
-    char                version_sw[10];
-    char                version_driver[10];
-    uint8_t             version_chip_type;
-    uint8_t             version_chip_hw;
-    uint16_t            version_chip_fw;
-    lr1110_system_uid_t chip_uid;
-    uint16_t            almanac_date;
-    uint32_t            almanac_crc;
+    version_device_type_t device_type;
+    char                  version_sw[VERSION_STRING_LENGTH];
+    char                  version_driver[VERSION_STRING_LENGTH];
+    uint8_t               chip_uid[EUI_LENGTH];
+    uint8_t               dev_eui[EUI_LENGTH];
+    uint8_t               join_eui[EUI_LENGTH];
+    uint8_t               pin[PIN_LENGTH];
+    uint16_t              almanac_date;
+    uint32_t              almanac_crc;
+    union
+    {
+        struct
+        {
+            uint8_t  version_chip_type;
+            uint8_t  version_chip_hw;
+            uint16_t version_chip_fw;
+        } transceiver;
+        struct
+        {
+            uint8_t  version_chip_type;
+            uint32_t version_chip_bootloader;
+            uint32_t version_chip_fw;
+        } modem;
+    };
 } version_handler_t;
 
 #endif