X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7177c5133436b55ff29479fc18f098563c911a35..09bccd98a33e96386c21178d81fbcbc81c0fcdea:/client/cmdlfviking.c

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 6d3362f7..4ea35422 100644
--- 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("20000", 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;
 }