changed samplig

[goodfet] / client / FordExperiments.py

diff --git a/client/FordExperiments.py b/client/FordExperiments.py
index f6cb816..9d93376 100644 (file)
--- a/client/FordExperiments.py
+++ b/client/FordExperiments.py
@@ -356,7 +356,45 @@ class FordExperiments(experiments):
         # spit new value for 1 second
         while (time.time()-starttime < 10):
             self.multiPacketSpit(packet0rts=True)
+       
+    def setEngineTemp(self,temp):
+        self.client.serInit()
+        self.spitSetup(500)
+
+        self.addFilter([1056, 1056, 1056,1056,1056,1056])
+        self.client.rxpacket()
+        self.client.rxpacket()
+        self.client.rxpacket()
+        SIDlow = (1056 & 0x07) << 5;  # get SID bits 2:0, rotate them to bits 7:5
+        SIDhigh = (1056 >> 3) & 0xFF; # get SID bits 10:3, rotate them to bits 7:0
+              
+        startTime = time.time()  
+        #while((time.time() - startTime) < 10):
+            
+        packet = None;
+
+        # catch a packet and check its db4 value
+        while (packet == None):
+            packet=self.client.rxpacket();
+
+        
+        newTemp = int(math.ceil(level/1.8 + 22))
+        #print "Fake MPH = 1.617(%d)-63.5 = %d" %(newSpeed, mph)
+
             
+        newPacket = [SIDhigh, SIDlow, 0x00,0x00, # pad out EID regs
+                       0x08, # bit 6 must be set to 0 for data frame (1 for RTR) 
+                       # lower nibble is DLC                   
+                       newTemp,ord(packet[6]),ord(packet[7]),ord(packet[8]),ord(packet[9]),ord(packet[10]),ord(packet[11]),ord(packet[12])]
+
+        # load new packet into TXB0 and check time
+        self.multiPacketSpit(packet0=newPacket, packet0rts=True)
+        starttime = time.time()
+        
+        # spit new value for 1 second
+        while (time.time()-starttime < 10):
+            self.multiPacketSpit(packet0rts=True)
+                    
     def overHeatEngine(self):
         self.client.serInit()
         self.spitSetup(500)
@@ -850,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)
             
@@ -864,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
@@ -886,10 +926,6 @@ class FordExperiments(experiments):
             while (time.time()-starttime < .1):
                 self.multiPacketSpit(packet0rts=True)
 
-
-
-
-
 # read in 26 frames
 # average them
 # normalize to our range of values (conversion 1.6167*x-63.5
@@ -901,6 +937,24 @@ class FordExperiments(experiments):
 #sample width: 2 --> 2 bytes per sample
 #framerate: 44100 
 
+    def engineDiagnostic(self, data):
+       
+        self.addFilter([513, 513, 513,513])
+               
+        startTime = tT.time()
+        while((tT.time() - startTime ) < 15):
+                packet = None;
+        
+                       #catch a packet to decode
+               while (packet == None):
+                   packet=self.client.rxpacket();
+            
+               rpm = 64.5 * ord(packet[5]) - 61.88
+               mph = 1.617 * ord(packet[9]) - 63.5
+
+               data.put("Engine RPM: %d Current Speed: %d mph"%(rpm, mph))
+               time.sleep(.5)
+