preparing before merge

openwsn-berkeley · Sep 22, 2014 · 22c4a54 · 22c4a54
1 parent f1e6a29
commit 22c4a54
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 58 deletions.
diff --git a/software/openvisualizer/moteConnector/ParserStatus.py b/software/openvisualizer/moteConnector/ParserStatus.py
@@ -102,21 +102,20 @@ def __init__(self):
                                     3,
                                     5,
                                     'MacStats',
-                                    '<BBhhBf',
+                                    '<BBhhB',
                                     [
                                         'numSyncPkt' ,               # B
                                         'numSyncAck',                # B
                                         'minCorrection',             # h
                                         'maxCorrection',             # h
-                                        'numDeSync',                 # B
-                                        'dutyCycle'                  # f
+                                        'numDeSync'                  # B
                                     ],
                                 )
         self._addFieldsParser   (
                                     3,
                                     6,
                                     'ScheduleRow',
-                                    '<BHBBBBQQBBBBHH',
+                                    '<BHBBBBQQBBBBHHH',
                                     [
                                         'row',                       # B
                                         'slotOffset',                # H 
@@ -131,7 +130,8 @@ def __init__(self):
                                         'numTxACK',                  # B
                                         'lastUsedAsn_4',             # B
                                         'lastUsedAsn_2_3',           # H
-                                        'lastUsedAsn_0_1'            # H
+                                        'lastUsedAsn_0_1',           # H
+                                        'next',                      # H
                                     ],
                                 )
         self._addFieldsParser   (
@@ -225,7 +225,7 @@ def parseInput(self,input):
         # call the next header parser
         for key in self.fieldsParsingKeys:
             if statusElem==key.val:
-               
+
                 # log
                 log.debug("parsing {0}, ({1} bytes) as {2}".format(input,len(input),key.name))
 
@@ -242,11 +242,11 @@ def parseInput(self,input):
                                 len(input),
                                 str(err)
                             )
-
                         )
 
                 # map to name tuple
                 returnTuple = self.named_tuple[key.name](*fields)
+
                 # log
                 log.debug("parsed into {0}".format(returnTuple))
 

diff --git a/software/openvisualizer/moteConnector/StackDefines.py b/software/openvisualizer/moteConnector/StackDefines.py
@@ -1,6 +1,6 @@
 # DO NOT EDIT DIRECTLY!
 # This file was generated automatically by GenStackDefines.py
