RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-07 08:38:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

Browse source
This commit is contained in:
iceman1001 2020-05-11 10:00:36 +02:00
commit 0c20369c3f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/src/cmdlfnexwatch.c
View file

@ -52,7 +52,7 @@ static int usage_lf_nexwatch_sim(void) {
PrintAndLogEx(NORMAL, " lf nexwatch sim r 5600000000213C9F8F150C");
return PM3_SUCCESS;
}
/*
static inline uint32_t bitcount(uint32_t a) {
#if defined __GNUC__
return __builtin_popcountl(a);
@ -62,7 +62,7 @@ static inline uint32_t bitcount(uint32_t a) {
return (((a + (a >> 4)) & 0x0f0f0f0f) * 0x01010101) >> 24;
#endif
}
*/
int demodNexWatch(void) {
if (PSKDemod("", false) != PM3_SUCCESS) {
PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");

2
client/src/cmdlft55xx.h
View file

@ -47,7 +47,7 @@
#define T55X7_bin 0b0010
#define T5555_DEFAULT_CONFIG_BLOCK 0x6001F004 // data rate 64 , ask, manchester, 2 data blocks?
enum {
typedef enum {
T55x7_RAW = 0x00,
T55x7_DEFAULT = 0x00,
T5555_DEFAULT = 0x01,