Diff: src/d7a_sys.cpp

Revision:

83:f4054d0b29ba

Parent:

79:82b01c1a62f6

Child:

84:e5388f1b8ed9

diff -r 5d1b101b6d11 -r f4054d0b29ba src/d7a_sys.cpp
--- a/src/d7a_sys.cpp	Thu Jan 05 12:37:44 2017 +0000
+++ b/src/d7a_sys.cpp	Thu Jan 05 12:59:13 2017 +0000
@@ -10,9 +10,11 @@
 #if 0
     #define SYS_DPRINT(...)         DPRINT(__VA_ARGS__)
     #define SYS_DPRINT_DATA(...)    DPRINT_DATA(__VA_ARGS__)
+    #define SYS_FPRINT(...)         FPRINT(__VA_ARGS__)
 #else
     #define SYS_DPRINT(...);
     #define SYS_DPRINT_DATA(...);
+    #define SYS_FPRINT(...);
 #endif
 
 static Thread                       g_sys_thread(osPriorityHigh, 512, NULL);
@@ -23,7 +25,7 @@
 
 d7a_errors_t d7a_sys_open(void)
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
     
     osStatus err = g_sys_thread.start(d7a_sys_thread);
     ASSERT(err == osOK, "Failed to start d7a_sys_thread (err: %d)\r\n", err);
@@ -33,7 +35,7 @@
 
 d7a_errors_t d7a_sys_close(void)
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
 
     g_sys_thread.terminate();
     
@@ -42,20 +44,20 @@
 
 void d7a_sys_new_pkt(d7a_com_rx_msg_t* pkt)
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
     ASSERT(g_sys_pkt_queue.put(pkt) == osOK, "SYS queue full!\r\n");
 }
 
 d7a_com_rx_msg_t* d7a_sys_wait_pkt( uint32_t millisec )
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
     osEvent evt = g_sys_pkt_queue.get(millisec);
     return (evt.status == osEventMessage)? (d7a_com_rx_msg_t*)evt.value.p : NULL;
 }
 
 void d7a_sys_tlev(uint8_t mod, uint16_t lev)
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
     uint8_t buf[3];
     
     buf[0] = mod;
@@ -67,7 +69,7 @@
 
 bool d7a_sys_ping_modem(uint32_t millisec)
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
     uint8_t buf[5] = "PING";
     
     d7a_com_dump(buf, 4, KAL_COM_FLOW_SYS_PING);
@@ -79,7 +81,7 @@
 
 void d7a_sys_software_reset(void)
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
     uint8_t buf[4] = "RST";
 
     d7a_com_dump(buf, 3, KAL_COM_FLOW_SYS_RST);
@@ -87,7 +89,7 @@
 
 void d7a_sys_button(uint8_t button)
 {
-    FPRINT("\r\n");
+    SYS_FPRINT("\r\n");
     button += '0';
     
     d7a_com_dump(&button, 1, KAL_COM_FLOW_SYS_BUTTON);
@@ -101,7 +103,7 @@
 
 void d7a_sys_thread()
 {
-    FPRINT("(id:0x%08x)\r\n", osThreadGetId());
+    SYS_FPRINT("(id:0x%08x)\r\n", osThreadGetId());
     d7a_com_rx_msg_t* pkt;
     
     while (true)