Changeset 1172

Timestamp:

09/13/11 08:22:57 (21 months ago)

Author:

thomas

Message:

enabled RPL. Created a TXRX type of slot. Motes calculate their DAGrank.

Location:

firmware/openos/openwsn

Files:

• 02a-MAC/IEEE802154E.c (modified) (2 diffs)
• 02b-RES/schedule.c (modified) (1 diff)
• 02b-RES/schedule.h (modified) (1 diff)
• 03b-IPv6/icmpv6rpl.c (modified) (1 diff)

firmware/openos/openwsn/02a-MAC/IEEE802154E.c

@@ -584 +584 @@
          }
          break;
+      case CELLTYPE_TXRX:
       case CELLTYPE_TX:
          schedule_getNeighbor(ieee154e_vars.asn,&neighbor);
@@ -596 +597 @@
             // arm tt1
             ieee154etimer_schedule(DURATION_tt1);
-         } else {
+         } else if (cellType==CELLTYPE_TX){
             // abort
             endSlot();
          }
-         break;
+         if (cellType==CELLTYPE_TX || 
+             (cellType==CELLTYPE_TXRX && ieee154e_vars.dataToSend!=NULL)) {
+            break;
+         }
       case CELLTYPE_RX:
          // I need to listen for packet

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

@@ -171 +171 @@
          break;
    }
+   
+   //slot 7: DATA to broadcast (for RPL DIOs)
+   i = 7;
+   schedule_vars.schedule[i].type                          = CELLTYPE_TXRX;
+   schedule_vars.schedule[i].channelOffset                 = 0;
+   schedule_vars.schedule[i].neighbor.type                 = ADDR_64B;
+   schedule_vars.schedule[i].neighbor.addr_64b[0]          = 0xff;
+   schedule_vars.schedule[i].neighbor.addr_64b[1]          = 0xff;
+   schedule_vars.schedule[i].neighbor.addr_64b[2]          = 0xff;
+   schedule_vars.schedule[i].neighbor.addr_64b[3]          = 0xff;
+   schedule_vars.schedule[i].neighbor.addr_64b[4]          = 0xff;
+   schedule_vars.schedule[i].neighbor.addr_64b[5]          = 0xff;
+   schedule_vars.schedule[i].neighbor.addr_64b[6]          = 0xff;
+   schedule_vars.schedule[i].neighbor.addr_64b[7]          = 0xff;
 }
 

firmware/openos/openwsn/02b-RES/schedule.h

@@ -19 +19 @@
    CELLTYPE_TX          = 2,
    CELLTYPE_RX          = 3,
-   CELLTYPE_SERIALRX    = 4
+   CELLTYPE_TXRX        = 4,
+   CELLTYPE_SERIALRX    = 5
 };
 

firmware/openos/openwsn/03b-IPv6/icmpv6rpl.c

@@ -49 +49 @@
    icmpv6rpl_vars.all_routers_multicast.addr_128b[14] = 0x00;
    icmpv6rpl_vars.all_routers_multicast.addr_128b[15] = 0x02;
-   //poipoi: disabling RPL
-   //timer_startPeriodic(TIMER_RPL,icmpv6rpl_vars.periodDIO);
+   timer_startPeriodic(TIMER_RPL,icmpv6rpl_vars.periodDIO);
 }