Merge pull request #92 from openwsn-berkeley/develop_FW-279

FW-279. Adapting SW to new FW organization.
openwsn-berkeley · Oct 6, 2014 · 231af94 · 231af94
2 parents a94897f + cdff8df
commit 231af94
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 36 deletions.
diff --git a/software/openvisualizer/SConstruct b/software/openvisualizer/SConstruct
@@ -6,8 +6,7 @@
 
 import os
 import platform
-import subprocess
-import sys
+
 import SCons
 import sconsUtils
 
@@ -114,7 +113,6 @@ def default(env,target,source):
 
 Default(env.Command('default', None, default))
 
-
 # Define environment and options common to all run... targets
 runnerEnv = env.Clone()
 
@@ -154,7 +152,6 @@ AddOption('--ovdebug',
     action    = 'store_true')
 runnerEnv['DEBUGOPT'] = GetOption('debugOpt')
 
-
 # These options are used only by the web runner. We define them here for
 # simplicity, but they must be removed from non-web use in the runner 
 # SConscript.
@@ -303,7 +300,7 @@ Alias(
 )
 
 #===== docs
-    
+
 SConscript(
     os.path.join('docs', 'SConscript'),
     exports = {"env": env},

diff --git a/software/openvisualizer/openvisualizer/moteConnector/GenStackDefines.py b/software/openvisualizer/openvisualizer/moteConnector/GenStackDefines.py
@@ -26,7 +26,7 @@
 
 #============================ defines =========================================
 
-INPUT_FILE    = os.path.join('..','..','..','..','..','openwsn-fw','firmware','openos','openwsn','openwsn.h')
+INPUT_FILE    = os.path.join('..','..','..','..','..','openwsn-fw','inc','opendefs.h')
 OUTPUT_FILE   = 'StackDefines.py'
 
 #============================ helpers =========================================

diff --git a/software/openvisualizer/openvisualizer/moteConnector/StackDefines.py b/software/openvisualizer/openvisualizer/moteConnector/StackDefines.py
@@ -1,6 +1,6 @@
 # DO NOT EDIT DIRECTLY!
 # This file was generated automatically by GenStackDefines.py
-# on Sun, 03 Aug 2014 01:26:03
+# on Sun, 05 Oct 2014 18:39:53
 #
 
 components = {
@@ -30,33 +30,15 @@
   23: "OPENTCP",
   24: "OPENUDP",
   25: "OPENCOAP",
-  26: "TCPECHO",
-  27: "TCPINJECT",
-  28: "TCPPRINT",
-  29: "UDPECHO",
-  30: "UDPINJECT",
-  31: "UDPPRINT",
-  32: "RSVP",
-  33: "OHLONE",
-  34: "HELI",
-  35: "IMU",
-  36: "RLEDS",
-  37: "RREG",
-  38: "RWELLKNOWN",
-  39: "RT",
-  40: "REX",
-  41: "RXL1",
-  42: "RINFO",
-  43: "RHELI",
-  44: "RRUBE",
-  45: "LAYERDEBUG",
-  46: "UDPRAND",
-  47: "UDPSTORM",
-  48: "UDPLATENCY",
-  49: "TEST",
-  50: "R6T",
-  51: "SWARMBAND",
-  52: "RRT",
+  26: "C6T",
+  27: "CEXAMPLE",
+  28: "CINFO",
+  29: "CLEDS",
+  30: "CSTORM",
+  31: "CWELLKNOWN",
+  32: "TECHO",
+  33: "TOHLONE",
+  34: "UECHO",
 }
 
 errorDescriptions = {

diff --git a/software/openvisualizer/site_scons/sconsUtils.py b/software/openvisualizer/site_scons/sconsUtils.py
@@ -23,9 +23,9 @@ def copySimfw(env, target):
                    the copy.
     '''
     # in openwsn-fw, directory containing 'openwsnmodule_obj.h'
-    incdir    = os.path.join(env['FW_DIR'], 'firmware','openos','bsp','boards','python')
+    incdir    = os.path.join(env['FW_DIR'], 'bsp','boards','python')
     # in openwsn-fw, directory containing extension library
-    libdir    = os.path.join(env['FW_DIR'], 'firmware','openos','projects','common')
+    libdir    = os.path.join(env['FW_DIR'], 'projects','common')
 
     # Build source and destination pathnames.
     archAndOs = env['SIMHOSTOPT'].split('-')