From: iceman1001 <iceman@iuse.se>
Date: Sat, 9 Jan 2016 16:20:06 +0000 (+0100)
Subject: FIX:  minor fixes to the HID wiegand generation command. Still not complete
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fc893f8e33c70e0cd7e93a7997e53f7c23fe8de3

FIX:  minor fixes to the HID wiegand generation command. Still not complete
---

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 61084c0b..b9d4b75e 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -30,7 +30,7 @@ int usage_hid_wiegand(){
 	PrintAndLog("       facilitynum	- Facility number");
 	PrintAndLog("       cardnum		- Card number");
 	PrintAndLog("Examples:");
-	PrintAndLog("      lf hid wiegand 26 0 304 2001");
+	PrintAndLog("      lf hid wiegand 26 0 101 2001");
 	return 0;
 }
 
@@ -230,8 +230,8 @@ static void calc37H(uint64_t cn, uint32_t *hi, uint32_t *lo){
 }
 static void calc40(uint64_t cn, uint32_t *hi, uint32_t *lo){
 	cn = (cn & 0xFFFFFFFFFF);
-	*lo = (uint32_t)((cn & 0xFFFFFFFF) << 1 ); 
-	*hi = (uint32_t) (cn >> 31);  
+	*lo = ((cn & 0xFFFFFFFF) << 1 ); 
+	*hi = (cn >> 31);  
 }
 
 int CmdHIDWiegand(const char *Cmd)
@@ -284,13 +284,12 @@ int CmdHIDWiegand(const char *Cmd)
 		}
 		case 40 : {
 			calc40(cn, &hi, &lo);
-			PrintAndLog("%x  %x", hi, lo);
 			break;
 		}
 		case 44 : { break; }
 		case 84 : { break; }
 	}
-	PrintAndLog("HID %d bit | FC: %d CN: %d | Wiegand Code: %08X%08X", fmtlen, fc, cn, hi, lo);
+	PrintAndLog("HID %d bit | FC: %d CN: %lld | Wiegand Code: %08X%08X", fmtlen, fc, cn, hi, lo);
 	return 0;
 }