X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FFordExperiments.py;h=e826bca4a150f7b8a5324c77a9cfbe330f302cb2;hp=c3abf625f5c3690cfff2d099419559c8b4e64714;hb=ed70ab984559f85637b5d3ef88493e5cde92d9d5;hpb=d55e72f78b2d65c275d7f9355b6815ba80f71759

diff --git a/client/FordExperiments.py b/client/FordExperiments.py
index c3abf62..e826bca 100644
--- a/client/FordExperiments.py
+++ b/client/FordExperiments.py
@@ -11,16 +11,21 @@ from intelhex import IntelHex;
 import Queue
 import math
 
-class FordExperiments(GoodFETMCPCANCommunication):
+tT = time
+class FordExperiments(GoodFETMCPCANCommunication, dataLocation):
     
-    def init(self):
-        super(FordExperimetns,self).__init__(self) #initialize chip
+    def __init__(self):
+        GoodFETMCPCANCommunication.__init__(self, dataLocation)
+        #super(FordExperiments,self).__init__(self) #initialize chip
         self.freq = 500;
 
+    
+
+
     def mimic1056(self,packetData,runTime):
         #setup chip
         self.client.serInit()
-        self.spitSetup(500)
+        self.spitSetup(self.freq)
         #FIGURE out how to clear buffers
         self.addFilter([1056, 1056, 1056, 1056,1056, 1056], verbose=False)
         packet1 = self.client.rxpacket();
@@ -128,10 +133,88 @@ class FordExperiments(GoodFETMCPCANCommunication):
             tpast = time.time()  #update our transmit time on the one before   
         print packetCount;
         
+    def getBackground(self,sId):
+        packet1 = self.client.rxpacket();
+        if(packet1 != None):
+            packetParsed = self.client.packet2parsed(packet1);
+        #keep sniffing till we read a packet
+        while( packet1 == None or packetParsed.get('sID') != sId ):
+            packet1 = self.client.rxpacket()
+            if(packet1 != None):
+                packetParsed = self.client.packet2parsed(packet1)
+            
+        #recieveTime = time.time()
+        return packetParsed
+
+    def cycle4packets1279(self):
+        self.client.serInit()
+        self.spitSetup(500)
+        # filter on 1279
+        self.addFilter([1279, 1279, 1279, 1279, 1279, 1279], verbose = False)
+        packetParsed = self.getBackground(1279)
+        packet = []
+        if (packetParsed[db0] == 16):
+            # if it's the first of the four packets, replace the value in db7  with 83
+            packetParsed[db7] = 83
+            # transmit new packet
+            self.client.txpacket(packetParsed)
+        else:
+        # otherwise, leave it alone
+            # transmit same pakcet we read in
+            self.client.txpacket(packetParsed)
+        # print the packet we are transmitting
+        print packetParsed
+        
+        
+    def oscillateTemperature(self,time):
+        #setup chip
+        self.client.serInit()
+        self.spitSetup(500)
+        #FIGURE out how to clear buffers
+        self.addFilter([1056, 1056, 1056, 1056,1056, 1056], verbose=False)
+        packetParsed = self.getBackground(1056)
+        packet = []
+        #set data packet to match what was sniffed or at least what was input
+        for i in range(0,8):
+            idx = "db%d"%i
+            packet.append(ord(packetParsed.get(idx)))
+        packetValue = 0
+        packet[1] = packetValue;
+        
+        print packet
+        #### split SID into different regs
+        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
+        packet = [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]]
+        packetCount = 1;
+        self.client.txpacket(packet);
+        startTime = tT.time()
+        while( (tT.time()-startTime) < runTime):
+            dt = tT.time()-startTime
+            inputValue = ((2.0*math.pi)/20.0)*dt
+            value = 30*math.sin(inputValue)+130
+            print value
+            #packet[5] = int(value)
+            if( value > 130 ):
+                packet[5] = 160
+            else:
+                packet[5] = 100
+            #packet[6] = 1
+            print packet
+            self.client.txpacket(packet)
+            packetCount += 1
+            #tpast = time.time()  #update our transmit time on the one before   
+        print packetCount;
+        
+        
 if __name__ == "__main__":
     fe = FordExperiments();
     packetData = {}
     packetData['db4'] = 4;
-    runTime = 10;
+    runTime = 100;
     #fe.mimic1056(packetData, runTime)
-    fe.cycledb1_1056(runTime)
+    #fe.cycledb1_1056(runTime)
+    fe.oscillateTemperature(runTime)