-# on Tue, 26 Mar 2013 15:02:37
+# on Mon, 11 Feb 2013 16:49:46
 #
 
 components = {
@@ -53,59 +53,61 @@
   46: "UDPSTORM",
   47: "UDPLATENCY",
   48: "TEST",
+  49: "RSCHED",
 }
 
 errorDescriptions = {
    1: "received an echo request",
    2: "received an echo reply",
    3: "getData asks for too few bytes, maxNumBytes={0}, fill level={1}",
    4: "the input buffer has overflown",
-   5: "unknown transport protocol {0} (code location {1})",
-   6: "wrong TCP state {0} (code location {1})",
-   7: "TCP reset while in state {0} (code location {1})",
-   8: "unsupported port number {0} (code location {1})",
-   9: "unexpected DAO (code location {0})",
-  10: "unsupported ICMPv6 type {0} (code location {1})",
-  11: "unsupported 6LoWPAN parameter {1} at location {0}",
-  12: "no next hop",
-  13: "invalid parameter",
-  14: "invalid forward mode",
-  15: "large DAGrank {0}, set to {1}",
-  16: "packet discarded hop limit reached",
-  17: "neighbors table is full (max number of neighbor is {0})",
-  18: "there is no sent packet in queue",
-  19: "there is no received packet in queue",
-  20: "schedule overflown",
-  21: "wrong celltype {0} at slotOffset {1}",
-  22: "unsupported IEEE802.15.4 parameter {1} at location {0}",
-  23: "got desynchronized at slotOffset {0}",
-  24: "synchronized at slotOffset {0}",
-  25: "large timeCorr.: {0} ticks (code loc. {1})",
-  26: "wrong state {0} in end of frame+sync",
-  27: "wrong state {0} in startSlot, at slotOffset {1}",
-  28: "wrong state {0} in timer fires, at slotOffset {1}",
-  29: "wrong state {0} in start of frame, at slotOffset {1}",
-  30: "wrong state {0} in end of frame, at slotOffset {1}",
-  31: "maxTxDataPrepare overflows while at state {0} in slotOffset {1}",
-  32: "maxRxAckPrepapare overflows while at state {0} in slotOffset {1}",
-  33: "maxRxDataPrepapre overflows while at state {0} in slotOffset {1}",
-  34: "maxTxAckPrepapre overflows while at state {0} in slotOffset {1}",
-  35: "wdDataDuration overflows while at state {0} in slotOffset {1}",
-  36: "wdRadio overflows while at state {0} in slotOffset {1}",
-  37: "wdRadioTx overflows while at state {0} in slotOffset {1}",
-  38: "wdAckDuration overflows while at state {0} in slotOffset {1}",
-  39: "busy sending",
-  40: "sendDone for packet I didn't send",
-  41: "no free packet buffer (code location {0})",
-  42: "freeing unused memory",
-  43: "freeing memory unsupported memory",
-  44: "unsupported command {0}",
-  45: "unknown message type {0}",
-  46: "wrong address type {0} (code location {1})",
-  47: "isBridge mismatch (code location {0})",
-  48: "header too long, length {1} (code location {0})",
-  49: "input length problem, length={0}",
-  50: "booted",
-  51: "invalid serial frame",
-  52: "invalid packet from radio, length {1} (code location {0})",
+   5: "the command is not allowerd, command = {0}",
+   6: "unknown transport protocol {0} (code location {1})",
+   7: "wrong TCP state {0} (code location {1})",
+   8: "TCP reset while in state {0} (code location {1})",
+   9: "unsupported port number {0} (code location {1})",
+  10: "unexpected DAO (code location {0})",
+  11: "unsupported ICMPv6 type {0} (code location {1})",
+  12: "unsupported 6LoWPAN parameter {1} at location {0}",
+  13: "no next hop",
+  14: "invalid parameter",
+  15: "invalid forward mode",
+  16: "large DAGrank {0}, set to {1}",
+  17: "packet discarded hop limit reached",
+  18: "neighbors table is full (max number of neighbor is {0})",
+  19: "there is no sent packet in queue",
+  20: "there is no received packet in queue",
+  21: "schedule overflown",
+  22: "wrong celltype {0} at slotOffset {1}",
+  23: "unsupported IEEE802.15.4 parameter {1} at location {0}",
+  24: "got desynchronized at slotOffset {0}",
+  25: "synchronized at slotOffset {0}",
+  26: "large timeCorr.: {0} ticks (code loc. {1})",
+  27: "wrong state {0} in end of frame+sync",
+  28: "wrong state {0} in startSlot, at slotOffset {1}",
+  29: "wrong state {0} in timer fires, at slotOffset {1}",
+  30: "wrong state {0} in start of frame, at slotOffset {1}",
+  31: "wrong state {0} in end of frame, at slotOffset {1}",
+  32: "maxTxDataPrepare overflows while at state {0} in slotOffset {1}",
+  33: "maxRxAckPrepapare overflows while at state {0} in slotOffset {1}",
+  34: "maxRxDataPrepapre overflows while at state {0} in slotOffset {1}",
+  35: "maxTxAckPrepapre overflows while at state {0} in slotOffset {1}",
+  36: "wdDataDuration overflows while at state {0} in slotOffset {1}",
+  37: "wdRadio overflows while at state {0} in slotOffset {1}",
+  38: "wdRadioTx overflows while at state {0} in slotOffset {1}",
+  39: "wdAckDuration overflows while at state {0} in slotOffset {1}",
+  40: "busy sending",
+  41: "sendDone for packet I didn't send",
+  42: "no free packet buffer (code location {0})",
+  43: "freeing unused memory",
+  44: "freeing memory unsupported memory",
+  45: "unsupported command {0}",
+  46: "unknown message type {0}",
+  47: "wrong address type {0} (code location {1})",
+  48: "isBridge mismatch (code location {0})",
+  49: "header too long, length {1} (code location {0})",
+  50: "input length problem, length={0}",
+  51: "booted",
+  52: "invalid serial frame",
+  53: "invalid packet frome radio, length {1} (code location {0})",
 }
diff --git a/software/openvisualizer/moteState/moteState.py b/software/openvisualizer/moteState/moteState.py
@@ -116,7 +116,6 @@ def update(self,notif):
         self.data[0]['minCorrection']       = notif.minCorrection
         self.data[0]['maxCorrection']       = notif.maxCorrection
         self.data[0]['numDeSync']           = notif.numDeSync
-        self.data[0]['dutyCycle']           = notif.dutyCycle
 
 class StateScheduleRow(StateElem):
 

diff --git a/software/openvisualizer/networkState/networkState.py b/software/openvisualizer/networkState/networkState.py
@@ -375,7 +375,7 @@ def _receivedInternetData_notif(self,data):
 
         # verify max length
         if len(bytesToSend)>self.MAX_SERIAL_PKT_SIZE:
-            log.error("packet too long, size={0}".format(len(bytesToSend)))
+            log.error("packet too long, size={0}".format(len(nextHop)))
             return  
 
         dispatcher.send(