From e5df52fb8695dd58b8029fa5d337cd91ec74bec6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 19 Oct 2019 16:42:37 -0400
Subject: [PATCH] fix: bools

---
 client/cmdlft55xx.c | 4 ++--
 client/cmdlft55xx.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 541a67fe4..9175bdaf5 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1083,7 +1083,7 @@ static int CmdT55xxDetect(const char *Cmd) {
             if (try_all_dl_modes) {
                 for (uint8_t m = downlink_mode; m < 4; m++) {
 
-                    if (AcquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, try_with_pwd & usepwd, password, m) == false)
+                    if (AcquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, try_with_pwd && usepwd, password, m) == false)
                         continue;
 
                     // pre fill to save passing in.
@@ -1111,7 +1111,7 @@ static int CmdT55xxDetect(const char *Cmd) {
                 }
             }
 
-            if (!found & usepwd)
+            if (!found && usepwd)
                 try_with_pwd = !try_with_pwd; // toggle so we loop back if not found and try with pwd
 
             if (found)
diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 4f96006b5..71fda2a72 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -148,7 +148,7 @@ char *GetQ5ModulationStr(uint32_t id);
 char *GetModulationStr(uint32_t id, bool xmode);
 char *GetModelStrFromCID(uint32_t cid);
 char *GetSelectedModulationStr(uint8_t id);
-char *GetDownlinkModeStr(uint8_t dlmode);
+char *GetDownlinkModeStr(uint8_t downlink_mode);
 void printT5xxHeader(uint8_t page);
 void printT55xxBlock(uint8_t blockNum, bool page1);
 int  printConfiguration(t55xx_conf_block_t b);