From f6245cdb7949d14a1ff1b27f9422722fe18417b1 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Mon, 11 May 2020 01:23:28 +0200 Subject: [PATCH 1/2] fix appveyor multiple definition of enum error --- client/src/cmdlft55xx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdlft55xx.h b/client/src/cmdlft55xx.h index 71fda2a72..7074124e6 100644 --- a/client/src/cmdlft55xx.h +++ b/client/src/cmdlft55xx.h @@ -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, From c1209ca0f53a188ec02c0a953f9c8a3e1594b895 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Mon, 11 May 2020 02:16:43 +0200 Subject: [PATCH 2/2] (clang) fix unused function warning --- client/src/cmdlfnexwatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cmdlfnexwatch.c b/client/src/cmdlfnexwatch.c index c9a610964..ba91b21c2 100644 --- a/client/src/cmdlfnexwatch.c +++ b/client/src/cmdlfnexwatch.c @@ -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");