Diff: main.cpp

Revision:

4:45576db9f66c

Parent:

3:e905bf88e8a9

Child:

5:4da1ea72e7b4

--- a/main.cpp	Fri May 12 14:05:49 2017 +0000
+++ b/main.cpp	Mon May 15 15:58:31 2017 +0000
@@ -26,7 +26,7 @@
 sensor_config_t g_light_config;
 Queue<void, 8> g_file_modified;
 
-uint8_t g_main_id, g_report_id;
+uint8_t g_main_id;
 
 // Check parameters to see if data should be send
 static bool report_needed(sensor_config_t* cfg, int32_t value, int32_t last_value, uint32_t last_report_time)
@@ -282,7 +282,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);
@@ -298,10 +298,10 @@
     DPRINT("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, (uint8_t*)&uid.b[0], 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");
@@ -336,7 +336,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");
@@ -353,7 +353,7 @@
     status = th_sensor_light.start(thread_sensor_light);
     ASSERT(status == osOK, "Failed to start thread_sensor_light (err: %d)\r\n", status);
 
-#ifdef DEBUG_LED
+#if (DEBUG_LED != NC)
     DigitalOut my_led(DEBUG_LED);
 #endif
     
@@ -362,7 +362,7 @@
     while(true)
     {
         Thread::wait(500);
-#ifdef DEBUG_LED
+#if (DEBUG_LED != NC)
         my_led = !my_led;
 #endif
     }