X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=f91958eecedfa95af8022d347448bf5ce7e1f22e;hp=75d966204d9a05f94af2d88aa9bcb555b62337b5;hb=8e28954868efbb609df0c37369b8d1ec9425d4f1;hpb=0a4e61c633bfe1cb455f1cd1ecd73afca0306a50 diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index 75d9662..f91958e 100644 --- a/client/GoodFETMCPCANCommunication.py +++ b/client/GoodFETMCPCANCommunication.py @@ -393,10 +393,14 @@ class GoodFETMCPCANCommunication: self.client.MCPsetrate(freq); self.client.MCPreqstatNormal(); - def spit(self,freq, standardid, repeat, duration = None, debug = False, packet = None): + def spitSingle(self,freq, standardid, repeat, duration = None, debug = False, packet = None): self.spitSetup(freq); - + spit(self,freq, standardid, repeat, duration = None, debug = False, packet = None) + + def spit(self,freq, standardid, repeat, duration = None, debug = False, packet = None): + + #### split SID into different regs SIDlow = (standardid[0] & 0x07) << 5; # get SID bits 2:0, rotate them to bits 7:5 SIDhigh = (standardid[0] >> 3) & 0xFF; # get SID bits 10:3, rotate them to bits 7:0 @@ -448,10 +452,11 @@ class GoodFETMCPCANCommunication: starttime = time.time(); while((time.time()-starttime < duration)): self.client.MCPrts(TXB0=True); + print "MSG printed" else: while(1): self.client.MCPrts(TXB0=True); - + print "messages injected" # MORE DEBUGGING if(debug): checkcount = 0; @@ -627,7 +632,7 @@ if __name__ == "__main__": # transmission (travis thinks this is because we're sniffing in listen-only # and thus not generating an ack bit on the recieving board) if(args.verb=="spit"): - comm.spit(freq=freq, standardid=standardid,duration=duration, repeat=repeat, debug=debug) + comm.spitSingle(freq=freq, standardid=standardid,duration=duration, repeat=repeat, debug=debug)