@micolous changes

CHG: - Make all examples platform-specific
CHG: - Remove ModemManager rant on non-Linux platforms

Ref:  e2aa5eb47c
This commit is contained in:
iceman1001 2018-05-06 22:43:46 +02:00
parent 6b7819276d
commit 99d7546ca4
2 changed files with 4 additions and 3 deletions

View file

@ -91,11 +91,13 @@ static void usage(char *argv0) {
fprintf(stdout, "\nExample (Linux):\n\n\t %s /dev/ttyACM0 armsrc/obj/fullimage.elf\n", argv0);
fprintf(stdout, "\nExample (OSX :\n\n\t %s /dev/cu.usbmodem888 armsrc/obj/fullimage.elf\n", argv0);
fprintf(stdout, "\nExample (WIN) :\n\n\t %s com3 armsrc/obj/fullimage.elf\n\n", argv0);
#ifdef __linux__
fprintf(stdout, "\nNote (Linux): if the flasher gets stuck in 'Waiting for Proxmark to reappear on <DEVICE>',\n");
fprintf(stdout, " you need to blacklist proxmark 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");
fprintf(stdout, " https://github.com/Proxmark/proxmark3/wiki/OSX\n\n");
#endif
}
int main(int argc, char **argv) {

View file

@ -345,8 +345,7 @@ static void set_my_executable_path(void) {
static void show_help(bool showFullHelp, char *command_line){
PrintAndLogEx(NORMAL, "syntax: %s <port> [-h|-help|-m|-f|-flush|-w|-wait|-c|-command|-l|-lua] [cmd_script_file_name] [command][lua_script_name]\n", command_line);
PrintAndLogEx(NORMAL, "\tLinux example:'%s /dev/ttyACM0'\n", command_line);
PrintAndLogEx(NORMAL, "\tWindows example:'%s com3'\n\n", command_line);
PrintAndLogEx(NORMAL, "\texample:'%s "SERIAL_PORT_H"'\n\n", command_line);
if (showFullHelp){
PrintAndLogEx(NORMAL, "help: <-h|-help> Dump all interactive command's help at once.\n");