Diff: src/d7a.cpp

Revision:

60:8d4133fbc060

Parent:

59:b42eae56b51b

Child:

63:afd046faedb0

diff -r b42eae56b51b -r 8d4133fbc060 src/d7a.cpp
--- a/src/d7a.cpp	Fri Sep 23 15:00:41 2016 +0000
+++ b/src/d7a.cpp	Mon Sep 26 12:42:32 2016 +0000
@@ -246,6 +246,26 @@
     FREE(msg);
 }
 
+void d7a_print_msg(d7a_msg_t** msg)
+{
+    uint8_t i = 0;
+    while (msg[i] != NULL)
+    {
+        PRINT("MSG %2d ERR:%4d", i, msg[i]->err);
+        if (msg[i]->lb)
+        {
+            PRINT_DATA(" UID:", "%02X", msg[i]->id, 8, " ");
+            PRINT("LB:%3d", msg[i]->lb);
+        }
+        if (msg[i]->data)
+        {
+            PRINT(" FID: %3d OFF: %3d LEN: %3d", msg[i]->data->fid, msg[i]->data->offset, msg[i]->data->length);
+            PRINT_DATA(" DATA:", " %02X", msg[i]->data->buf, msg[i]->data->length, "");
+        }
+        PRINT("\r\n");
+        i++;
+    }
+}
 
 void d7a_modem_print_infos(void)
 {
@@ -254,13 +274,15 @@
     
     d7a_msg_t** msg;
     
-    msg = d7a_read(0, 0, 8);
-    ASSERT(msg[0]->err >= D7A_ERR_NONE, "Failed to read UID file\r\n");
-    memcpy(uid, msg[0]->data->buf, 8);
+    msg = d7a_read(0, 0, D7A_UID_LEN);
+    ASSERT(msg[0]->err >= D7A_ERR_NONE, "Failed to read UID file. err %d\r\n", msg[0]->err);
+    ASSERT(msg[0]->data, "No data in response\r\n");
+    memcpy(uid, msg[0]->data->buf, D7A_UID_LEN);
     d7a_free_msg(msg);
     
     msg = d7a_read(2, 0, sizeof(d7a_revision_t));
-    ASSERT(msg[0]->err >= D7A_ERR_NONE, "Failed to read UID file\r\n");
+    ASSERT(msg[0]->err >= D7A_ERR_NONE, "Failed to read UID file. err %d\r\n", msg[0]->err);
+    ASSERT(msg[0]->data, "No data in response\r\n");
     memcpy(&rev, msg[0]->data->buf, sizeof(d7a_revision_t));
     d7a_free_msg(msg);