Diff: modem_ref_helper.cpp

Revision:

23:4ef5c82089a3

Parent:

22:dccf7ff5fa7e

Child:

28:d3b2889f9fab

--- a/modem_ref_helper.cpp	Mon Jan 29 18:07:37 2018 +0000
+++ b/modem_ref_helper.cpp	Wed Jan 31 11:25:36 2018 +0000
@@ -70,7 +70,7 @@
     return (size1 + size2);
 }
 
-// Callback for user_id User
+// Callback for id User
 static void my_main_callback(uint8_t terminal, int8_t err, uint8_t id)
 {
     (void)id;
@@ -92,13 +92,13 @@
 void modem_update_file(uint8_t fid, alp_file_header_t* header, uint8_t* data)
 {
     alp_file_header_t remote_header;
-    uint8_t user_id = modem_get_id(my_main_callback);
+    uint8_t id = modem_get_id(my_main_callback);
     
     memset(&remote_header, 0, sizeof(alp_file_header_t));
     
     // Read remote header
-    modem_read_fprop(fid, &remote_header, user_id);
-    g_modem_ready[user_id].wait();
+    modem_read_fprop(fid, &remote_header, id);
+    g_modem_ready[id].wait();
     
     // Add file in local file system
     ram_fs_new(fid, (uint8_t*)header, data);
@@ -108,27 +108,27 @@
     {
         HELPER_PRINT("Updating file %d\n", fid);
         // Delete
-        modem_delete_file(fid, user_id);
-        g_modem_ready[user_id].wait();
+        modem_delete_file(fid, id);
+        g_modem_ready[id].wait();
         // Restore in local file system
         ram_fs_new(fid, (uint8_t*)header, data);
         // Re-create
         if (data)
         {
-            modem_declare_file(fid, header, true, user_id);
+            modem_declare_file(fid, header, true, id);
         }
         else
         {
-            modem_create_file(fid, header, user_id);
+            modem_create_file(fid, header, id);
         }
-        g_modem_ready[user_id].wait();
+        g_modem_ready[id].wait();
     }
     else
     {
         HELPER_PRINT("File %d up to date\n", fid);
     }
     
-    modem_free_id(user_id);
+    modem_free_id(id);
 }
 
 Semaphore boot(0);
@@ -184,16 +184,16 @@
     modem_close();
     modem_open(modem_serial_send, callbacks);
     
-    uint8_t user_id = modem_get_id(my_main_callback);
+    uint8_t id = modem_get_id(my_main_callback);
 
-    HELPER_PRINT("Start Modem Process (id=%d)\n", user_id);
+    HELPER_PRINT("Start Modem Process (id=%d)\n", id);
     Thread::wait(1000);
     
-    modem_read_file(D7A_FID_UID, uid.b, 0, 8, user_id);
-    g_modem_ready[user_id].wait();
+    modem_read_file(D7A_FID_UID, uid.b, 0, 8, id);
+    g_modem_ready[id].wait();
     
-    modem_read_file(D7A_FID_FIRMWARE_VERSION, (uint8_t*)&rev, 0, sizeof(revision_t), user_id);
-    g_modem_ready[user_id].wait();
+    modem_read_file(D7A_FID_FIRMWARE_VERSION, (uint8_t*)&rev, 0, sizeof(revision_t), id);
+    g_modem_ready[id].wait();
     
     PRINT("------------ D7A Modem infos ------------\r\n");
     PRINT_DATA(" - UID:              ", "%02X", uid.b, 8, "\r\n");
@@ -209,20 +209,18 @@
     uint32_t rev_sum2 = (MODEM_VERSION_MAJOR << 24) | (MODEM_VERSION_MINOR << 16) | MODEM_VERSION_PATCH;
     if (rev_sum1 < rev_sum2)
     {
-        PRINT("You need a modem at version %d.%d.%d or above to use this Driver.\n"
-              "Please check modem updates on the Dash7Board.\n"
-              "Go to your site's version manager.\n"
-              "Or choose the right 'modem_ref_helper' revision.\n"
+        PRINT("\r\nYou need a modem at version %d.%d.%d or above to use this Driver.\r\n"
+              "You can:\r\n"
+              " - Check modem updates on the Dash7Board:\r\n"
+              "   Go to your site's version manager.\r\n"
+              " - Check modem updates by importing:\r\n"
+              "   https://developer.mbed.org/teams/WizziLab/code/D7A_WM_Updater\r\n"
+              " - Choose the right 'modem_ref_helper' revision.\r\n"
+              "   Right click on modem_ref_helper -> Revision.\r\n"
               , MODEM_VERSION_MAJOR, MODEM_VERSION_MINOR, MODEM_VERSION_PATCH);
-        /*
-        PRINT("You need a modem at version %d.%d.x or above to use this Driver.\n"
-              "Please check modem updates by importing:\n"
-              "https://developer.mbed.org/teams/WizziLab/code/D7A_WM_Updater\n"
-              "Or choose the right 'modem_ref_helper' revision.\n"
-              , MODEM_VERSION_MAJOR, MODEM_VERSION_MINOR);
-        */
+
         Thread::wait(osWaitForever);
     }
     
-    modem_free_id(user_id);
+    modem_free_id(id);
 }