From: Dan White Date: Tue, 16 Oct 2012 20:32:13 +0000 (-0500) Subject: Cleanup devboard.py, ready to test live X-Git-Tag: bootrom-initial-submission~65 X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=ad437cd95743dc57de3120b2724ea599f315b6ae;p=430.git Cleanup devboard.py, ready to test live --- diff --git a/python-lib/devboard.py b/python-lib/devboard.py index a0f4b5a..3d8a61b 100644 --- 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