Release v1.2.0

Lora-net · Nov 10, 2020 · 26a3b38 · 26a3b38
1 parent ed022c2
commit 26a3b38
Show file tree

Hide file tree

Showing 21 changed files with 1,058 additions and 1,216 deletions.
diff --git a/application/inc/version.h b/application/inc/version.h
@@ -41,7 +41,7 @@
 
 #ifndef DEMO_VERSION
 #warning "No demo version provided"
-#define DEMO_VERSION "v1.1.0"
+#define DEMO_VERSION "v1.2.0"
 #endif
 
 /*

diff --git a/application/src/lr1110_firmware_update.c b/application/src/lr1110_firmware_update.c
@@ -41,6 +41,7 @@
 #include "lr1110_firmware_update.h"
 #include "lr1110_modem_lorawan.h"
 #include "system.h"
+#include <stdint.h>
 
 /*
  * -----------------------------------------------------------------------------
@@ -156,12 +157,13 @@ lr1110_fw_update_status_t lr1110_update_firmware( void* radio, lr1110_fw_update_
             {
                 status = LR1110_FW_UPDATE_OK;
                 printf( "Expected firmware running!\n" );
+                printf( "Please flash another application (like EVK Demo App).\n" );
                 system_gpio_set_pin_state( lr1110_led_rx, SYSTEM_GPIO_PIN_STATE_HIGH );
             }
             else
             {
                 status = LR1110_FW_UPDATE_ERROR;
-                printf( "Error!\n" );
+                printf( "Error! Wrong firmware version - please retry.\n" );
                 system_gpio_set_pin_state( lr1110_led_tx, SYSTEM_GPIO_PIN_STATE_HIGH );
             }
             break;
@@ -178,16 +180,19 @@ lr1110_fw_update_status_t lr1110_update_firmware( void* radio, lr1110_fw_update_
             printf( " - LR1110 FW         = 0x%08x\n", version_modem.firmware );
             printf( " - LR1110 LORAWAN    = 0x%04x\n", version_modem.lorawan );
 
-            if( version_modem.firmware == fw_expected )
+            uint32_t fw_version = ( ( uint32_t )( version_modem.functionality ) << 24 ) + version_modem.firmware;
+
+            if( fw_version == fw_expected )
             {
                 status = LR1110_FW_UPDATE_OK;
                 printf( "Expected firmware running!\n" );
+                printf( "Please flash another application (like EVK Demo App).\n" );
                 system_gpio_set_pin_state( lr1110_led_rx, SYSTEM_GPIO_PIN_STATE_HIGH );
             }
             else
             {
                 status = LR1110_FW_UPDATE_ERROR;
-                printf( "Error!\n" );
+                printf( "Error! Wrong firmware version - please retry.\n" );
                 system_gpio_set_pin_state( lr1110_led_tx, SYSTEM_GPIO_PIN_STATE_HIGH );
             }
             break;

diff --git a/application/src/main.c b/application/src/main.c
@@ -120,13 +120,13 @@ int main( void )
             switch( status )
             {
             case LR1110_FW_UPDATE_OK:
-                gui_update( "UPDATE DONE!" );
+                gui_update( "UPDATE DONE!\nPlease flash another application\n(like EVK Demo App)" );
                 break;
             case LR1110_FW_UPDATE_WRONG_CHIP_TYPE:
                 gui_update( "WRONG CHIP TYPE" );
                 break;
             case LR1110_FW_UPDATE_ERROR:
-                gui_update( "ERROR" );
+                gui_update( "ERROR\nWrong firmware version\nPlease retry" );
                 break;
             }
 

diff --git a/lr1110_modem_driver/CHANGELOG.md b/lr1110_modem_driver/CHANGELOG.md
@@ -1,5 +1,29 @@
-# LR1110 Modem Driver Changelog
+# LR1110 modem driver changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v2.0.1] 2020-10-28
+
+### Fixed
+
+* Removed `LR1110_MODEM_DOWN_DATA_EVENT_ACK` and `LR1110_MODEM_DOWN_DATA_EVENT_NACK` from `lr1110_modem_down_data_flag_t`
+
+## [v2.0.0] 2020-10-23
+
+### Changed
+
+* `lr1110_modem_almanac_read_by_index` is renamed `lr1110_modem_gnss_almanac_read_by_index`
+* `lr1110_modem_gnss_scan_autonomous_md` takes an effort mode as parameter
+
+### Fixed
+
+* Various compilation warnings
+* Harmonization of the documentation
 
 ## [v1.0.0] 2020-10-19
 
-Initial release
+### Added
+
+* Initial release
diff --git a/lr1110_modem_driver/src/lr1110_bootloader.c b/lr1110_modem_driver/src/lr1110_bootloader.c
@@ -1,7 +1,7 @@
 /*!
- * \file      lr1110_bootloader.c
+ * @file      lr1110_bootloader.c
  *
- * \brief     Bootloader driver implementation for LR1110
+ * @brief     Bootloader driver implementation for LR1110
  *
  * Revised BSD License
  * Copyright Semtech Corporation 2020. All rights reserved.
@@ -20,8 +20,8 @@
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * ARE DISCLAIMED. IN NO EVENT SHALL SEMTECH CORPORATION BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -103,30 +103,30 @@ uint32_t min( uint32_t a, uint32_t b )
 }
 
 /*!
- * \brief Helper function to fill cbuffer with opcode and offset
+ * @brief Helper function to fill cbuffer with opcode and offset
  *
  * Typically used in write flash functions.
  *
- * \warning It is up to the caller to ensure the size of cbuffer is big enough to contain all information!
+ * @warning It is up to the caller to ensure the size of cbuffer is big enough to contain all information!
  */
 static void lr1110_bootloader_fill_cbuffer_opcode_offset_flash( uint8_t* cbuffer, uint16_t opcode, uint32_t offset );
 
 /*!
- * \brief Helper function to fill cdata with data
+ * @brief Helper function to fill cdata with data
  *
  * Typically used in write flash functions.
  *
- * \warning It is up to the caller to ensure the size of cdata is big enough to contain all data!
+ * @warning It is up to the caller to ensure the size of cdata is big enough to contain all data!
  */
 static void lr1110_bootloader_fill_cdata_flash( uint8_t* cdata, const uint32_t* data, uint8_t data_length );
 
 /*!
- * \brief Helper function to fill cbuffer and cdata with information to write flash
+ * @brief Helper function to fill cbuffer and cdata with information to write flash
  *
  * Typically used in write flash functions. Internally calls lr1110_bootloader_fill_cbuffer_opcode_offset_flash and
  * lr1110_bootloader_fill_cdata_flash.
  *
- * \warning It is up to the caller to ensure the sizes of cbuffer and cdata are big enough to contain their respective
+ * @warning It is up to the caller to ensure the sizes of cbuffer and cdata are big enough to contain their respective
  * information!
  */
 static void lr1110_bootloader_fill_cbuffer_cdata_flash( uint8_t* cbuffer, uint8_t* cdata, uint16_t opcode,