X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FFordExperiments.py;h=9d933760dcea1802c3970970087fc042d5f44b82;hp=5c805889f5b520f01d746815beed100ac3835242;hb=bb506a11d7de4367ef5a42a367dda15d958a6931;hpb=5c765e61a412076529a299e51a9436f8276d8fc0

diff --git a/client/FordExperiments.py b/client/FordExperiments.py
index 5c80588..9d93376 100644
--- a/client/FordExperiments.py
+++ b/client/FordExperiments.py
@@ -888,13 +888,13 @@ class FordExperiments(experiments):
         print "compression: %s " %music.getcompname()
         
         
-        numFramesToRead = music.getframerate()*.1 # grab .1s of audio
+        numFramesToRead = music.getframerate()*.05 # grab .1s of audio
                 
         while(1):
 
             runningSum = 0
             
-            sample = music.readframes(numFramesToRead) # grab .1s of audio
+            sample = music.readframes(int(numFramesToRead)) # grab .1s of audio
             
             length = len(sample)
             
@@ -902,9 +902,11 @@ class FordExperiments(experiments):
                 runningSum += ord(sample[i]) 	#average the dual-channel
                 runningSum += ord(sample[i+2])
             
-            avg = runningSum/(length / 2)		# we used 2 of every 4 frames, so divide length by 2
-
-            val = (40 + 5*(avg-120))			# normalize to speedometer range of values
+             avg = math.fabs(runningSum/(length /2) -127)       # we used 2 of every 4 frames, so divide length by 2
+             if( sampNum > 0):
+                 avg = (avg+avgprev)/2
+                 
+            val = int(avg*15 + 40)			# normalize to speedometer range of values
             
             print "speedometerVal = %f " %val;
             print "speed = %f" %(1.617*val-63.5)	# speed we're trying to display