Diff: main.cpp

Revision:

4:999305b576c0

Parent:

3:3811610b75cd

Child:

5:ee132af18614

--- a/main.cpp	Fri May 12 14:04:43 2017 +0000
+++ b/main.cpp	Mon May 15 15:56:47 2017 +0000
@@ -18,6 +18,7 @@
 #include "modem_ref.h"
 #include "kal_fs.h"
 #include "d7a_1x.h"
+#include "d7a_1x_fs.h"
 #include "alp.h"
 
 
@@ -100,6 +101,8 @@
     d7a_sp_res_t istat;
     uint8_t nb = 0;
     
+    memset(&istat, 0, sizeof(d7a_sp_res_t));
+    
     // Load alarm value
     ram_fs_read(FID_ALARM, 0, 1, &alarm);
     
@@ -129,13 +132,13 @@
             evt = modem_resp.get();
             resp = (evt.status == osEventMessage)? (uint32_t)evt.value.p : NULL;
             
-            if (MODEM_RESP_DONE == resp)
-            {
-                nb++;
-                PRINT("ACK %d: ", nb);
-                PRINT_DATA("UID:", "%02X", istat.addressee.id, 8, " ");
-                PRINT("rxlev:%d lb:%d\n", istat.rxlev, istat.lb);
-            }
+            nb++;
+            PRINT("ACK %d: ", nb);
+            PRINT_DATA("UID:", "%02X", istat.addressee.id, 8, " ");
+            PRINT("rxlev:%d lb:%d\n", istat.rxlev, istat.lb);
+            
+            memset(&istat, 0, sizeof(d7a_sp_res_t));
+            
         } while (MODEM_RESP_TERMINAL != resp);
         
         PRINT("BUTTON ALARM DONE\r\n");
@@ -289,7 +292,7 @@
         
     // Release reset
     DigitalIn reset_release(MODEM_PIN_RESET);
-    Thread::wait(1000);
+    Thread::wait(2000);
         
     // Open modem Com port
     g_modem_com = new WizziCom(MODEM_PIN_TX, MODEM_PIN_RX, MODEM_PIN_IRQ_OUT, MODEM_PIN_IRQ_IN);
@@ -304,10 +307,10 @@
     PRINT("Start Modem Process (id=%d)\n", g_main_id);
     Thread::wait(1000);
     
-    modem_read_file(0, (uint8_t*)&uid.b[0], 0, 8, g_main_id);
+    modem_read_file(D7A_FID_UID, uid.b, 0, 8, g_main_id);
     modem_ready.wait();
     
-    modem_read_file(2, (uint8_t*)&rev, 0, sizeof(revision_t), g_main_id);
+    modem_read_file(D7A_FID_FIRMWARE_VERSION, (uint8_t*)&rev, 0, sizeof(revision_t), g_main_id);
     modem_ready.wait();
     
     PRINT("------------ D7A Modem infos ------------\r\n");
@@ -344,7 +347,7 @@
     modem_ready.wait();
     
     PRINT("Notify Modem Version\n");
-    modem_notify_file(FID_MODEM_REV, 0, SIZE_HOST_REV, g_main_id);
+    modem_notify_file(D7A_FID_FIRMWARE_VERSION, 0, SIZE_HOST_REV, g_main_id);
     modem_ready.wait();
     
     PRINT("Notify FW Version\n");
@@ -360,7 +363,7 @@
     ASSERT(status == osOK, "Failed to start but thread (err: %d)\r\n", status);
 #endif
 
-#ifdef DEBUG_LED
+#if (DEBUG_LED != NC)
     DigitalOut my_led(DEBUG_LED);
 #endif
     
@@ -369,7 +372,7 @@
     while(true)
     {
         Thread::wait(500);
-#ifdef DEBUG_LED
+#if (DEBUG_LED != NC)
         my_led = !my_led;
 #endif
     }