Diff: main.cpp

Revision:

19:68f3a84dbc8f

Parent:

17:d50191689d1f

Child:

20:5856f9bfd8e3

--- a/main.cpp	Tue Aug 20 14:06:45 2019 +0000
+++ b/main.cpp	Thu May 28 09:13:44 2020 +0000
@@ -24,8 +24,8 @@
 
 alp_d7a_itf_t alarm_itf = {
     .type                           = ALP_ITF_TYPE_D7A,
-    .cfg.to                         = 0,
-    .cfg.te                         = 0,
+    .cfg.to.byte                    = D7A_CTF_ENCODE(0),
+    .cfg.te.byte                    = D7A_CTF_ENCODE(0),
     .cfg.qos.bf.resp                = D7A_RESP_ALL,
     .cfg.qos.bf.retry               = ALP_RPOL_ONESHOT,
     .cfg.addressee.ctrl.bf.nls      = D7A_NLS_AES_CCM_64,
@@ -43,7 +43,7 @@
 // Main Callback
 void my_main_callback(uint8_t terminal, int8_t err, uint8_t id)
 {
-    if (ALP_ERR_NONE != err)
+    if (ALP_ERR_NONE > err)
     {
         modem_print_error(ALP_ITF_TYPE_D7A, err);
     }
@@ -59,7 +59,7 @@
 {
     (void)id;
     
-    if (ALP_ERR_NONE != err)
+    if (ALP_ERR_NONE > err)
     {
         modem_print_error(ALP_ITF_TYPE_D7A, err);
     }
@@ -74,9 +74,13 @@
         {
             modem_resp.put((void*)MODEM_RESP_ACK);
         }
+        else if (ALP_ERR_NONE > err)
+        {
+            modem_resp.put((void*)MODEM_RESP_ERROR);
+        }
         else
         {
-            modem_resp.put((void*)MODEM_RESP_ERROR);
+            return;
         }
     }
     
@@ -225,11 +229,6 @@
     // this, don't use D7AActP Notification but rather plain ALP ITF Forwarding.
     // Declaration just allows remote access.
     modem_update_file(FID_ALARM, (alp_file_header_t*)&h_alarm, (uint8_t*)&f_alarm);
-
-    // Configure URC: LQUAL on report file notification every 10 reports
-    PRINT("Setup URCs\n");
-    modem_enable_urc(ALP_URC_TYPE_LQUAL, IFID_REPORT, 10, true, id);
-    modem_ready.acquire();
     
     PRINT("Start D7A Stack\n");
     modem_activate_itf(ALP_ITF_TYPE_D7A, 24, 0, ALP_D7A_ISTAT_RESP | ALP_D7A_ISTAT_UNS | ALP_D7A_ISTAT_EOP, true, id);
@@ -249,7 +248,7 @@
     DebouncedInterrupt user_interrupt(DEBUG_BUTTON);
     user_interrupt.attach(button_push_isr, IRQ_FALL, 500, true);
     
-    Thread but_th(osPriorityNormal, 2048, NULL);
+    Thread but_th(osPriorityNormal, 4096, NULL);
     osStatus status = but_th.start(button_user_thread);
     ASSERT(status == osOK, "Failed to start but thread (err: %d)\r\n", status);
 #endif