commandline: whitespace

2 files changed, 71 insertions, 59 deletions

diff --git a/commandline/examples/micronucleus.c b/commandline/examples/micronucleus.c
index c96df52..0f2000c 100644
--- a/commandline/examples/micronucleus.c
+++ b/commandline/examples/micronucleus.c
@@ -1,7 +1,7 @@
 /*
   Created: September 2012
   by ihsan Kehribar <ihsan@kehribar.me>
-  
+
   Permission is hereby granted, free of charge, to any person obtaining a copy of
   this software and associated documentation files (the "Software"), to deal in
   the Software without restriction, including without limitation the rights to
@@ -18,7 +18,7 @@
   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.  
+  SOFTWARE.
 */
 
 #include <stdio.h>
@@ -34,7 +34,7 @@
 #define CONNECT_WAIT 250 /* milliseconds to wait after detecting device on usb bus - probably excessive */
 
 /******************************************************************************
-* Global definitions 
+* Global definitions
 ******************************************************************************/
 unsigned char dataBuffer[65536 + 256];    /* buffer for file data */
 /*****************************************************************************/
@@ -54,7 +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 timeout = 0; // 
+static int timeout = 0;
 /*****************************************************************************/
 
 /******************************************************************************
@@ -64,7 +64,7 @@ int main(int argc, char **argv) {
   int res;
   char *file = NULL;
   micronucleus *my_device = NULL;
-  
+
   // parse arguments
   int run = 0;
   int file_type = FILE_TYPE_INTEL_HEX;
@@ -80,7 +80,7 @@ int main(int argc, char **argv) {
   //#else
     use_ansi = 1;
   //#endif
-  
+
   while (arg_pointer < argc) {
     if (strcmp(argv[arg_pointer], "--run") == 0) {
       run = 1;
@@ -128,41 +128,41 @@ int main(int argc, char **argv) {
     } else {
       file = argv[arg_pointer];
     }
-    
+
     arg_pointer += 1;
   }
-  
+
   if (argc < 2) {
     puts(usage);
     return EXIT_FAILURE;
   }
-  
+
   setProgressData("waiting", 1);
   if (dump_progress) printProgress(0.5);
   printf("> Please plug in the device ... \n");
   printf("> Press CTRL+C to terminate the program.\n");
-  
-  
+
+
   time_t start_time, current_time;
   time(&start_time);
-  
+
   while (my_device == NULL) {
     delay(100);
     my_device = micronucleus_connect();
-    
+
     time(&current_time);
     if (timeout && start_time + timeout < current_time) {
       break;
     }
   }
-  
+
   if (my_device == NULL) {
     printf("> Device search timed out\n");
     return EXIT_FAILURE;
   }
-  
+
   printf("> Device is found!\n");
-  
+
   // wait for CONNECT_WAIT milliseconds with progress output
   float wait = 0.0f;
   setProgressData("connecting", 2);
@@ -171,10 +171,10 @@ int main(int argc, char **argv) {
     wait += 50.0f;
     delay(50);
   }
-  
+
   //my_device = micronucleus_connect();
   printProgress(1.0);
-    
+
   // if (my_device->page_size == 64) {
   //   printf("> Device looks like ATtiny85!\n");
   // } else if (my_device->page_size == 32)  {
@@ -183,12 +183,12 @@ int main(int argc, char **argv) {
   //   printf("> Unsupported device!\n");
   //   return EXIT_FAILURE;
   // }
-  
+
   printf("> Available space for user application: %d bytes\n", my_device->flash_size);
   printf("> Suggested sleep time between sending pages: %ums\n", my_device->write_sleep);
   printf("> Whole page count: %d\n", my_device->pages);
   printf("> Erase function sleep duration: %dms\n", my_device->erase_sleep);
-  
+
   int startAddress = 1, endAddress = 0;
 
   if (!erase_only)
@@ -196,7 +196,7 @@ int main(int argc, char **argv) {
     setProgressData("parsing", 3);
     printProgress(0.0);
     memset(dataBuffer, 0xFF, sizeof(dataBuffer));
-    
+
     if (file_type == FILE_TYPE_INTEL_HEX) {
       if (parseIntelHex(file, dataBuffer, &startAddress, &endAddress)) {
         printf("> Error loading or parsing hex file.\n");
@@ -208,52 +208,64 @@ int main(int argc, char **argv) {
         return EXIT_FAILURE;
       }
     }
-    
+
     printProgress(1.0);
 
     if (startAddress >= endAddress) {
       printf("> No data in input file, exiting.\n");
       return EXIT_FAILURE;
     }
-          
+
     if (endAddress > my_device->flash_size) {
       printf("> Program file is %d bytes too big for the bootloader!\n", endAddress - my_device->flash_size);
       return EXIT_FAILURE;
     }
-  } 
-  
+  }
+
+  printProgress(1.0);
+
+  if (startAddress >= endAddress) {
+    printf("> No data in input file, exiting.\n");
+    return EXIT_FAILURE;
+  }
+
+  if (endAddress > my_device->flash_size) {
+    printf("> Program file is %d bytes too big for the bootloader!\n", endAddress - my_device->flash_size);
+    return EXIT_FAILURE;
+  }
+
   setProgressData("erasing", 4);
   printf("> Erasing the memory ...\n");
   res = micronucleus_eraseFlash(my_device, printProgress);
-  
+
   if (res == 1) { // erase disconnection bug workaround
     printf(">> Eep! Connection to device lost during erase! Not to worry\n");
     printf(">> This happens on some computers - reconnecting...\n");
     my_device = NULL;
-    
+
     delay(CONNECT_WAIT);
-    
+
     int deciseconds_till_reconnect_notice = 50; // notice after 5 seconds
     while (my_device == NULL) {
       delay(100);
       my_device = micronucleus_connect();
       deciseconds_till_reconnect_notice -= 1;
-      
+
       if (deciseconds_till_reconnect_notice == 0) {
         printf(">> (!) Automatic reconnection not working. Unplug and reconnect\n");
         printf("   device usb connector, or reset it some other way to continue.\n");
       }
     }
-    
+
     printf(">> Reconnected! Continuing upload sequence...\n");
-    
+
   } else if (res != 0) {
     printf(">> Flash erase error %d has occured ...\n", res);
     printf(">> Please unplug the device and restart the program.\n");
     return EXIT_FAILURE;
   }
   printProgress(1.0);
-  
+
   if (!erase_only)
   {
     printf("> Starting to upload ...\n");
@@ -265,26 +277,26 @@ int main(int argc, char **argv) {
       return EXIT_FAILURE;
     }
   }
-  
+
   if (run) {
-    
+
     printf("> Starting the user app ...\n");
     setProgressData("running", 6);
     printProgress(0.0);
-    
+
     res = micronucleus_startApp(my_device);
-    
+
     if (res != 0) {
       printf(">> Run error %d has occured ...\n", res);
       printf(">> Please unplug the device and restart the program. \n");
       return EXIT_FAILURE;
     }
-    
+
     printProgress(1.0);
   }
-  
+
   printf(">> Micronucleus done. Thank you!\n");
-  
+
   return EXIT_SUCCESS;
 }
 /******************************************************************************/
