dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'better_color_handling'

Browse Source 
* better_color_handling:
  Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
  Use PrintAndLogEx in flasher
  Simplify color & banner logic
  Smart color handling:
This commit is contained in:
Philippe Teuwen
2019-04-30 21:37:19 +02:00
parent 27f7057961 a5d05e8d42
commit 63cd4a9fbb
20 changed files with 241 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
client/flasher.c
View File

@@ -17,34 +17,20 @@
#include "flash.h"
#include "comms.h"
#include "pm3_cmd.h"
#include "ui.h"
#define MAX_FILES 4
void cmd_debug(PacketCommandOLD *c) {
// Debug
printf("PacketCommandOLD length[len=%zu]\n", sizeof(PacketCommandOLD));
printf(" cmd[len=%zu]: %016" PRIx64"\n", sizeof(c->cmd), c->cmd);
printf(" arg0[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[0]), c->arg[0]);
printf(" arg1[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[1]), c->arg[1]);
printf(" arg2[len=%zu]: %016" PRIx64"\n", sizeof(c->arg[2]), c->arg[2]);
printf(" data[len=%zu]: ", sizeof(c->d.asBytes));
for (size_t i = 0; i < 16; i++)
printf("%02x", c->d.asBytes[i]);
printf("...\n");
}
static void usage(char *argv0) {
fprintf(stdout, "Usage: %s <port> [-b] image.elf [image.elf...]\n\n", argv0);
fprintf(stdout, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n\n");
fprintf(stdout, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf\n", argv0);
PrintAndLogEx(NORMAL, "Usage: %s <port> [-b] image.elf [image.elf...]\n", argv0);
PrintAndLogEx(NORMAL, "\t-b\tEnable flashing of bootloader area (DANGEROUS)\n");
PrintAndLogEx(NORMAL, "\nExample:\n\n\t %s "SERIAL_PORT_H" armsrc/obj/fullimage.elf", argv0);
#ifdef __linux__
fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',\n");
fprintf(stdout, " you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n\n");
fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n\n");
fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n\n");
fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
PrintAndLogEx(NORMAL, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark3 to reappear on <DEVICE>',");
PrintAndLogEx(NORMAL, " you need to blacklist Proxmark3 for modem-manager - see wiki for more details:\n");
PrintAndLogEx(NORMAL, " https://github.com/Proxmark/proxmark3/wiki/Gentoo Linux\n");
PrintAndLogEx(NORMAL, " https://github.com/Proxmark/proxmark3/wiki/Ubuntu Linux\n");
PrintAndLogEx(NORMAL, " https://github.com/Proxmark/proxmark3/wiki/OSX\n");
#endif
}
@@ -56,6 +42,14 @@ int main(int argc, char **argv) {
memset(files, 0, sizeof(files));
session.supports_colors = false;
session.stdinOnTTY = isatty(STDIN_FILENO);
session.stdoutOnTTY = isatty(STDOUT_FILENO);
#if defined(__linux__) || (__APPLE__)
if (session.stdinOnTTY && session.stdoutOnTTY)
session.supports_colors = true;
#endif
if (argc < 3) {
usage(argv[0]);
return -1;
@@ -74,7 +68,7 @@ int main(int argc, char **argv) {
if (res < 0)
return -1;
fprintf(stderr, "\n");
PrintAndLogEx(NORMAL, "");
num_files++;
}
}
@@ -82,27 +76,27 @@ int main(int argc, char **argv) {
char *serial_port_name = argv[1];
if (!OpenProxmark(serial_port_name, true, 60, true, FLASHMODE_SPEED)) {
fprintf(stderr, "Could not find Proxmark3 on " _RED_("%s") ".\n\n", serial_port_name);
PrintAndLogEx(ERR, "Could not find Proxmark3 on " _RED_("%s") ".\n", serial_port_name);
return -1;
} else {
fprintf(stderr, _GREEN_("Found") "\n");
PrintAndLogEx(NORMAL, _GREEN_("Found"));
}
res = flash_start_flashing(can_write_bl, serial_port_name);
if (res < 0)
return -1;
fprintf(stdout, "\n" _BLUE_("Flashing...")"\n");
PrintAndLogEx(NORMAL, "\n" _BLUE_("Flashing..."));
for (int i = 0; i < num_files; i++) {
res = flash_write(&files[i]);
if (res < 0)
return -1;
flash_free(&files[i]);
fprintf(stdout, "\n");
PrintAndLogEx(NORMAL, "\n");
}
fprintf(stdout, _BLUE_("Resetting hardware...") "\n");
PrintAndLogEx(NORMAL, _BLUE_("Resetting hardware..."));
res = flash_stop_flashing();
if (res < 0)
@@ -110,6 +104,6 @@ int main(int argc, char **argv) {
CloseProxmark();
fprintf(stdout, _BLUE_("All done.") "\n\nHave a nice day!\n");
PrintAndLogEx(NORMAL, _BLUE_("All done.") "\n\nHave a nice day!");
return 0;
}