Diff: main.cpp

Revision:

12:5e1fd1a5580a

Parent:

11:22ba8d277699

Child:

13:121c7447c4fa

--- a/main.cpp	Wed Sep 19 15:16:45 2018 +0000
+++ b/main.cpp	Thu Oct 11 14:07:26 2018 +0000
@@ -5,8 +5,6 @@
 #include "modem_ref_helper.h"
 #include "modem_callbacks.h"
 
-#define MY_POLICY_IDX           0
-
 Semaphore button_user(0);
 Semaphore modem_ready(0);
 Queue<void, 8> modem_resp;
@@ -17,7 +15,6 @@
     MODEM_RESP_DONE,
 };
 
-
 alp_d7a_itf_t my_itf = {
     .type                           = ALP_ITF_TYPE_D7A,
     .cfg.to                         = 0,
@@ -26,55 +23,26 @@
     .cfg.qos.bf.retry               = ALP_RPOL_ONESHOT,
     .cfg.addressee.ctrl.bf.nls      = D7A_NLS_AES_CCM_64,
     .cfg.addressee.ctrl.bf.idf      = D7A_ID_NBID,
-    .cfg.addressee.xcl.bf           = {.s = 0x2, .m = 0x1},// XXX D7A_XCL_GW,
-    .cfg.addressee.id[0]            = D7A_CTF_VAL(8,0),
+    .cfg.addressee.xcl.bf           = {.s = 2, .m = 0x1},// XXX D7A_XCL_GW,
+    .cfg.addressee.id[0]            = D7A_CTF_ENCODE(8),
 };
 
-void print_status(int status)
-{
-    switch (status)
-    {
-        case ALP_ERR_NONE:
-            //PRINT("Status: OK\n");
-            break;
-        case ALP_ERR_FILE_EXIST:
-            PRINT("Status: Already registered\n");
-            break;
-        default:
-            PRINT("Status: error %d\n", status);
-            break;
-    }
-}
-
-void print_resp(int status)
-{
-    switch (status)
-    {
-        case ALP_ERR_NONE:
-            //PRINT("Resp: OK\n");
-            break;
-        case ALP_ERR_FILE_EXIST:
-            PRINT("Resp: Already registered\n");
-            break;
-        default:
-            PRINT("Resp: error %d\n", status);
-            break;
-    }
-}
-
 // Callback for broadcast read
 void my_read_response_callback(uint8_t terminal, int8_t err, uint8_t id)
 {
     (void)id;
     
+    if (ALP_ERR_NONE != err)
+    {
+        modem_print_error(ALP_ITF_TYPE_D7A, err);
+    }
+    
     if (terminal)
     {    
-        print_status(err);
         modem_resp.put((void*)MODEM_RESP_TERMINAL);
     }
     else
     {
-        print_resp(err);
         if (ALP_ERR_NONE == err)
         {
             modem_resp.put((void*)MODEM_RESP_DONE);
@@ -164,15 +132,15 @@
 {
     (void)id;
     
+    if (ALP_ERR_NONE != err)
+    {
+        modem_print_error(ALP_ITF_TYPE_D7A, err);
+    }
+    
     if (terminal)
     {    
-        print_status(err);
         modem_ready.release();
     }
-    else
-    {
-        print_resp(err);
-    }
 }
 
 /*** Main function ------------------------------------------------------------- ***/