diff options
Diffstat (limited to 'commandline/micronucleus.c')
| -rw-r--r-- | commandline/micronucleus.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/commandline/micronucleus.c b/commandline/micronucleus.c index b7d49ab..4ef829a 100644 --- a/commandline/micronucleus.c +++ b/commandline/micronucleus.c @@ -54,6 +54,7 @@ static char* progress_friendly_name; // name of progress section static int dump_progress = 0; // output computer friendly progress info static int use_ansi = 0; // output ansi control character stuff static int erase_only = 0; // only erase, dont't write file +static int fast_mode = 0; // normal mode adds 2ms to page writing times and waits longer for connect. static int timeout = 0; /*****************************************************************************/ @@ -69,11 +70,12 @@ int main(int argc, char **argv) { int run = 0; int file_type = FILE_TYPE_INTEL_HEX; int arg_pointer = 1; - char* usage = "usage: micronucleus [--run] [--dump-progress] [--type intel-hex|raw] [--no-ansi] [--timeout integer] [--erase-only] filename"; + char* usage = "usage: micronucleus [--run] [--dump-progress] [--fast-mode] [--type intel-hex|raw] [--no-ansi] [--timeout integer] [--erase-only] filename"; progress_step = 0; progress_total_steps = 5; // steps: waiting, connecting, parsing, erasing, writing, (running)? dump_progress = 0; erase_only = 0; + fast_mode=0; timeout = 0; // no timeout by default //#if defined(WIN) // use_ansi = 0; @@ -104,6 +106,8 @@ int main(int argc, char **argv) { puts(" for driving GUIs"); puts(" --erase-only: Erase the device without programming. Fills the"); puts(" program memory with 0xFFFF. Any files are ignored."); + puts(" --fast-mode: Speed up the timing of micronucleus. Do not use if"); + puts(" you encounter USB errors. "); puts(" --run: Ask bootloader to run the program when finished"); puts(" uploading provided program"); //#ifndef WIN @@ -112,11 +116,15 @@ int main(int argc, char **argv) { puts(" --timeout [integer]: Timeout after waiting specified number of seconds"); puts(" filename: Path to intel hex or raw data file to upload,"); puts(" or \"-\" to read from stdin"); + puts(""); + puts(MICRONUCLEUS_COMMANDLINE_VERSION); return EXIT_SUCCESS; } else if (strcmp(argv[arg_pointer], "--dump-progress") == 0) { dump_progress = 1; } else if (strcmp(argv[arg_pointer], "--no-ansi") == 0) { use_ansi = 0; + } else if (strcmp(argv[arg_pointer], "--fast-mode") == 0) { + fast_mode = 1; } else if (strcmp(argv[arg_pointer], "--erase-only") == 0) { erase_only = 1; progress_total_steps -= 1; @@ -149,7 +157,7 @@ int main(int argc, char **argv) { while (my_device == NULL) { delay(100); - my_device = micronucleus_connect(); + my_device = micronucleus_connect(fast_mode); time(¤t_time); if (timeout && start_time + timeout < current_time) { @@ -164,17 +172,18 @@ int main(int argc, char **argv) { printf("> Device is found!\n"); - // wait for CONNECT_WAIT milliseconds with progress output - float wait = 0.0f; - setProgressData("connecting", 2); - while (wait < CONNECT_WAIT) { - printProgress((wait / ((float) CONNECT_WAIT)) * 0.9f); - wait += 50.0f; - delay(50); + if (!fast_mode) { + // wait for CONNECT_WAIT milliseconds with progress output + float wait = 0.0f; + setProgressData("connecting", 2); + while (wait < CONNECT_WAIT) { + printProgress((wait / ((float) CONNECT_WAIT)) * 0.9f); + wait += 50.0f; + delay(50); + } } - - //my_device = micronucleus_connect(); printProgress(1.0); + //my_device = micronucleus_connect(); // if (my_device->page_size == 64) { // printf("> Device looks like ATtiny85!\n"); @@ -239,7 +248,7 @@ int main(int argc, char **argv) { int deciseconds_till_reconnect_notice = 50; // notice after 5 seconds while (my_device == NULL) { delay(100); - my_device = micronucleus_connect(); + my_device = micronucleus_connect(fast_mode); deciseconds_till_reconnect_notice -= 1; if (deciseconds_till_reconnect_notice == 0) { |