Merge pull request RfidResearchGroup#355 from LupusE/main

Fix broken CLI after multiple merges

Author: GameTec-live

firmware/application/src/data_cmd.h

@@ -95,7 +95,7 @@
 #define DATA_CMD_HIDPROX_WRITE_TO_T55XX         (3003)
 #define DATA_CMD_VIKING_SCAN                    (3004)
 #define DATA_CMD_VIKING_WRITE_TO_T55XX          (3005)
-#define DATA_CMD_ADC_GENERIC_READ               (3006)
+#define DATA_CMD_ADC_GENERIC_READ               (3009)
 #define DATA_CMD_GENERIC_READ                   (3007)
 #define DATA_CMD_CORR_GENERIC_READ              (3008)
 

software/script/chameleon_cli_unit.py

@@ -1841,7 +1841,7 @@ def args_parser(self) -> ArgumentParserNoExit:
         parser = ArgumentParserNoExit()
         parser.description = 'Mifare Classic clone tag from dump'
         parser.add_argument('-t', '--dump-file-type', type=str, required=False, help="Dump file content type", choices=['bin', 'hex'])
-        parser.add_argument('-a', '--clone-access', type=bool, default=False, help="Write ACL from original dump too (/!\ could brick your tag)")
+        parser.add_argument('-a', '--clone-access', type=bool, default=False, help="Write ACL from original dump too (! could brick your tag)")
         parser.add_argument('-f', '--dump-file', type=argparse.FileType("rb"), required=True,
                             help="Dump file containing data to write on new tag")
         parser.add_argument('-d', '--dic', type=argparse.FileType("r"), required=True,

software/script/chameleon_enum.py

@@ -83,7 +83,7 @@ class Command(enum.IntEnum):
     HIDPROX_WRITE_TO_T55XX = 3003
     VIKING_SCAN = 3004
     VIKING_WRITE_TO_T55XX = 3005
-    ADC_GENERIC_READ = 3006
+    ADC_GENERIC_READ = 3009
 
     MF1_WRITE_EMU_BLOCK_DATA = 4000
     HF14A_SET_ANTI_COLL_DATA = 4001