FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands...

[proxmark3-svn] / client / cmdlfviking.c

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 6d3362f702f805a07d994ccad2e0fb5c2f8cebe4..36f2a67278435f24bdd4ed538b4ba47bfbdcf34a 100644 (file)
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -47,9 +47,9 @@ int usage_lf_viking_sim(void) {
 
 // calc checksum
 uint64_t getVikingBits(uint32_t id) {
-       uint8_t checksum = (id>>24) ^ ((id>>16) & 0xFF) ^ ((id>>8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
+       uint8_t checksum = ((id>>24) & 0xFF) ^ ((id>>16) & 0xFF) ^ ((id>>8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
        uint64_t ret = (uint64_t)0xF2 << 56;
-       ret |= (id << 8);
+       ret |= (uint64_t)id << 8;
        ret     |= checksum;
        return ret;
 }
@@ -60,7 +60,7 @@ int CmdVikingRead(const char *Cmd) {
        // read lf silently
        CmdLFRead("s");
        // get samples silently
-       getSamples("30000",false);
+       getSamples("12000", TRUE);
        // demod and output viking ID   
        return CmdVikingDemod(Cmd);
 }
@@ -126,6 +126,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFViking(const char *Cmd) {
+       clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }