diff --git a/common_arm/flashmem.c b/common_arm/flashmem.c index eae8f3bef..5a115da1a 100644 --- a/common_arm/flashmem.c +++ b/common_arm/flashmem.c @@ -49,7 +49,7 @@ void FlashmemSetSpiBaudrate(uint32_t baudrate) { } // read ID out -bool Flash_ReadID_90(flash_device_type_90_t* result) { +bool Flash_ReadID_90(flash_device_type_90_t *result) { if (Flash_CheckBusy(BUSY_TIMEOUT)) return false; @@ -354,20 +354,20 @@ void Flashmem_print_status(void) { DbpString(" Memory size............. " _GREEN_("2 mbits / 256 kb")); } else { Dbprintf(" Device ID............... " _YELLOW_("%02X / %02X (unknown)"), - device_type.manufacturer_id, device_type.device_id ); + device_type.manufacturer_id, device_type.device_id); } } uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; Flash_UniqueID(uid); - Dbprintf(" Unique ID (be).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X" ), - uid[0], uid[1], uid[2], uid[3], - uid[4], uid[5], uid[6], uid[7] + Dbprintf(" Unique ID (be).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X"), + uid[0], uid[1], uid[2], uid[3], + uid[4], uid[5], uid[6], uid[7] ); if (g_dbglevel > 3) { - Dbprintf(" Unique ID (le).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X" ), - uid[7], uid[6], uid[5], uid[4], - uid[3], uid[2], uid[1], uid[0] + Dbprintf(" Unique ID (le).......... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X"), + uid[7], uid[6], uid[5], uid[4], + uid[3], uid[2], uid[1], uid[0] ); } FlashStop(); diff --git a/common_arm/flashmem.h b/common_arm/flashmem.h index 72cc3e8b7..f60b73c58 100644 --- a/common_arm/flashmem.h +++ b/common_arm/flashmem.h @@ -127,7 +127,7 @@ typedef struct { uint8_t manufacturer_id; uint8_t device_id; } flash_device_type_90_t; // to differentiate from JDEC ID via cmd 9F -bool Flash_ReadID_90(flash_device_type_90_t* result); +bool Flash_ReadID_90(flash_device_type_90_t *result); uint16_t Flash_ReadData(uint32_t address, uint8_t *out, uint16_t len); uint16_t Flash_ReadDataCont(uint32_t address, uint8_t *out, uint16_t len); diff --git a/common_arm/usb_cdc.c b/common_arm/usb_cdc.c index 6e758c8aa..cb2d0c64a 100644 --- a/common_arm/usb_cdc.c +++ b/common_arm/usb_cdc.c @@ -413,8 +413,8 @@ void usb_update_serial(uint64_t newSerialNumber) { uint8_t nibble2 = (newSerialNumber >> ((8 * i) + 0)) & 0xFu; // bitmasks [0x0F, 0x0F00, 0x0F0000, ... 0x0F00000000000000] char c1 = nibble1 < 10 ? '0' + nibble1 : 'A' + (nibble1 - 10); char c2 = nibble2 < 10 ? '0' + nibble2 : 'A' + (nibble2 - 10); - StrSerialNumber[18 + (4*i) + 0] = c1; // [ 18, 22, .., 42, 46 ] - StrSerialNumber[18 + (4*i) + 2] = c2; // [ 20, 24, .., 44, 48 ] + StrSerialNumber[18 + (4 * i) + 0] = c1; // [ 18, 22, .., 42, 46 ] + StrSerialNumber[18 + (4 * i) + 2] = c2; // [ 20, 24, .., 44, 48 ] } StrSerialNumber[0] = USB_STRING_DESCRIPTOR_SERIAL_NUMBER_LENGTH; } diff --git a/doc/commands.json b/doc/commands.json index b8e7be6be..3b1ac6aca 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -3099,9 +3099,10 @@ "--fc facility code", "--cn card number", "-w, --wiegand see `wiegand list` for available formats", - "--shallow use shallow (ASK) reader modulation instead of OOK" + "--shallow use shallow (ASK) reader modulation instead of OOK", + "-v verbose (print encoded blocks)" ], - "usage": "hf iclass encode [-h] [--bin ] --ki [--credit] [--elite] [--raw] [--enckey ] [--fc ] [--cn ] [-w ] [--shallow]" + "usage": "hf iclass encode [-hv] [--bin ] --ki [--credit] [--elite] [--raw] [--enckey ] [--fc ] [--cn ] [-w ] [--shallow]" }, "hf iclass encrypt": { "command": "hf iclass encrypt", @@ -11903,6 +11904,6 @@ "metadata": { "commands_extracted": 749, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2023-02-18T01:26:44" + "extracted_on": "2023-02-18T20:20:19" } } \ No newline at end of file