diff --git a/client/cmdanalyse.c b/client/cmdanalyse.c
index c04ca2a3b..3cb6c5b47 100644
--- a/client/cmdanalyse.c
+++ b/client/cmdanalyse.c
@@ -426,6 +426,7 @@ int CmdAnalyseCHKSUM(const char *Cmd) {
 }
 
 int CmdAnalyseDates(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     // look for datestamps in a given array of bytes
     PrintAndLogEx(NORMAL, "To be implemented. Feel free to contribute!");
     return 0;
@@ -922,6 +923,7 @@ int CmdAnalyse(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmddata.c b/client/cmddata.c
index bbff0dc88..ac9e3aebc 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -843,6 +843,7 @@ int CmdAutoCorr(const char *Cmd) {
 }
 
 int CmdBitsamples(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     int cnt = 0;
     uint8_t got[12288];
 
@@ -876,6 +877,7 @@ int CmdBuffClear(const char *Cmd) {
 }
 
 int CmdDec(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     for (int i = 0; i < (GraphTraceLen / 2); ++i)
         GraphBuffer[i] = GraphBuffer[i * 2];
     GraphTraceLen /= 2;
@@ -1140,6 +1142,7 @@ int PSKDemod(const char *Cmd, bool verbose) {
 }
 
 int CmdIdteckDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - Idteck PSKDemod failed");
@@ -1400,12 +1403,14 @@ int CmdHexsamples(const char *Cmd) {
 }
 
 int CmdHide(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     HideGraphWindow();
     return 0;
 }
 
 //zero mean GraphBuffer
 int CmdHpf(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     uint8_t bits[GraphTraceLen];
     size_t size = getFromGraphBuf(bits);
     removeSignalOffset(bits, size);
@@ -1499,6 +1504,7 @@ int CmdSamples(const char *Cmd) {
 }
 
 int CmdTuneSamples(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 #define NON_VOLTAGE     1000
 #define LF_UNUSABLE_V   2000
 #define LF_MARGINAL_V   10000
@@ -1684,6 +1690,7 @@ int CmdMtrim(const char *Cmd) {
 }
 
 int CmdNorm(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     int i;
     int max = INT_MIN, min = INT_MAX;
 
@@ -1710,6 +1717,7 @@ int CmdNorm(const char *Cmd) {
 }
 
 int CmdPlot(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     ShowGraphWindow();
     return 0;
 }
@@ -1797,6 +1805,7 @@ int CmdDirectionalThreshold(const char *Cmd) {
 }
 
 int CmdZerocrossings(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     // Zero-crossings aren't meaningful unless the signal is zero-mean.
     CmdHpf("");
 
@@ -2129,6 +2138,7 @@ int CmdData(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index 2a9709ef0..33804c1f0 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -613,6 +613,7 @@ int CmdFlashMem(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 8368160f8..fd61925a5 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -88,6 +88,7 @@ int CmdHFSearch(const char *Cmd) {
 }
 
 int CmdHFTune(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(SUCCESS, "Measuring HF antenna, press button to exit");
     UsbCommand c = {CMD_MEASURE_ANTENNA_TUNING_HF};
     clearCommandBuffer();
@@ -137,6 +138,7 @@ int CmdHF(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index ede90f7fb..757a9820e 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -221,6 +221,7 @@ int usage_hf_14a_info(void) {
 }
 
 int CmdHF14AList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
     CmdTraceList("14a");
     return 0;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 9d542f228..7405db431 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -122,6 +122,7 @@ static int switch_off_field_14b(void) {
 }
 
 int CmdHF14BList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("14b");
     return 0;
 }
@@ -1072,6 +1073,7 @@ uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, ui
     return result;
 }
 int srix4kValid(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint64_t uid = 0xD00202501A4532F9;
     uint32_t block6 = 0xFFFFFFFF;
@@ -1150,6 +1152,7 @@ int CmdHF14B(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index bc03b0883..1b3baa000 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -601,6 +601,7 @@ int CmdHF15Record(const char *Cmd) {
 
 // used with 'hf search'
 int HF15Reader(const char *Cmd, bool verbose) {
+    (void)Cmd; // Cmd is not used so far
     uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     if (!getUID(uid)) {
         if (verbose) PrintAndLogEx(WARNING, "No tag found.");
@@ -901,6 +902,7 @@ int CmdHF15Restore(const char *Cmd) {
 }
 
 int CmdHF15List(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
     CmdTraceList("15");
     return 0;
@@ -1328,6 +1330,7 @@ int CmdHF15(const char *Cmd) {
 }
 
 int CmdHF15Help(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable15);
     return 0;
 }
diff --git a/client/cmdhfepa.c b/client/cmdhfepa.c
index b5f60c403..3bb58072d 100644
--- a/client/cmdhfepa.c
+++ b/client/cmdhfepa.c
@@ -171,6 +171,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c
index 39dbdbc9b..3f2e36971 100644
--- a/client/cmdhffelica.c
+++ b/client/cmdhffelica.c
@@ -65,6 +65,7 @@ int usage_hf_felica_raw(void) {
 }
 
 int CmdHFFelicaList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
     CmdTraceList("felica");
     return 0;
@@ -606,6 +607,7 @@ int CmdHFFelica(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhffido.c b/client/cmdhffido.c
index cb9694584..045eacf71 100644
--- a/client/cmdhffido.c
+++ b/client/cmdhffido.c
@@ -919,6 +919,7 @@ int CmdHFFido(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5688fb8e1..6a2663d7f 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -271,6 +271,7 @@ int xorbits_8(uint8_t val) {
 }
 
 int CmdHFiClassList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
     CmdTraceList("iclass");
     return 0;
@@ -510,6 +511,7 @@ int CmdHFiClassSim(const char *Cmd) {
 }
 
 int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
+    (void)Cmd; // Cmd is not used so far
     bool tagFound = false;
 
     uint32_t flags = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC |  FLAG_ICLASS_READER_AIA |
@@ -2516,6 +2518,7 @@ int CmdHFiClass(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 13f961e82..161c9e795 100644
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -1284,6 +1284,7 @@ int CmdLegicWipe(const char *Cmd) {
 }
 
 int CmdLegicList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("legic");
     return 0;
 }
@@ -1312,6 +1313,7 @@ int CmdHFLegic(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 2a768862a..8855284f2 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -3519,6 +3519,7 @@ int CmdHFMFNDEF(const char *Cmd) {
 }
 
 int CmdHF14AMfList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("mf");
     return 0;
 }
@@ -3575,6 +3576,7 @@ int CmdHFMF(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfdes.c b/client/cmdhfmfdes.c
index 1294f98c7..db70477db 100644
--- a/client/cmdhfmfdes.c
+++ b/client/cmdhfmfdes.c
@@ -115,6 +115,7 @@ int CmdHF14ADesRb(const char *Cmd) {
 }
 
 int CmdHF14ADesInfo(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     UsbCommand c = {CMD_MIFARE_DESFIRE_INFO};
     SendCommand(&c);
@@ -421,6 +422,7 @@ void GetKeySettings(uint8_t *aid) {
 }
 
 int CmdHF14ADesEnumApplications(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint8_t isOK = 0x00;
     uint8_t aid[3];
@@ -657,6 +659,7 @@ int CmdHFMFDes(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index 942000755..a327fb91f 100644
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -861,6 +861,7 @@ int CmdHFMFP(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 38aa06d9d..41cdc1b69 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -2670,6 +2670,7 @@ int CmdHFMFUltra(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhftopaz.c b/client/cmdhftopaz.c
index 398feec6c..255451340 100644
--- a/client/cmdhftopaz.c
+++ b/client/cmdhftopaz.c
@@ -488,16 +488,19 @@ int CmdHFTopazReader(const char *Cmd) {
 }
 
 int CmdHFTopazSim(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "not yet implemented");
     return 0;
 }
 
 int CmdHFTopazCmdRaw(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "not yet implemented. Use hf 14 raw with option -T.");
     return 0;
 }
 
 int CmdHFTopazList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("topaz");
     return 0;
 }
@@ -521,6 +524,7 @@ int CmdHFTopaz(const char *Cmd) {
 }
 
 static int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdhw.c b/client/cmdhw.c
index 4f17c682a..c02c6e45f 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -325,6 +325,7 @@ int CmdDetectReader(const char *Cmd) {
 
 // ## FPGA Control
 int CmdFPGAOff(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_FPGA_MAJOR_MODE_OFF};
     clearCommandBuffer();
     SendCommand(&c);
@@ -361,6 +362,7 @@ int CmdReadmem(const char *Cmd) {
 }
 
 int CmdReset(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_HARDWARE_RESET};
     clearCommandBuffer();
     SendCommand(&c);
@@ -451,6 +453,7 @@ int CmdVersion(const char *Cmd) {
 }
 
 int CmdStatus(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     UsbCommand c = {CMD_STATUS};
     SendCommand(&c);
@@ -460,6 +463,7 @@ int CmdStatus(const char *Cmd) {
 }
 
 int CmdPing(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     clearCommandBuffer();
     UsbCommand resp;
     UsbCommand c = {CMD_PING};
@@ -497,6 +501,7 @@ int CmdHW(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 186184d78..6e40518ae 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -187,6 +187,7 @@ int CmdLFCommandRead(const char *Cmd) {
 }
 
 int CmdFlexdemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (GraphTraceLen < 0)
         return 0;
@@ -737,6 +738,7 @@ int CmdLFpskSim(const char *Cmd) {
 }
 
 int CmdLFSimBidir(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     // Set ADC to twice the carrier for a slight supersampling
     // HACK: not implemented in ARMSRC.
     PrintAndLogEx(INFO, "Not implemented yet.");
@@ -1013,6 +1015,7 @@ int CmdLF(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 72bd48a07..7a570368c 100644
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -240,6 +240,7 @@ int CmdAWIDRead_device(const char *Cmd) {
 //AWID Prox demod - FSK2a RF/50 with preamble of 00000001  (always a 96 bit data stream)
 //print full AWID Prox ID and some bit format details if found
 int CmdAWIDDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
     if (size == 0) {
@@ -573,6 +574,7 @@ int CmdLFAWID(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c
index 53b0d0451..1aa238598 100644
--- a/client/cmdlfcotag.c
+++ b/client/cmdlfcotag.c
@@ -28,6 +28,7 @@ int usage_lf_cotag_read(void) {
 // COTAG demod should be able to use GraphBuffer,
 // when data load samples
 int CmdCOTAGDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint8_t bits[COTAG_BITS] = {0};
     size_t bitlen = COTAG_BITS;
@@ -116,6 +117,7 @@ int CmdLFCOTAG(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 188e2f507..b868cf09c 100644
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -579,6 +579,7 @@ int CmdEM410xBrute(const char *Cmd) {
  *  EDIT -- capture enough to get 2 complete preambles at the slowest data rate known to be used (rf/64) (64*64*2+9 = 8201) marshmellow
 */
 int CmdEM410xWatch(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     do {
         if (ukbhit()) {
             int gc = getchar();
@@ -1507,6 +1508,7 @@ int CmdLFEM4X(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index 4fdaf133a..98ffadafc 100644
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -158,6 +158,7 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
 -- sample: 985121004515220  [ 37FF65B88EF94 ]
 */
 int CmdFDXBdemodBI(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     int clk = 32;
     int invert = 1, errCnt = 0, offset = 0, maxErr = 100;
@@ -233,6 +234,7 @@ int CmdFDXBdemodBI(const char *Cmd) {
 //see ASKDemod for what args are accepted
 //almost the same demod as cmddata.c/CmdFDXBdemodBI
 int CmdFdxDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -404,6 +406,7 @@ int CmdLFFdx(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index e4776935e..d80368496 100644
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -173,6 +173,7 @@ int detectGProxII(uint8_t *bits, size_t *size) {
 // but will leave the GraphBuffer intact.
 //if successful it will push askraw data back to demod buffer ready for emulation
 int CmdGuardDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase
     //get binary from ask wave
@@ -362,6 +363,7 @@ int CmdLFGuard(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index d46abe60e..a3138fff5 100644
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -125,6 +125,7 @@ static bool sendTry(uint8_t fmtlen, uint32_t fc, uint32_t cn, uint32_t delay, ui
 //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded)
 //print full HID Prox ID and some bit format details if found
 int CmdHIDDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint32_t hi2 = 0, hi = 0, lo = 0;
 
@@ -599,6 +600,7 @@ int CmdLFHID(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 166787ba4..870ae2d59 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -119,6 +119,7 @@ int usage_hitag_checkchallenges(void) {
 }
 
 int CmdLFHitagList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("hitag");
     return 0;
 
@@ -706,6 +707,7 @@ int CmdLFHitag(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 257e85894..d4fde6a5e 100644
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -596,6 +596,7 @@ int CmdLFINDALA(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index ae18ec4f7..bd5ac0ae2 100644
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -81,6 +81,7 @@ int CmdIOProxRead_device(const char *Cmd) {
 //IO-Prox demod - FSK RF/64 with preamble of 000000001
 //print ioprox ID and some format details
 int CmdIOProxDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     int retval = 0;
     int idx = 0;
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
@@ -347,6 +348,7 @@ int CmdLFIO(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfjablotron.c b/client/cmdlfjablotron.c
index 08312db4b..1c4d0b683 100644
--- a/client/cmdlfjablotron.c
+++ b/client/cmdlfjablotron.c
@@ -92,6 +92,7 @@ static uint64_t getJablontronCardId(uint64_t rawcode) {
 
 //see ASKDemod for what args are accepted
 int CmdJablotronDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //Differential Biphase / di-phase (inverted biphase)
     //get binary from ask wave
@@ -245,6 +246,7 @@ int CmdLFJablotron(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfkeri.c b/client/cmdlfkeri.c
index c3df3e7be..619ec9bfb 100644
--- a/client/cmdlfkeri.c
+++ b/client/cmdlfkeri.c
@@ -64,6 +64,7 @@ int detectKeri(uint8_t *dest, size_t *size, bool *invert) {
 }
 
 int CmdKeriDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - KERI: PSK1 Demod failed");
@@ -237,6 +238,7 @@ int CmdLFKeri(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index e03401e84..8d314df71 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -113,6 +113,7 @@ int GetNedapBits(uint32_t cn, uint8_t *nedapBits) {
 //print NEDAP Prox ID, encoding, encrypted ID,
 
 int CmdLFNedapDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw ask demod no start bit finding just get binary from wave
     if (!ASKbiphaseDemod("0 64 1 0", false)) {
         if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Nedap ASKbiphaseDemod failed");
@@ -388,6 +389,7 @@ int CmdLFNedap(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnexwatch.c b/client/cmdlfnexwatch.c
index 3f68ae818..6ce78b3f3 100644
--- a/client/cmdlfnexwatch.c
+++ b/client/cmdlfnexwatch.c
@@ -32,6 +32,7 @@ int detectNexWatch(uint8_t *dest, size_t *size, bool *invert) {
 }
 
 int CmdNexWatchDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     if (!PSKDemod("", false)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error - NexWatch can't demod signal");
@@ -106,6 +107,7 @@ int CmdLFNEXWATCH(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index e2c4a5c90..1745d5912 100644
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -101,6 +101,7 @@ int detectNoralsy(uint8_t *dest, size_t *size) {
 
 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //ASK / Manchester
     bool st = true;
@@ -272,6 +273,7 @@ int CmdLFNoralsy(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfparadox.c b/client/cmdlfparadox.c
index 5cca09b4e..3a2979990 100644
--- a/client/cmdlfparadox.c
+++ b/client/cmdlfparadox.c
@@ -78,6 +78,7 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
 //Paradox Prox demod - FSK2a RF/50 with preamble of 00001111 (then manchester encoded)
 //print full Paradox Prox ID and some bit format details if found
 int CmdParadoxDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -199,6 +200,7 @@ int CmdLFParadox(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 06d239372..badc0f4e9 100644
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -172,6 +172,7 @@ int CmdLFPCF7931(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index cff86c88b..16366578e 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -126,6 +126,7 @@ int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
 
 //see ASKDemod for what args are accepted
 int CmdPrescoDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     bool st = true;
     if (!ASKDemod_ext("32 0 0 0 0 a", false, false, 1, &st)) {
         PrintAndLogEx(DEBUG, "DEBUG: Error Presco ASKDemod failed");
@@ -257,6 +258,7 @@ int CmdLFPresco(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 27c80e7f3..3c60c5d83 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -106,6 +106,7 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 //Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001  (always a 128 bit data stream)
 //print full Farpointe Data/Pyramid Prox ID and some bit format details if found
 int CmdPyramidDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     //raw fsk demod no manchester decoding no start bit finding just get binary from wave
     uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
     size_t size = getFromGraphBuf(bits);
@@ -356,6 +357,7 @@ int CmdLFPyramid(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 1f14f8083..e5597efce 100644
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -26,6 +26,7 @@ int detectSecurakey(uint8_t *dest, size_t *size) {
 
 //see ASKDemod for what args are accepted
 int CmdSecurakeyDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     //ASK / Manchester
     bool st = false;
@@ -127,6 +128,7 @@ int CmdLFSecurakey(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 96a0bb78c..26cd6a784 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -960,6 +960,7 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
 }
 
 int special(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     uint8_t bits[32] = {0x00};
 
@@ -1761,6 +1762,7 @@ void t55x7_create_config_block(int tagtype) {
 }
 
 int CmdResetRead(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_T55XX_RESET_READ, {0, 0, 0}};
     clearCommandBuffer();
     SendCommand(&c);
@@ -2320,6 +2322,7 @@ int CmdLFT55XX(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfti.c b/client/cmdlfti.c
index 223629786..129f8d69b 100644
--- a/client/cmdlfti.c
+++ b/client/cmdlfti.c
@@ -22,6 +22,7 @@
 static int CmdHelp(const char *Cmd);
 
 int CmdTIDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     /* MATLAB as follows:
       f_s = 2000000;  % sampling frequency
       f_l = 123200;   % low FSK tone
@@ -273,6 +274,7 @@ out:
 
 // read a TI tag and return its ID
 int CmdTIRead(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     UsbCommand c = {CMD_READ_TI_TYPE};
     clearCommandBuffer();
     SendCommand(&c);
@@ -312,6 +314,7 @@ int CmdLFTI(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index 49b4ccf2f..1a7c7301f 100644
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -174,6 +174,7 @@ int CmdLFViking(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdlfvisa2000.c b/client/cmdlfvisa2000.c
index 3dcc7cf04..ad5f1157b 100644
--- a/client/cmdlfvisa2000.c
+++ b/client/cmdlfvisa2000.c
@@ -95,6 +95,7 @@ int detectVisa2k(uint8_t *dest, size_t *size) {
 **/
 //see ASKDemod for what args are accepted
 int CmdVisa2kDemod(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     save_restoreGB(GRAPH_SAVE);
 
@@ -238,6 +239,7 @@ int CmdLFVisa2k(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 5bbd689e1..b3f19af5c 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -55,11 +55,13 @@ int CmdRem(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
 
 int CmdQuit(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     return 99;
 }
 
diff --git a/client/cmdscript.c b/client/cmdscript.c
index d71a9285b..3ffe064e4 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -68,6 +68,7 @@ bool endsWith(const char *base, const char *str) {
 * ending with .lua
 */
 int CmdScriptList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
 
     char const *exedir = get_my_executable_directory();
     if (exedir == NULL)
@@ -191,6 +192,7 @@ int CmdScript(const char *Cmd) {
  * @return
  */
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     PrintAndLogEx(NORMAL, "This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
     return 0;
 }
diff --git a/client/cmdsmartcard.c b/client/cmdsmartcard.c
index 56352b2fd..e02a0120c 100644
--- a/client/cmdsmartcard.c
+++ b/client/cmdsmartcard.c
@@ -938,6 +938,7 @@ int CmdSmartSetClock(const char *Cmd) {
 }
 
 int CmdSmartList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdTraceList("7816");
     return 0;
 }
@@ -1235,6 +1236,7 @@ int CmdSmartcard(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 1f10ab214..8a2440c90 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -722,6 +722,7 @@ int CmdTrace(const char *Cmd) {
 }
 
 int CmdHelp(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     CmdsHelp(CommandTable);
     return 0;
 }
diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 8e3b1ff83..81cf63063 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -54,7 +54,7 @@ void PrintChannel(EMVCommandChannel channel) {
     }
 }
 
-int CmdEMVSelect(const char *cmd) {
+int CmdEMVSelect(const char *Cmd) {
     uint8_t data[APDU_AID_LEN] = {0};
     int datalen = 0;
 
@@ -72,7 +72,7 @@ int CmdEMVSelect(const char *cmd) {
         arg_strx0(NULL,  NULL,     "<HEX applet AID>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool leaveSignalON = arg_get_lit(2);
@@ -105,7 +105,7 @@ int CmdEMVSelect(const char *cmd) {
     return 0;
 }
 
-int CmdEMVSearch(const char *cmd) {
+int CmdEMVSearch(const char *Cmd) {
 
     CLIParserInit("emv search",
                   "Tries to select all applets from applet list:\n",
@@ -120,7 +120,7 @@ int CmdEMVSearch(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool leaveSignalON = arg_get_lit(2);
@@ -155,7 +155,7 @@ int CmdEMVSearch(const char *cmd) {
     return 0;
 }
 
-int CmdEMVPPSE(const char *cmd) {
+int CmdEMVPPSE(const char *Cmd) {
 
     CLIParserInit("emv pse",
                   "Executes PSE/PPSE select command. It returns list of applet on the card:\n",
@@ -172,7 +172,7 @@ int CmdEMVPPSE(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool leaveSignalON = arg_get_lit(2);
@@ -210,7 +210,7 @@ int CmdEMVPPSE(const char *cmd) {
     return 0;
 }
 
-int CmdEMVGPO(const char *cmd) {
+int CmdEMVGPO(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -231,7 +231,7 @@ int CmdEMVGPO(const char *cmd) {
         arg_strx0(NULL,  NULL,     "<HEX PDOLdata/PDOL>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool leaveSignalON = arg_get_lit(1);
     bool paramsLoadFromFile = arg_get_lit(2);
@@ -317,7 +317,7 @@ int CmdEMVGPO(const char *cmd) {
     return 0;
 }
 
-int CmdEMVReadRecord(const char *cmd) {
+int CmdEMVReadRecord(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -334,7 +334,7 @@ int CmdEMVReadRecord(const char *cmd) {
         arg_strx1(NULL,  NULL,     "<SFI 1byte HEX><SFIrecord 1byte HEX>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool leaveSignalON = arg_get_lit(1);
     bool APDULogging = arg_get_lit(2);
@@ -372,7 +372,7 @@ int CmdEMVReadRecord(const char *cmd) {
     return 0;
 }
 
-int CmdEMVAC(const char *cmd) {
+int CmdEMVAC(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -396,7 +396,7 @@ int CmdEMVAC(const char *cmd) {
         arg_strx1(NULL,  NULL,      "<HEX CDOLdata/CDOL>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, false);
+    CLIExecWithReturn(Cmd, argtable, false);
 
     bool leaveSignalON = arg_get_lit(1);
     bool trTypeCDA = arg_get_lit(2);
@@ -493,7 +493,7 @@ int CmdEMVAC(const char *cmd) {
     return 0;
 }
 
-int CmdEMVGenerateChallenge(const char *cmd) {
+int CmdEMVGenerateChallenge(const char *Cmd) {
 
     CLIParserInit("emv challenge",
                   "Executes Generate Challenge command. It returns 4 or 8-byte random number from card.\nNeeds a EMV applet to be selected and GPO to be executed.",
@@ -506,7 +506,7 @@ int CmdEMVGenerateChallenge(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool leaveSignalON = arg_get_lit(1);
     bool APDULogging = arg_get_lit(2);
@@ -538,7 +538,7 @@ int CmdEMVGenerateChallenge(const char *cmd) {
     return 0;
 }
 
-int CmdEMVInternalAuthenticate(const char *cmd) {
+int CmdEMVInternalAuthenticate(const char *Cmd) {
     uint8_t data[APDU_RES_LEN] = {0};
     int datalen = 0;
 
@@ -562,7 +562,7 @@ int CmdEMVInternalAuthenticate(const char *cmd) {
         arg_strx1(NULL,  NULL,     "<HEX DDOLdata/DDOL>", NULL),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, false);
+    CLIExecWithReturn(Cmd, argtable, false);
 
     bool leaveSignalON = arg_get_lit(1);
     bool paramsLoadFromFile = arg_get_lit(2);
@@ -749,7 +749,7 @@ void ProcessACResponseFormat1(struct tlvdb *tlvRoot, uint8_t *buf, size_t len, b
     }
 }
 
-int CmdEMVExec(const char *cmd) {
+int CmdEMVExec(const char *Cmd) {
     uint8_t buf[APDU_RES_LEN] = {0};
     size_t len = 0;
     uint16_t sw = 0;
@@ -785,7 +785,7 @@ int CmdEMVExec(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool activateField = arg_get_lit(1);
     bool showAPDU = arg_get_lit(2);
@@ -1346,7 +1346,7 @@ int CmdEMVExec(const char *cmd) {
     return 0;
 }
 
-int CmdEMVScan(const char *cmd) {
+int CmdEMVScan(const char *Cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1378,7 +1378,7 @@ int CmdEMVScan(const char *cmd) {
         arg_str1(NULL,  NULL,       "output.json", "JSON output file name"),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     bool showAPDU = arg_get_lit(1);
     bool decodeTLV = arg_get_lit(2);
@@ -1701,14 +1701,16 @@ int CmdEMVScan(const char *cmd) {
 }
 
 int CmdEMVList(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     return CmdTraceList("7816");
 }
 
-int CmdEMVTest(const char *cmd) {
+int CmdEMVTest(const char *Cmd) {
+    (void)Cmd; // Cmd is not used so far
     return ExecuteCryptoTests(true);
 }
 
-int CmdEMVRoca(const char *cmd) {
+int CmdEMVRoca(const char *Cmd) {
     uint8_t AID[APDU_AID_LEN] = {0};
     size_t AIDlen = 0;
     uint8_t buf[APDU_RES_LEN] = {0};
@@ -1729,7 +1731,7 @@ int CmdEMVRoca(const char *cmd) {
         arg_lit0("wW",  "wired",   "Send data via contact (iso7816) interface. Contactless interface set by default."),
         arg_param_end
     };
-    CLIExecWithReturn(cmd, argtable, true);
+    CLIExecWithReturn(Cmd, argtable, true);
 
     EMVCommandChannel channel = ECC_CONTACTLESS;
     if (arg_get_lit(1))
diff --git a/client/emv/cmdemv.h b/client/emv/cmdemv.h
index 739909215..4d2b99471 100644
--- a/client/emv/cmdemv.h
+++ b/client/emv/cmdemv.h
@@ -29,10 +29,10 @@
 
 int CmdEMV(const char *Cmd);
 
-int CmdEMVSelect(const char *cmd);
-int CmdEMVSearch(const char *cmd);
-int CmdEMVPPSE(const char *cmd);
-int CmdEMVExec(const char *cmd);
+int CmdEMVSelect(const char *Cmd);
+int CmdEMVSearch(const char *Cmd);
+int CmdEMVPPSE(const char *Cmd);
+int CmdEMVExec(const char *Cmd);
 int CmdEMVGetrng(const char *Cmd);
 int CmdEMVList(const char *Cmd);
 int CmdEMVRoca(const char *Cmd);