fix endianness in device descriptor
[goodfet] / client / FordExperiments.py
index 03252dc..4461acd 100644 (file)
@@ -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)
@@ -629,7 +667,11 @@ class FordExperiments(experiments):
         self.client.rxpacket()
         SIDlow = (513 & 0x07) << 5;  # get SID bits 2:0, rotate them to bits 7:5
         SIDhigh = (513 >> 3) & 0xFF; # get SID bits 10:3, rotate them to bits 7:0
-              
+        
+        SID2 = (1056 & 0x07) << 5;
+        SID2high = (1056 >>3) & 0xFF;
+        packet_odometer = [SID2high, SID2, 0 ,0,8, 65, 0, 32, 120, 0, 0, 1, 247]
+        
         startTime = time.time()  
         #while((time.time() - startTime) < 10):
             
@@ -662,8 +704,10 @@ class FordExperiments(experiments):
         
         # spit new value for 1 second
         while (time.time()-starttime < 10):
-            self.multiPacketSpit(packet0rts=True)
-
+            #self.multiPacketSpit(packet0rts=True)
+            odomFuzz = random.randint(1,254)
+            packet_odometer[6] = odomFuzz
+            self.multiPacketSpit(packet0=newPacket, packet1 =packet_odometer,packet0rts = True, packet1rts=True)
 
     def speedometerHack(self, inputs):
         
@@ -706,6 +750,7 @@ class FordExperiments(experiments):
         
         # spit new value for 1 second
         while (time.time()-starttime < 1):
+            
             self.multiPacketSpit(packet0rts=True)
                 
     def rpmToByteValue(self, rpm):
@@ -842,66 +887,55 @@ class FordExperiments(experiments):
         
         # NOW THE FUN STUFF!!!!!
         
-        music = wave.open("../../contrib/ted/GBtheme.wav", 'r');
+        music = wave.open("../../contrib/ted/beethovensfifth.wav", 'r');
         print "number of frames: %d " %music.getnframes()
         print "number of channels: %d " %music.getnchannels()
         print "sample width: %d " %music.getsampwidth()
         print "framerate: %d " %music.getframerate()
         print "compression: %s " %music.getcompname()
         
-        length = music.getnframes()
-        pos = music.tell()
-        print " NOW NOW NOW NOW NOW NOW NOW NOW NOW"
         
-        while(pos < music.getnframes()):
-            runningaverage = 0
+        numFramesToRead = music.getframerate()*.05 # grab .1s of audio
+        sampNum = 0
+        avgprev = 0
+        avg = 0
+        while(1):
+            avgprev = avg
+            runningSum = 0
             
-            pos = music.tell()
-            sample = music.readframes(2300) #approximately .05 seconds of audio --> 7133184/44100/.1
-            #print "NEXT FRAME"
+            sample = music.readframes(int(numFramesToRead)) # grab .1s of audio
             
             length = len(sample)
-            #print length
             
             for i in range(0, length,4):
-                runningaverage += ord(sample[i])#ord(sample[i])
-                runningaverage += ord(sample[i+2])
+                runningSum += ord(sample[i])   #average the dual-channel
+                runningSum += ord(sample[i+2])
             
-            avg = runningaverage/(length / 4)/2
-            #print avg
-            
-            
-            #print avg-120
-            val = (40 + 5*(avg-120))
+            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
+            sampNum = 1
+
+            val = int(avg*15 + 40)                     # normalize to speedometer range of values
             
             print "speedometerVal = %f " %val;
-            print "speed = %f" %(1.617*val-63.5)
+            print "speed = %f" %(1.617*val-63.5)       # speed we're trying to display
             
-            if (val > 255):
+            if (val > 255):                                            # ensure we don't run off acceptable range
                 val = 255
             elif (val < 0):
                 val = 0
             
-            newPacket[9] = int(val)
+            newPacket[9] = int(val)                            # write it to the packet
             
             # 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 < .05):
+            while (time.time()-starttime < .1):
                 self.multiPacketSpit(packet0rts=True)
 
-#for foo in byte:
-#  print "%d" %ord(foo)
-
-#39.27
-#113
-
-
-
-
-
 # read in 26 frames
 # average them
 # normalize to our range of values (conversion 1.6167*x-63.5
@@ -913,6 +947,25 @@ class FordExperiments(experiments):
 #sample width: 2 --> 2 bytes per sample
 #framerate: 44100 
 
+    def engineDiagnostic(self, data):
+        self.client.serInit()
+        self.spitSetup(500)    
+        self.addFilter([513, 513, 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
+                print "putting data in"
+               data.put("Engine RPM: %d Current Speed: %d mph\n"%(rpm, mph))
+               time.sleep(.5)
+