Diff: main.cpp

Revision:

2:785b422c7d22

Parent:

1:4629ccf8315d

Child:

3:0979d8cba5ec

--- a/main.cpp	Wed May 17 14:11:14 2017 +0000
+++ b/main.cpp	Thu May 18 13:09:03 2017 +0000
@@ -1,29 +1,10 @@
 // @autor: jeremie@wizzilab.com
 // @date: 2017-05-02
 
-#include "mbed.h"
-#include "rtos.h"
 #include "DebouncedInterrupt.h"
-#include "WizziDebug.h"
-#include "WizziCom.h"
-
-#include "hwcfg.h"
+#include "modem_ref_helper.h"
 #include "modem_callbacks.h"
 
-#include "revision.h"
-#include "alp_spec.h"
-#include "alp_helpers.h"
-#include "modem_ref.h"
-#include "kal_fs.h"
-#include "d7a_1x.h"
-#include "d7a_1x_fs.h"
-#include "alp.h"
-#include "hal_types.h"
-
-#define MODEM_VERSION_MAJOR         4
-#define MODEM_VERSION_MINOR         8
-
-WizziCom* g_modem_com;
 Semaphore button_user(0);
 Semaphore modem_ready[MAX_USER_NB];
 
@@ -42,22 +23,13 @@
     d7a_addressee_t addressee;
 } ping_t;
 
-TYPEDEF_STRUCT_PACKED {
-    uint8_t type;
-    d7a_sp_cfg_t cfg;
-} alp_d7a_itf_t;
 
-#define WM_FID_ALP_CFG          50
 #define MY_POLICY_IDX           0
 #define FID_PING_PONG           128
 #define PING_DELAY              500
 #define PING_COUNTER_SIZE       sizeof(uint32_t)
 #define MAX_PING_NB             MAX_USER_NB-2
 
-Queue<ping_t, MAX_PING_NB> ping_queue;
-Queue<Thread, MAX_PING_NB> thread_queue;
-
-
 d7a_xcl_t ping_pong_xcl = { .bf.s = 13, .bf.m = 1 };
 
 alp_retry_policy_t my_policy = {
@@ -70,8 +42,6 @@
     .slot_time          = 0
 };
 
-#define D7A_CTF_VAL(mant,exp)   ((uint8_t)(mant|(exp<<5)))
-#define ALP_ITF_TYPE_D7A        0xD7
 alp_d7a_itf_t my_itf = {
     .type                           = ALP_ITF_TYPE_D7A,
     .cfg.to                         = 0,
@@ -85,15 +55,6 @@
     .cfg.addressee.xcl              = ping_pong_xcl
 };
 
-
-#define MY_D7_ITF_SIZE(_itf) (1+my_alp_itf_d7a_cfg_size(&(_itf)->cfg))
-int my_alp_itf_d7a_cfg_size(d7a_sp_cfg_t* cfg)
-{
-    int size = sizeof(d7a_sp_cfg_t) - sizeof(d7a_addressee_t);
-    size += D7A_ADDR_LEN(cfg->addressee.ctrl);
-    return size;
-}
-
 void print_status(int status)
 {
     switch (status)
@@ -156,7 +117,7 @@
     button_user.release();
 }
 
-#if (DEBUG_LED != NC)
+#ifdef DEBUG_LED
 DigitalOut my_led(DEBUG_LED);
 #endif
 
@@ -174,15 +135,15 @@
         PRINT_DATA(" from ", "%02X", istat->addressee.id, 8, "");
         PRINT(" (rxlev:%d lb:%d)\n", istat->rxlev, istat->lb);
         
-        #if (DEBUG_LED != NC)
+#ifdef DEBUG_LED
         my_led = 1;
-        #endif
+#endif
     
         Thread::wait(PING_DELAY);
         
-        #if (DEBUG_LED != NC)
+#ifdef DEBUG_LED
             my_led = 0;
-        #endif
+#endif
         
         alp_d7a_itf_t resp_itf = {
             .type                           = ALP_ITF_TYPE_D7A,
@@ -201,7 +162,7 @@
         PRINT("Send PING %d", *count);
         PRINT_DATA(" to ", "%02X", resp_itf.cfg.addressee.id, 8, "\n");
         
-        modem_send_file_content((uint8_t*)&resp_itf, MY_D7_ITF_SIZE(&resp_itf), istat, FID_PING_PONG, count, 0, PING_COUNTER_SIZE, g_void_id);
+        modem_send_file_content((uint8_t*)&resp_itf, D7_ITF_SIZE(&resp_itf), istat, FID_PING_PONG, count, 0, PING_COUNTER_SIZE, g_void_id);
     }
 }
 
