Merge pull request #39 from insightsip/develop

Develop
insightsip · Mar 1, 2023 · 6c4c99a · 6c4c99a
2 parents 8a25539 + eaf602b
commit 6c4c99a
Show file tree

Hide file tree

Showing 39 changed files with 19,775 additions and 727 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,14 @@ The gateways used with the pre-certification tool are the Semtech Picocell SX130
 
 ## Changelog
 
+### 2023-03-01, v3.1.11
+
+- Add ISP4580 project
+
+### 2023-02-14, v3.1.10
+
+- Fix SES projects
+
 ### 2022-05-13, v3.1.8
 
 - Fix certification issues and re-transmission handling.

diff --git a/src/apps/lorawan/at_commands/at_lib/at_manager.c b/src/apps/lorawan/at_commands/at_lib/at_manager.c
@@ -36,6 +36,7 @@
 #include "NvmDataMgmt.h"
 #include "RegionCommon.h"
 #include "LoRaMacTest.h"
+#include "version.h"
 
 #include "nrf_log.h"
 #include "nrf_log_ctrl.h"
@@ -210,7 +211,7 @@ static LmHandlerParams_t LmHandlerParams =
 
 static LmhpComplianceParams_t LmhpComplianceParams =
 {
-    .FwVersion.Value = FW_VERSION_NUM,
+    .FwVersion.Value = FW_VERSION,
     .OnTxPeriodicityChanged = OnTxPeriodicityChanged,
     .OnTxFrameCtrlChanged = OnTxFrameCtrlChanged,
     .OnPingSlotPeriodicityChanged = OnPingSlotPeriodicityChanged,

diff --git a/src/apps/lorawan/at_commands/at_lib/at_manager.h b/src/apps/lorawan/at_commands/at_lib/at_manager.h
@@ -23,8 +23,6 @@
 
 #include <stdint.h>
 
-#define FW_VERSION_STR          "3.1.10"
-#define FW_VERSION_NUM          0x03011000 // 3.1.10.0
 #define MODULE_NAME             "ISP4520"
 #define MAX_AT_PREFIX_SIZE      20
 

diff --git a/src/apps/lorawan/at_commands/main.c b/src/apps/lorawan/at_commands/main.c
@@ -57,6 +57,7 @@
 
 #include "at_manager.h"
 #include "board.h"
+#include "version.h"
 
 // Timer & scheduler
 #define APP_TIMER_PRESCALER         0                                           ///<  Value of the RTC1 PRESCALER register.
@@ -405,14 +406,14 @@ static void services_init(void)
     ret_code_t err_code;
     ble_dis_init_t dis_init;
 
-    char hw[2];
-    hw[0] = BoardGetRevision();
-    hw[1] = '\0';
+    char hw_rev[2];
+    hw_rev[0] = BoardGetRevision();
+    hw_rev[1] = '\0';
 
     memset(&dis_init, 0, sizeof(ble_dis_init_t));
     ble_srv_ascii_to_utf8(&dis_init.manufact_name_str,   (char*)MANUFACTURER_NAME);
     ble_srv_ascii_to_utf8(&dis_init.fw_rev_str,          (char*)FW_VERSION_STR);
-    ble_srv_ascii_to_utf8(&dis_init.hw_rev_str,          (char*)hw);
+    ble_srv_ascii_to_utf8(&dis_init.hw_rev_str,          (char*)hw_rev);
 
     dis_init.dis_char_rd_sec = SEC_OPEN;
 

diff --git a/src/apps/lorawan/at_commands/ses/at-commands.emProject b/src/apps/lorawan/at_commands/ses/at-commands.emProject
diff --git a/src/apps/lorawan/common/Commissioning.h b/src/apps/lorawan/common/Commissioning.h
@@ -40,7 +40,7 @@
  * When set to 1 the application uses the Over-the-Air activation procedure
  * When set to 0 the application uses the Personalization activation procedure
  */
-#define OVER_THE_AIR_ACTIVATION                            1
+#define OVER_THE_AIR_ACTIVATION                            0
 
 /*!
  * When using ABP activation the MAC layer must know in advance to which server

diff --git a/src/apps/lorawan/end-device/main.c b/src/apps/lorawan/end-device/main.c
@@ -19,12 +19,10 @@
  *
  *****************************************************************************/
 
-// Standards
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
-// nRF
 #include "nrf.h"
 #include "app_error.h"
 #include "app_timer.h"
@@ -33,21 +31,18 @@
 #include "nrf_drv_clock.h"
 #include "nrf_pwr_mgmt.h"
 
-// LoRa
 #include "board.h"
 #include "LmHandler.h"
 #include "LmhpCompliance.h"
 #include "Commissioning.h"
 #include "RegionCommon.h"
 #include "NvmDataMgmt.h"
+#include "version.h"
 
-//logs
 #include "nrf_log.h"
 #include "nrf_log_ctrl.h"
 #include "nrf_log_default_backends.h"
 
-
-#define FIRMWARE_VERSION                        0x03011000 // 3.1.10.0
 #define SCHED_MAX_EVENT_DATA_SIZE               APP_TIMER_SCHED_EVENT_DATA_SIZE /**< Maximum size of scheduler events. */
 #define SCHED_QUEUE_SIZE                        60                              /**< Maximum number of events in the scheduler queue. */
 #define LORAWAN_DEFAULT_CLASS                   CLASS_A                         /**< LoRaWAN default end-device class. */
@@ -155,7 +150,7 @@ static LmHandlerParams_t LmHandlerParams =
 
 static LmhpComplianceParams_t LmhpComplianceParams =
 {
-    .FwVersion.Value = FIRMWARE_VERSION,
+    .FwVersion.Value = FW_VERSION,
     .OnTxPeriodicityChanged = OnTxPeriodicityChanged,
     .OnTxFrameCtrlChanged = OnTxFrameCtrlChanged,
     .OnPingSlotPeriodicityChanged = OnPingSlotPeriodicityChanged,

diff --git a/src/apps/lorawan/end-device/ses/end-device.emProject b/src/apps/lorawan/end-device/ses/end-device.emProject