@@ -293,7 +305,7 @@ int main(int argc, char **argv) {
 static void printProgress(float progress) {
   static int last_step;
   static int last_integer_total_progress;
-  
+
   if (dump_progress) {
     printf("{status:\"%s\",step:%d,steps:%d,progress:%f}\n", progress_friendly_name, progress_step, progress_total_steps, progress);
   } else {
@@ -304,17 +316,17 @@ static void printProgress(float progress) {
         printf("\r"); // return carriage to start of line so we can type over existing text
       #endif
     }
-    
+
     float total_progress = ((float) progress_step - 1.0f) / (float) progress_total_steps;
     total_progress += progress / (float) progress_total_steps;
     int integer_total_progress = total_progress * 100.0f;
-    
+
     if (use_ansi || integer_total_progress >= last_integer_total_progress + 5) {
       printf("%s: %d%% complete\n", progress_friendly_name, integer_total_progress);
       last_integer_total_progress = integer_total_progress;
     }
   }
-  
+
   last_step = progress_step;
 }
 
@@ -327,11 +339,11 @@ static void setProgressData(char* friendly, int step) {
 /******************************************************************************/
 static int parseUntilColon(FILE *file_pointer) {
   int character;
-  
+
   do {
     character = getc(file_pointer);
   } while(character != ':' && character != EOF);
-  
+
   return character;
 }
 /******************************************************************************/
@@ -345,7 +357,7 @@ static int parseHex(FILE *file_pointer, int num_digits) {
     temp[iter] = getc(file_pointer);
   }
   temp[iter] = 0;
-  
+
   return strtol(temp, NULL, 16);
 }
 /******************************************************************************/
@@ -354,13 +366,13 @@ static int parseHex(FILE *file_pointer, int num_digits) {
 static int parseIntelHex(char *hexfile, unsigned char *buffer, int *startAddr, int *endAddr) {
   int address, base, d, segment, i, lineLen, sum;
   FILE *input;
-  
+
   input = strcmp(hexfile, "-") == 0 ? stdin : fopen(hexfile, "r");
   if (input == NULL) {
     printf("> Error opening %s: %s\n", hexfile, strerror(errno));
     return 1;
   }
-  
+
   while (parseUntilColon(input) == ':') {
     sum = 0;
     sum += lineLen = parseHex(input, 2);
@@ -371,18 +383,18 @@ static int parseIntelHex(char *hexfile, unsigned char *buffer, int *startAddr, i
     if (segment != 0) {   /* ignore lines where this byte is not 0 */
       continue;
     }
-    
+
     for (i = 0; i < lineLen; i++) {
       d = parseHex(input, 2);
       buffer[address++] = d;
       sum += d;
     }
-    
+
     sum += parseHex(input, 2);
     if ((sum & 0xff) != 0) {
       printf("> Warning: Checksum error between address 0x%x and 0x%x\n", base, address);
     }
-    
+
     if(*startAddr > base) {
       *startAddr = base;
     }
@@ -390,7 +402,7 @@ static int parseIntelHex(char *hexfile, unsigned char *buffer, int *startAddr, i
       *endAddr = address;
     }
   }
-  
+
   fclose(input);
   return 0;
 }
@@ -399,28 +411,28 @@ static int parseIntelHex(char *hexfile, unsigned char *buffer, int *startAddr, i
 /******************************************************************************/
 static int parseRaw(char *filename, unsigned char *data_buffer, int *start_address, int *end_address) {
   FILE *input;
-  
+
   input = strcmp(filename, "-") == 0 ? stdin : fopen(filename, "r");
-  
+
   if (input == NULL) {
     printf("> Error reading %s: %s\n", filename, strerror(errno));
     return 1;
   }
-  
+
   *start_address = 0;
   *end_address = 0;
-  
+
   // read in bytes from file
   int byte = 0;
   while (1) {
     byte = getc(input);
     if (byte == EOF) break;
-    
+
     *data_buffer = byte;
     data_buffer += 1;
     *end_address += 1;
   }
-  
+
   fclose(input);
   return 0;
 }
diff --git a/commandline/library/micronucleus_lib.c b/commandline/library/micronucleus_lib.c
index 9b73d46..b9bceb2 100644
--- a/commandline/library/micronucleus_lib.c
+++ b/commandline/library/micronucleus_lib.c
@@ -151,7 +151,7 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
 
     // give microcontroller enough time to write this page and come back online
     delay(deviceHandle->write_sleep);
-    
+
     if (res != page_length) return -1;
   }