Shared slots debugged, working fine with 6 motes, 1 hop

tum-lkn · Mar 29, 2016 · 358b666 · 358b666
1 parent 53f2cf0
commit 358b666
Showing 6 changed files with 29 additions and 28 deletions.
diff --git a/LKN/scripts/schedule.json b/LKN/scripts/schedule.json
@@ -5,79 +5,79 @@
 [
   {"slotOffset":1,
   "link_type":"CELLTYPE_TXRX",
-  "shared":"FALSE",
+  "shared":"TRUE",
   "channelOffset":1,
   "isUpdated":"FALSE",
   "address":"0x14:0x15:0x92:0xcc:00:00:00:0x01"},
  {"slotOffset":2,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x02"},
  {"slotOffset":3,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x03"},
   {"slotOffset":4,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x04"},
    {"slotOffset":5,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x05"},
      {"slotOffset":6,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x06"},
      {"slotOffset":7,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x07"},
      {"slotOffset":8,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x08"},
    {"slotOffset":9,
    "link_type":"CELLTYPE_TXRX",
-   "shared":"FALSE",
+   "shared":"TRUE",
    "channelOffset":1,
    "isUpdated":"FALSE",
    "address":"0x14:0x15:0x92:0xcc:00:00:00:0x09"},
   {"slotOffset":10,
   "link_type":"CELLTYPE_TXRX",
-  "shared":"FALSE",
+  "shared":"TRUE",
   "channelOffset":1,
   "isUpdated":"FALSE",
   "address":"0x14:0x15:0x92:0xcc:00:00:00:0x0a"},
     {"slotOffset":11,
   "link_type":"CELLTYPE_TXRX",
-  "shared":"FALSE",
+  "shared":"TRUE",
   "channelOffset":1,
   "isUpdated":"FALSE",
   "address":"0x14:0x15:0x92:0xcc:00:00:00:0x0b"},
       {"slotOffset":12,
   "link_type":"CELLTYPE_TXRX",
-  "shared":"FALSE",
+  "shared":"TRUE",
   "channelOffset":1,
   "isUpdated":"FALSE",
   "address":"0x14:0x15:0x92:0xcc:00:00:00:0x0c"},
       {"slotOffset":13,
   "link_type":"CELLTYPE_TXRX",
-  "shared":"FALSE",
+  "shared":"TRUE",
   "channelOffset":1,
   "isUpdated":"FALSE",
   "address":"0x14:0x15:0x92:0xcc:00:00:00:0x0d"}

diff --git a/drivers/common/openserial.c b/drivers/common/openserial.c
@@ -371,28 +371,32 @@ void openserial_startOutput() {
             break;
          }
       case STATUS_ASN:
-         /*if (debugPrint_asn()==TRUE) {
+         ///*
+         if (debugPrint_asn()==TRUE) {
             break;
-         }*/
+         }//*/
         break;
       case STATUS_MACSTATS:
-         /*if (debugPrint_macStats()==TRUE) {
+         ///*
+         if (debugPrint_macStats()==TRUE) {
             break;
-         }*/
+         }//*/
         break;
       case STATUS_SCHEDULE:
-         /*if(debugPrint_schedule()==TRUE) {
+         ///*
+         if(debugPrint_schedule()==TRUE) {
             break;
-         }*/
+         }//*/
         break;
       case STATUS_BACKOFF:
          if(debugPrint_backoff()==TRUE) {
             break;
          }
       case STATUS_QUEUE:
-         /*if(debugPrint_queue()==TRUE) {
+         ///*
+         if(debugPrint_queue()==TRUE) {
             break;
-         }*/
+         }//*/
         break;
       case STATUS_NEIGHBORS:
          if (debugPrint_neighbors()==TRUE) {

diff --git a/openapps/uinject/uinject.h b/openapps/uinject/uinject.h
@@ -25,7 +25,7 @@
 // Too low values such as 100 creates problems
 ///@lkn{LKN-Murat} Application type 1-Burst 2-Non-Periodic 3-Periodic
 #define APPFLAG 1
-#define ENABLE_APPS FALSE
+#define ENABLE_APPS TRUE
 //=========================== typedef =========================================
 
 typedef struct {

diff --git a/openstack/02a-MAClow/IEEE802154E.c b/openstack/02a-MAClow/IEEE802154E.c
@@ -920,9 +920,6 @@ port_INLINE void activity_ti1ORri1() {
 		  }else{
 				//It is my address or it is a shared slot
 				canTX=TRUE;
-				openserial_printCritical(COMPONENT_IEEE802154E,ERR_WRONG_CELLTYPE,
-                               (errorparameter_t)schedule_isShared(),
-                               (errorparameter_t)66);
 		  }
 
 		 if(canTX){

diff --git a/openstack/02b-MAChigh/static_schedule.h b/openstack/02b-MAChigh/static_schedule.h
@@ -1,6 +1,6 @@
 /**
-\brief Automatically generated from schedule_shared.json using schedule.py
-\2016-03-29 17:12:50.563957
+\brief Automatically generated from schedule.json using schedule.py
+\2016-03-29 19:22:23.529694
 \@lkn{mvilgelm}
 */
 

diff --git a/openstack/cross-layers/idmanager.c b/openstack/cross-layers/idmanager.c
@@ -70,7 +70,7 @@ void idmanager_init() {
    idmanager_vars.my64bID.addr_64b[4]   = 0x00;
    idmanager_vars.my64bID.addr_64b[5]   = 0x00;
    idmanager_vars.my64bID.addr_64b[6]   = 0x00;
-   idmanager_vars.my64bID.addr_64b[7]   = 2;
+   idmanager_vars.my64bID.addr_64b[7]   = 6;
    /// @internal [LKN-addr]
 
    // my16bID