Cleanup devboard.py, ready to test live

diff --git a/python-lib/devboard.py b/python-lib/devboard.py
index a0f4b5acb972b707853a7ba591e746c8b9f9886b..3d8a61b6c704abf940fdad025becaf83d4e69712 100644 (file)
--- a/python-lib/devboard.py
+++ b/python-lib/devboard.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
+import yaml
 import usbio
 
-
 #
 # devboard conversion constants
 #
@@ -176,11 +176,17 @@ def init_devboard(name='devboard-defaults.yaml'):
     try:
         load_config(name)
         return
-    except:
-        print 'WARNING: could not find "%s", using built-in defaults' % name
+    except IOError:
+        s = '* WARNING: could not find "%s", using built-in defaults' % name
+        print
+        print '*' * len(s)
+        print '*'
+        print s
+        print '*'
+        print '*' * len(s)
+        print
 
     # No defaults available, fallback on object-level defaults
-    psdefaults()
 
     ##############################################################################
     # Setup FTDI serial ports
@@ -232,6 +238,9 @@ def init_devboard(name='devboard-defaults.yaml'):
     arb = usbio.Chain(spi1, 'chain1_conf', length=16)
     amux = usbio.Mux(spi1, 'chain1_mux')
 
+    psdefaults()
+    ## done with init_devboard()
+
 
 
 def load_config(name):
@@ -241,7 +250,9 @@ def load_config(name):
     if isinstance(name, dict):
         cfg = name
     else:
-        cfg = yaml.load(name)
+        cfg = yaml.load(open(name, 'rb'))
+
+    print cfg
 
     ##########################################################################
     # Setup FTDI serial ports