Changeset 1142

Timestamp:

09/09/11 14:02:09 (22 months ago)

Author:

thomas

Message:

KA-based synchronized. This fixes #59.

Location:

firmware/openos/openwsn

Files:

• 02b-RES/res.c (modified) (4 diffs)
• 07-App/appudptimer.c (modified) (1 diff)
• openwsn.h (modified) (1 diff)

firmware/openos/openwsn/02b-RES/res.c

@@ -16 +16 @@
 //=========================== variables =======================================
 
-enum {
-   MAC_MGT_TASK_ADV     = 0,
-   MAC_MGT_TASK_KA      = 1,
-   MAC_MGT_TASK_MAX     = 2,
-};
-
 typedef struct {
    uint16_t periodMaintenance;
-   bool     busySending;     // TRUE when busy sending an advertisement or keep-alive
-   uint8_t  dsn;             // current data sequence number
-   uint8_t  MacMgtTask;      // MAC management task to execute
+   bool     busySending;          // TRUE when busy sending an advertisement or keep-alive
+   uint8_t  dsn;                  // current data sequence number
+   uint8_t  MacMgtTaskCounter;    // counter to determine what management task to do
 } res_vars_t;
 
@@ -43 +37 @@
    res_vars.busySending       = FALSE;
    res_vars.dsn               = 0;
-   res_vars.MacMgtTask        = MAC_MGT_TASK_ADV;
+   res_vars.MacMgtTaskCounter = 0;
    timer_startPeriodic(TIMER_RES,res_vars.periodMaintenance);
 }
@@ -161 +155 @@
 has fired. This timer is set to fire every second, on average.
 
-The body of this function executes one of the MAC management task, alternating
-between all in a round-robin fashion.
+The body of this function executes one of the MAC management task.
 */
 void timer_res_fired() {
-   res_vars.MacMgtTask = (res_vars.MacMgtTask+1)%MAC_MGT_TASK_MAX;
-   switch (res_vars.MacMgtTask) {
-      case MAC_MGT_TASK_ADV:
-         sendAdv();
-         break;
-      case MAC_MGT_TASK_KA:
-         //sendKa();//poipoi disable KA's
-         break;
-      default:
-         res_vars.MacMgtTask=0;//this should never happen
+   res_vars.MacMgtTaskCounter = (res_vars.MacMgtTaskCounter+1)%10;
+   if (res_vars.MacMgtTaskCounter==0) {
+      sendAdv();
+   } else {
+      sendKa();
    }
 }
@@ -282 +270 @@
       kaNeighAddr = neighbors_KaNeighbor();
       if (kaNeighAddr!=NULL) {
-         // debug
-         openserial_printError(COMPONENT_RES,
-                               ERR_POIPOI,
-                               0,
-                               0);
          // get a free packet buffer
          ka = openqueue_getFreePacketBuffer();

firmware/openos/openwsn/07-App/appudptimer.c

@@ -22 +22 @@
 void appudptimer_init() {
    appudptimer_vars.busySending = FALSE;
-   timer_startPeriodic(TIMER_UDPTIMER,32768);
+   //timer_startPeriodic(TIMER_UDPTIMER,32768);
 }
 

firmware/openos/openwsn/openwsn.h

@@ -64 +64 @@
 // de-synchronization timeouts
 enum {
-   DESYNCTIMEOUT                       = 300, // in slots: @10ms per slot -> 3 seconds
+   DESYNCTIMEOUT                       = 500, // in slots: @10ms per slot -> 5 seconds
    KATIMEOUT                           = 100, // in slots: @10ms per slot -> 1 second
 };