Diff: src/d7a_modem.cpp

Revision:

83:f4054d0b29ba

Parent:

82:5d1b101b6d11

Child:

84:e5388f1b8ed9

diff -r 5d1b101b6d11 -r f4054d0b29ba src/d7a_modem.cpp
--- a/src/d7a_modem.cpp	Thu Jan 05 12:37:44 2017 +0000
+++ b/src/d7a_modem.cpp	Thu Jan 05 12:59:13 2017 +0000
@@ -12,9 +12,11 @@
 #if 1
     #define MODEM_DPRINT(...)       DPRINT(__VA_ARGS__)
     #define MODEM_DPRINT_DATA(...)  DPRINT_DATA(__VA_ARGS__)
+    #define MODEM_FPRINT(...)       FPRINT(__VA_ARGS__)
 #else
     #define MODEM_DPRINT(...);
     #define MODEM_DPRINT_DATA(...);
+    #define MODEM_FPRINT(...);
 #endif
 
 #define MODEM_TO    (20000)
@@ -31,7 +33,7 @@
 
 d7a_errors_t d7a_modem_open(PinName reset_pin, NotifDoneFunction nd)
 {
-    FPRINT("\r\n");
+    MODEM_FPRINT("\r\n");
     
     d7a_errors_t err;
         
@@ -54,7 +56,7 @@
 
 d7a_errors_t d7a_modem_close(void)
 {
-    FPRINT("\r\n");
+    MODEM_FPRINT("\r\n");
         
     g_modem_thread.terminate();
     
@@ -68,21 +70,21 @@
 
 d7a_errors_t d7a_modem_wait_boot( uint32_t millisec )
 {
-    FPRINT("(%d)\r\n", millisec);
+    MODEM_FPRINT("(%d)\r\n", millisec);
     osEvent evt = g_modem_boot.get(millisec);
     return (evt.status == osEventMessage)? (d7a_errors_t)(int32_t)evt.value.p : D7A_ERR_CMD_TO;
 }
 
 d7a_errors_t d7a_modem_wait_ready( uint32_t millisec )
 {
-    FPRINT("(%d)\r\n", millisec);
+    MODEM_FPRINT("(%d)\r\n", millisec);
     osEvent evt = g_modem_ready.get(millisec);
     return (evt.status == osEventMessage)? (d7a_errors_t)(int32_t)evt.value.p : D7A_ERR_CMD_TO;
 }
 
 static void d7a_modem_soft_reset(void)
 {
-    FPRINT("\r\n");
+    MODEM_FPRINT("\r\n");
     IPRINT("MODEM Soft Reset.\r\n");
             
     // Clean buffer and queues
@@ -94,7 +96,7 @@
 
 static void d7a_modem_hard_reset(void)
 {
-    FPRINT("\r\n");
+    MODEM_FPRINT("\r\n");
         
     IPRINT("MODEM Hard Reset.\r\n");
     
@@ -116,7 +118,7 @@
 
 d7a_errors_t d7a_modem_reset(void)
 {
-    FPRINT("\r\n");
+    MODEM_FPRINT("\r\n");
     d7a_errors_t err = D7A_ERR_UNKNOWN;
     g_modem_booted = false;
 
@@ -141,20 +143,20 @@
 
 void d7a_modem_new_pkt(d7a_com_rx_msg_t* pkt)
 {
-    FPRINT("\r\n");
+    MODEM_FPRINT("\r\n");
     ASSERT(g_modem_pkt_queue.put(pkt) == osOK, "MODEM queue full!\r\n");
 }
 
 d7a_com_rx_msg_t* d7a_modem_wait_pkt(uint32_t millisec)
 {
-    FPRINT("(millisec:%d)\r\n", millisec);
+    MODEM_FPRINT("(millisec:%d)\r\n", millisec);
     osEvent evt = g_modem_pkt_queue.get(millisec);
     return (evt.status == osEventMessage)? (d7a_com_rx_msg_t*)evt.value.p : NULL;
 }
 
 void d7a_modem_msg(uint8_t value, uint8_t* buf, uint8_t len)
 {
-    FPRINT("(value:0x%02X, buf:0x%08x, len:%d)\r\n", value, buf, len);
+    MODEM_FPRINT("(value:0x%02X, buf:0x%08x, len:%d)\r\n", value, buf, len);
     d7a_com_tx_msg_t msg;
     uint8_t val = value;
     msg.id = KAL_COM_FLOW_CMD;
@@ -217,7 +219,7 @@
 
 void d7a_modem_thread()
 {
-    FPRINT("(id:0x%08x)\r\n", osThreadGetId());
+    MODEM_FPRINT("(id:0x%08x)\r\n", osThreadGetId());
     d7a_com_rx_msg_t* pkt;
     
     while (true)