Use serial.isWaiting() function

[~andy/csm213a-hw] / vis / visual.py

diff --git a/vis/visual.py b/vis/visual.py
index 5580b5b47700c80359c733d69aade5b32d1fa01a..62a0bc3fb887a72e5d12049a348ed2c4cc2ebe0a 100644 (file)
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -33,8 +33,8 @@ class Visual:
 
                self.accs     = get_objects(['accx', 'accy', 'accz'])
                self.mags     = get_objects(['magx', 'magy', 'magz'])
-               self.touch    = get_objects(['touch'])
-               self.light    = get_objects(['light'])
+               self.lgts     = get_objects(['lgt'])
+               self.tchs     = get_objects(['tchp', 'tchd'])
                self.a2ds     = get_objects(['a2d0', 'a2d1', 'a2d2', 'a2d3', 'a2d4', 'a2d5'])
 
        # Signal handlers
@@ -68,8 +68,8 @@ class Visual:
                name  = name.replace('_btn', '')
                state = obj.get_active()
                if self.config.enable[name] != state:
+                       self.device.set_enable(name, state)
                        self.config.enable[name] = state
-                       self.device.control()
                        self.config.save()
 
        def on_rate(self, obj):
@@ -77,8 +77,8 @@ class Visual:
                name  = name.replace('_spin', '')
                value = obj.get_value()
                if self.config.rate[name] != value:
+                       self.device.set_rate(name, value)
                        self.config.rate[name] = value
-                       self.device.control()
                        self.config.save()
 
        def on_config(self, obj):
@@ -126,25 +126,26 @@ class Visual:
 
 
        def update(self, state):
-               def setxyz(objs, vals):
-                       if vals[0]: objs[0].set_text('X: %f' % vals[0])
-                       if vals[1]: objs[1].set_text('Y: %f' % vals[1])
-                       if vals[2]: objs[2].set_text('Z: %f' % vals[2])
-               def setabs(objs, vals):
+               def setval(objs, vals, lbls):
                        for i in range(0,len(objs)):
-                               if vals[i]: objs[i].set_text('%f' % vals[i])
-
-               setxyz(self.accs,  state.acc)
-               setxyz(self.mags,  state.mag)
-               setabs(self.touch, state.touch)
-               setabs(self.light, state.light)
-               setabs(self.a2ds,  state.a2d)
+                               if vals[i] == None:
+                                       continue
+                               if lbls and lbls[i]:
+                                       objs[i].set_text('%s: %f' % (lbls[i], vals[i]))
+                               else:
+                                       objs[i].set_text('%f' % vals[i])
+
+               setval(self.accs,  state.acc, ['X', 'Y', 'Z'])
+               setval(self.mags,  state.mag, ['X', 'Y', 'Z'])
+               setval(self.lgts,  state.lgt, [])
+               setval(self.tchs,  state.tch, ['P', 'D'])
+               setval(self.a2ds,  state.a2d, [])
 
        def debug(self, state):
                print('update: ' + str(state))
                print('\tacc - ' + str(state.acc))
                print('\tmag - ' + str(state.mag))
-               print('\tlgt - ' + str(state.light))
+               print('\tlgt - ' + str(state.lgt))
                print('\ttch - ' + str(state.touch))
                print('\ta2d - ' + str(state.a2d))