key

[coffee/mt-apps.git] / mt_rfid.c

diff --git a/mt_rfid.c b/mt_rfid.c
index 3176d778d0cdc081dff5686d1e025c2ed9b3337d..e661337651c3f1059a4578b231569477537ce91a 100644 (file)
--- a/mt_rfid.c
+++ b/mt_rfid.c
@@ -9,6 +9,7 @@
 
 #include "mt_rfid.h"
 #include "signal_exit.h"
+#include "json_helpers.h"
 
 // shit to avoid constant repetition
 #define CONCAT_AGAIN(A,B) A ## B
@@ -84,15 +85,8 @@ static int tty_open(const char *port, int br)
     return fd;
 }
 
-// really simple JSON helpers
-#define JSON_START()   dprintf(fd,"{")
-#define JSON_NUM(NAME) dprintf(fd,"\"" #NAME "\":%d", NAME) //see the int?
-#define JSON_NEXT()    dprintf(fd,",")
-#define JSON_STR(NAME) dprintf(fd,"\"" #NAME "\":\"%s\"", NAME)
-#define JSON_END()     dprintf(fd,"}\n")
-
 // print complete json
-#define JSON_PRINT() do { \
+#define RFID_JSON_PRINT() do { \
     JSON_START();         \
     JSON_STR(type);       \
     JSON_NEXT();          \
@@ -128,7 +122,7 @@ static void ufr_read(char *uid, int fd)
         return;
     }
 
-    JSON_PRINT();
+    RFID_JSON_PRINT();
 
 #ifdef UFR_BEEP
     ReaderUISignal(0, 1); // no light, one beep