Diff: src/d7a_alp.cpp

Revision:

79:82b01c1a62f6

Parent:

78:f1c0affd99e7

Child:

80:30265d5dd20a

--- a/src/d7a_alp.cpp	Wed Dec 21 14:11:09 2016 +0000
+++ b/src/d7a_alp.cpp	Wed Dec 21 15:08:51 2016 +0000
@@ -10,6 +10,14 @@
 #include "d7a_alp.h"
 #include "sha.h"
 
+#if 0
+    #define ALP_DPRINT(...)         DPRINT(__VA_ARGS__)
+    #define ALP_DPRINT_DATA(...)    DPRINT_DATA(__VA_ARGS__)
+#else
+    #define ALP_DPRINT(...);
+    #define ALP_DPRINT_DATA(...);
+#endif
+
 #define ALP_CMD_MAX_LENGHT          (256)
 
 static uint8_t                      g_alp_tag;
@@ -219,20 +227,20 @@
                     rsp->msg->rxlev = res->rxlev; // Get RXLEV
                     memcpy(rsp->msg->id, res->addressee.id, D7A_UID_LEN); // Get UID
                     
-                    DPRINT("ALP RSP ISTATUS type:%02X lb: %3d ", type, rsp->msg->lb);
+                    ALP_DPRINT("ALP RSP ISTATUS type:%02X lb: %3d ", type, rsp->msg->lb);
                     DPRINT_DATA("UID:", "%02X", rsp->msg->id, D7A_UID_LEN, "\r\n");
                 }
                 else
                 {
                     uint8_t aid = *p++; // Action ID
                     rsp->msg->err = *p++; // Status
-                    DPRINT("ALP RSP STATUS aid:%d Status:%d\r\n", aid, rsp->msg->err);
+                    ALP_DPRINT("ALP RSP STATUS aid:%d Status:%d\r\n", aid, rsp->msg->err);
                 }
                 break;
             case ALP_OPCODE_RSP_TAG:
                 rsp->eop = !!(ctrl & ALP_CTRL_EOP);
                 rsp->tag = *p++; // TAG
-                DPRINT("ALP RSP TAG %d EOP %d\r\n", rsp->tag, rsp->eop);
+                ALP_DPRINT("ALP RSP TAG %d EOP %d\r\n", rsp->tag, rsp->eop);
                 break;
             case ALP_OPCODE_RSP_F_DATA:
                 uint8_t fid;
@@ -246,7 +254,7 @@
                 rsp->msg->data->offset = offset;
                 rsp->msg->data->length = length;
                 p += d7a_alp_add(rsp->msg->data->buf, p, length);
-                DPRINT("ALP RSP F_DATA f:%d o:%d s:%d\r\n", fid, offset, length);
+                ALP_DPRINT("ALP RSP F_DATA f:%d o:%d s:%d\r\n", fid, offset, length);
                 //DPRINT_DATA("DATA: ", "%02X ", (uint8_t*)rsp->data, rsp->data_len, "\r\n");
                 break;
             default:
@@ -407,7 +415,7 @@
         // Check for END OF PAYLOAD
         if (pl->eop)
         {
-            DPRINT("EOP\r\n");
+            ALP_DPRINT("EOP\r\n");
             
             // If tag only
             if (!pl->msg->data && !pl->msg->lb && i != 0)
@@ -417,7 +425,7 @@
             }
             else
             {
-                DPRINT("last response (err %d)\r\n", pl->msg->err);
+                ALP_DPRINT("last response (err %d)\r\n", pl->msg->err);
                 ret[i] = pl->msg;
             }
             
@@ -427,7 +435,7 @@
         // Wait for new msg
         else
         {
-            DPRINT("next response (err %d)\r\n", pl->msg->err);
+            ALP_DPRINT("next response (err %d)\r\n", pl->msg->err);
             ret[i] = pl->msg;
             FREE(pl);
             i++;
@@ -637,13 +645,13 @@
         switch(pkt->id)
         {
             case KAL_COM_FLOW_AT_RESP:
-                DPRINT("KAL_COM_FLOW_AT_RESP\r\n");
+                ALP_DPRINT("KAL_COM_FLOW_AT_RESP\r\n");
 
                 d7a_alp_new_pl(pkt);
                 
                 break;
             case KAL_COM_FLOW_AT_UNS:
-                DPRINT("KAL_COM_FLOW_AT_UNS\r\n");
+                ALP_DPRINT("KAL_COM_FLOW_AT_UNS\r\n");
                 if (g_alp_uns_msg)
                 {
                     d7a_msg_t** uns = (d7a_msg_t**)MALLOC(sizeof(d7a_msg_t*) * 2);