@@ -219,30 +180,11 @@
 
         // Initiate ping
         PRINT("Initiate PING\n");
-        modem_send_file_content((uint8_t*)&my_itf, MY_D7_ITF_SIZE(&my_itf), (void*)&istat, FID_PING_PONG, &ping, 0, PING_COUNTER_SIZE, g_main_id);
+        modem_send_file_content((uint8_t*)&my_itf, D7_ITF_SIZE(&my_itf), (void*)&istat, FID_PING_PONG, &ping, 0, PING_COUNTER_SIZE, g_main_id);
         modem_ready[g_main_id].wait();
     }
 }
 
-
-// Serial adapters to WizziLab's own architecture
-// ============================================================{{{
-
-void my_serial_input(WizziCom* com, WizziComPacket_t* pkt)
-{
-    modem_input(wizzicom_type_to_flow(pkt->type), pkt->data, pkt->length);
-    FREE(pkt);
-}
-
-int my_serial_send(uint8_t* data1, uint8_t size1, uint8_t* data2, uint8_t size2)
-{
-    (void)size1;
-    
-    g_modem_com->send((WizziComPacketType)wizzicom_flow_to_type(data1[4]), size2, data2);
-
-    return (size1 + size2);
-}
-
 modem_callbacks_t callbacks = {
     .read       = my_read,
     .write      = my_write,
@@ -260,62 +202,17 @@
 int main()
 {
     // Start & initialize
+    #ifdef DEBUG_LED
     DBG_OPEN(DEBUG_LED);
+#else
+    DBG_OPEN(NC);
+#endif
     PRINT("\r\n--- Starting new run ---\r\n");
     FPRINT("(id:0x%08x)\r\n", osThreadGetId());
     
-    static union {
-        uint8_t      b[8];
-        uint32_t     w[2];
-    } uid;
-    revision_t rev;
-            
-    // Hardware reset
-    DigitalOut reset_low(MODEM_PIN_RESET, 0);
-    Thread::wait(100);
-        
-    // Release reset
-    DigitalIn reset_release(MODEM_PIN_RESET);
-    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);
-    
-    // Redirect All Port traffic to my_serial_input
-    g_modem_com->attach(my_serial_input, WizziComPacketOther);
-
-    modem_open(my_serial_send, &callbacks);
+    modem_helper_open(&callbacks);
     
     g_main_id = modem_get_id(my_main_callback);
-    g_void_id = modem_get_id(my_void_callback);
-
-    PRINT("Start Modem Process (id=%d)\n", g_main_id);
-    Thread::wait(1000);
-    
-    modem_read_file(D7A_FID_UID, uid.b, 0, 8, g_main_id);
-    modem_ready[g_main_id].wait();
-    
-    modem_read_file(D7A_FID_FIRMWARE_VERSION, &rev, 0, sizeof(revision_t), g_main_id);
-    modem_ready[g_main_id].wait();
-    
-    PRINT("------------ D7A Modem infos ------------\r\n");
-    PRINT_DATA(" - UID:              ", "%02X", uid.b, 8, "\r\n");
-    PRINT(" - Manufacturer ID:  %08X\r\n", rev.manufacturer_id);
-    PRINT(" - Device ID:        %08X\r\n", rev.device_id);
-    PRINT(" - Hardware version: %08X\r\n", rev.hw_version);
-    PRINT(" - Firmware version: v%d.%d.%d\r\n", rev.fw_version.major, rev.fw_version.minor, rev.fw_version.patch);
-    PRINT(" - File system CRC:  0x%08x\r\n", rev.fs_crc);
-    PRINT("-----------------------------------------\r\n");
-    
-    // Check version
-    if (rev.fw_version.major != MODEM_VERSION_MAJOR || rev.fw_version.minor != MODEM_VERSION_MINOR)
-    {
-        PRINT("You need a modem at version %d.%d.x to use this APP.\n"
-              "Please check updates by importing:\n"
-              "https://developer.mbed.org/teams/WizziLab/code/D7A_WM_Updater\n"
-              , MODEM_VERSION_MAJOR, MODEM_VERSION_MINOR);
-        Thread::wait(osWaitForever);
-    }
     
     // Put modem to listen to this access class
     modem_write_file(D7A_FID_DLL_CFG, &ping_pong_xcl, 0, sizeof(d7a_xcl_t), g_main_id);