github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

Browse source
This commit is contained in:
iceman1001 2019-04-26 08:56:16 +02:00
commit 88744650db
4 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cmdhw.c
View file

@ -477,11 +477,7 @@ void pm3_version(bool verbose) {
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
#ifdef __WIN32 PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
PrintAndLogEx(NORMAL, "\n [ Proxmark3 RFID instrument ]\n");
#else
PrintAndLogEx(NORMAL, "\n\e[34m [ Proxmark3 RFID instrument ]\e[0m\n");
#endif
char s[60] = {0}; char s[60] = {0};
#if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC) #if defined(WITH_FLASH) || defined(WITH_SMARTCARD) || defined(WITH_FPC)
strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1); strncat(s, "build for RDV40 with ", sizeof(s) - strlen(s) - 1);

2
client/mifare/mifarehost.c
View file

@ -935,7 +935,7 @@ int detect_classic_nackbug(bool verbose) {
} else { } else {
printf( printf(
#if defined(__linux__) || (__APPLE__) #if defined(__linux__) || (__APPLE__)
"\e[32m\e[s%c\e[u\e[0m", star[(staridx++ % 4) ] _GREEN_("\e[s%c\e[u"), star[(staridx++ % 4) ]
#else #else
"." "."
#endif #endif

12
client/proxmark3.c
View file

@ -32,12 +32,12 @@
static void showBanner(void) { static void showBanner(void) {
printf("\n\n"); printf("\n\n");
#if defined(__linux__) || (__APPLE__) #if defined(__linux__) || (__APPLE__)
printf("\e[34m██████╗ ███╗ ███╗ ████╗\e[0m ...iceman fork\n"); printf(_BLUE_("██████╗ ███╗ ███╗ ████╗ ") " ...iceman fork\n");
printf("\e[34m██╔══██╗████╗ ████║ ══█║\e[0m ...dedicated to \e[34mRDV40\e[0m\n"); printf(_BLUE_("██╔══██╗████╗ ████║ ══█║") " ...dedicated to " _BLUE_("RDV40") "\n");
printf("\e[34m██████╔╝██╔████╔██║ ████╔╝\e[0m\n"); printf(_BLUE_("██████╔╝██╔████╔██║ ████╔╝") "\n");
printf("\e[34m██╔═══╝ ██║╚██╔╝██║ ══█║\e[0m iceman@icesql.net\n"); printf(_BLUE_("██╔═══╝ ██║╚██╔╝██║ ══█║") " iceman@icesql.net\n");
printf("\e[34m██║ ██║ ╚═╝ ██║ ████╔╝\e[0m https://github.com/rfidresearchgroup/proxmark3/\n"); printf(_BLUE_("██║ ██║ ╚═╝ ██║ ████╔╝") " https://github.com/rfidresearchgroup/proxmark3/\n");
printf("\e[34m╚═╝ ╚═╝ ╚═╝ ╚═══╝\e[0m pre-release v4.0\n"); printf(_BLUE_("╚═╝ ╚═╝ ╚═╝ ╚═══╝ ") "pre-release v4.0\n");
#else #else
printf("======. ===. ===. ====. ...iceman fork\n"); printf("======. ===. ===. ====. ...iceman fork\n");
printf("==...==.====. ====. ..=. ...dedicated to RDV40\n"); printf("==...==.====. ====. ..=. ...dedicated to RDV40\n");

4
include/proxmark3.h
View file

@ -108,7 +108,7 @@
//NVDD goes LOW when USB is attached. //NVDD goes LOW when USB is attached.
#define USB_ATTACHED() !((AT91C_BASE_PIOA->PIO_PDSR & GPIO_NVDD_ON) == GPIO_NVDD_ON) #define USB_ATTACHED() !((AT91C_BASE_PIOA->PIO_PDSR & GPIO_NVDD_ON) == GPIO_NVDD_ON)
#define VERSION_INFORMATION_MAGIC 0x56334d50 #define VERSION_INFORMATION_MAGIC 0x56334d50 // "PM3V"
struct version_information { struct version_information {
int magic; /* Magic sequence to identify this as a correct version information structure. Must be VERSION_INFORMATION_MAGIC */ int magic; /* Magic sequence to identify this as a correct version information structure. Must be VERSION_INFORMATION_MAGIC */
char versionversion; /* Must be 1 */ char versionversion; /* Must be 1 */
@ -118,7 +118,7 @@ struct version_information {
char buildtime[30]; /* string with the build time */ char buildtime[30]; /* string with the build time */
} __attribute__((packed)); } __attribute__((packed));
#define COMMON_AREA_MAGIC 0x43334d50 #define COMMON_AREA_MAGIC 0x43334d50 // "PM3C"
#define COMMON_AREA_COMMAND_NONE 0 #define COMMON_AREA_COMMAND_NONE 0
#define COMMON_AREA_COMMAND_ENTER_FLASH_MODE 1 #define COMMON_AREA_COMMAND_ENTER_FLASH_MODE 1
struct common_area { struct common_area {