Merge pull request #87 from kb2ma/develop_SW-42

SW-42 Implementation
openwsn-berkeley · Sep 29, 2014 · fb1d6f7 · fb1d6f7
2 parents 17f499a + 0ae2d8f
commit fb1d6f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/software/openvisualizer/openvisualizer/moteConnector/OpenParser.py b/software/openvisualizer/openvisualizer/moteConnector/OpenParser.py
@@ -27,6 +27,7 @@ class OpenParser(Parser.Parser):
 
     SERFRAME_PC2MOTE_SETROOT           = ord('R')
     SERFRAME_PC2MOTE_SETBRIDGE         = ord('B')
+    SERFRAME_PC2MOTE_SETROOTBRIDGE     = ord('Z')
     SERFRAME_PC2MOTE_DATA              = ord('D')
     SERFRAME_PC2MOTE_TRIGGERTCPINJECT  = ord('T')
     SERFRAME_PC2MOTE_TRIGGERUDPINJECT  = ord('U')

diff --git a/software/openvisualizer/openvisualizer/moteConnector/moteConnector.py b/software/openvisualizer/openvisualizer/moteConnector/moteConnector.py
@@ -87,17 +87,10 @@ def _sendToParser(self,data):
     def _cmdToMote_handler(self,sender,signal,data):
         if  data['serialPort']==self.serialport:
             if data['action']==moteState.moteState.TRIGGER_DAGROOT:
-                # toggle the DAGroot status
+                # toggle the DAGroot and bridge status
                 self._sendToMoteProbe(
                     dataToSend = [
-                        OpenParser.OpenParser.SERFRAME_PC2MOTE_SETROOT,
-                        OpenParser.OpenParser.SERFRAME_ACTION_TOGGLE,
-                    ],
-                )
-                # toggle the bridge status
-                self._sendToMoteProbe(
-                    dataToSend = [
-                        OpenParser.OpenParser.SERFRAME_PC2MOTE_SETBRIDGE,
+                        OpenParser.OpenParser.SERFRAME_PC2MOTE_SETROOTBRIDGE,
                         OpenParser.OpenParser.SERFRAME_ACTION_TOGGLE,
                     ],
                 )