Merge branch 'master' of git.sugarlabs.org:measure/mainline

5 files changed, 17 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 8ae3238..ef372e2 100644
--- a/NEWS
+++ b/NEWS
@@ -8,8 +8,9 @@ ENHANCEMENTS:
 * Define/save/restore custom instruments
 * Match size of screen capture to size of trace window
 
-BUG_FIX:
+BUG FIXES:
 * Add support for old systems that lack subprocess.check_output method
+* Fixed regression for mode switching when deboucing radio buttons
 
 41
 
@@ -32,7 +33,7 @@ ENAHNCEMENTS:
 * Add tuning lines for guitar, violin, viola, cello, and bass (#3657)
 * Channel mute (#3680)
 
-BUG_FIX:
+BUG FIX:
 * Typo preventing resistance mode from working on XO 1.75 hardware
 
 38
@@ -45,7 +46,7 @@ ENHANCEMENT:
 ENHANCEMENTS:
 * New translations
 
-BUG_FIX:
+BUG FIXES:
 * Lock mode-selection radio buttons while mode is being reset (#3616).
 * Fixed logic error that was causing triggering on both rising and
   falling edges (#2203).
@@ -62,7 +63,7 @@ ENHANCEMENTS:
 * time-stamped data logging
 * reconfigured toolbars to better reflect common use
 
-BUGFIXES:
+BUG FIXES:
 * screen capture works again
 * journal spam eliminated
 
@@ -71,7 +72,7 @@ BUGFIXES:
 ENHANCEMENTS:
 * new translations
 
-BUGFIX:
+BUG FIX:
 * fixed problem with pootle that was preventing new strings to be committed
 
 34 
diff --git a/audiograb.py b/audiograb.py
index 6ac1170..da945d0 100644
--- a/audiograb.py
+++ b/audiograb.py
@@ -876,6 +876,9 @@ class AudioGrab():
             self.start_grabbing()
             self.set_dc_mode(mode)
             log.debug('dcmode is: %s' % (str(self.get_dc_mode())))
+            if self.activity.hw == 'XO1' and \
+               hasattr(self.activity, 'sensor_toolbar'):
+                self.activity.sensor_toolbar.unlock_radio_buttons()
 
         if bias is not None:
             self.set_bias(bias)
diff --git a/measure.py b/measure.py
index 6a8ed85..8f565fc 100644
--- a/measure.py
+++ b/measure.py
@@ -337,9 +337,8 @@ class MeasureActivity(activity.Activity):
     def read_metadata(self):
         ''' Any saved instruments? '''
         for data in self.metadata.keys():
-            log.debug(data)
             if data[0] == PREFIX:  # instrument
-                log.debug('found an instrument %s' % (data[1:]))
+                log.debug('found an instrument: %s' % (data[1:]))
                 instrument = data[1:]
                 log.debug(self.metadata[data])
                 INSTRUMENT_DICT[instrument] = []
diff --git a/sensor_toolbar.py b/sensor_toolbar.py
index c594b6a..4fc031b 100644
--- a/sensor_toolbar.py
+++ b/sensor_toolbar.py
@@ -225,7 +225,12 @@ of XO)") + ' '
             self.record_control_cb()
 
         self.set_mode(mode_to_set)
-        self.set_sensor_context()
+        if mode_to_set == 'sound':
+            self.set_sound_context()
+        elif mode_to_set == 'resistance':
+            self.set_sensor_context()
+        elif mode_to_set == 'voltage':
+            self.set_sensor_context()
         self.update_string_for_textbox()
         return False
 
diff --git a/tuning_toolbar.py b/tuning_toolbar.py
index 4c67fe9..fc32cf8 100644
--- a/tuning_toolbar.py
+++ b/tuning_toolbar.py
@@ -307,7 +307,7 @@ class TuningToolbar(gtk.Toolbar):
         else:
             import commands
             (status, output) = commands.getstatusoutput(
-                'speaker-test -t sine -l 1 -f %f' % (f))
+                'speaker-test -t sine -l 1 -f %f' % (freq))
             if status != 0:
                 log.warning('call to speaker-test failed?')
         for c in range(self.activity.audiograb.channels):