Added percentage progress to CLI upload tool and worked on consistent style throughout commandline c code (all variables underscore_cased, all functions lowerCamelCased).

1 files changed, 124 insertions, 118 deletions

diff --git a/commandline/library/micronucleus_lib.c b/commandline/library/micronucleus_lib.c
index a719690..2e63425 100644
--- a/commandline/library/micronucleus_lib.c
+++ b/commandline/library/micronucleus_lib.c
@@ -1,24 +1,24 @@
 /*
-	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
-	use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-	of the Software, and to permit persons to whom the Software is furnished to do
-	so, subject to the following conditions:
+  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
+  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+  of the Software, and to permit persons to whom the Software is furnished to do
+  so, subject to the following conditions:
 
-	The above copyright notice and this permission notice shall be included in all
-	copies or substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
 
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	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.	
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  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.  
 */
 
 /***************************************************************/
@@ -27,114 +27,120 @@
 #include "micronucleus_lib.h"
 #include "littleWire_util.h"
 
-micronucleus* micronucleus_connect()
-{
-	micronucleus *nucleus = NULL;
-	struct usb_bus *busses;
-	
-	// intialise usb and find micronucleus device
-	usb_init();
-	usb_find_busses();
-	usb_find_devices();
-	
-	busses = usb_get_busses();
-	struct usb_bus *bus;
-	for (bus = busses; bus; bus = bus->next)
-	{
-		struct usb_device *dev;
-		
-		for (dev = bus->devices; dev; dev = dev->next)
-		{
-			/* Check if this device is a micronucleus */
-			if (dev->descriptor.idVendor == MICRONUCLEUS_VENDOR_ID && dev->descriptor.idProduct == MICRONUCLEUS_PRODUCT_ID)
-			{
-				nucleus = malloc(sizeof(micronucleus));
-				nucleus->version.major = (dev->descriptor.bcdUSB >> 8) & 0xFF;
-				nucleus->version.minor = dev->descriptor.bcdUSB & 0xFF;
-				nucleus->device = usb_open(dev);
-				
-				// get nucleus info
-				unsigned char buffer[4];
-				int res = usb_control_msg(nucleus->device, 0xC0, 0, 0, 0, buffer, 4, MICRONUCLEUS_USB_TIMEOUT);
-				assert(res == 4);
-				
-				nucleus->flash_size = (buffer[0]<<8) + buffer[1];
-				nucleus->page_size = buffer[2];
-				nucleus->pages = (nucleus->flash_size / nucleus->page_size);
-				if (nucleus->pages * nucleus->page_size < nucleus->flash_size) nucleus->pages += 1;
-				nucleus->write_sleep = buffer[3];
-				nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages;
-			}
-		}
-	}
+micronucleus* micronucleus_connect() {
+  micronucleus *nucleus = NULL;
+  struct usb_bus *busses;
+  
+  // intialise usb and find micronucleus device
+  usb_init();
+  usb_find_busses();
+  usb_find_devices();
+  
+  busses = usb_get_busses();
+  struct usb_bus *bus;
+  for (bus = busses; bus; bus = bus->next) {
+    struct usb_device *dev;
+    
+    for (dev = bus->devices; dev; dev = dev->next) {
+      /* Check if this device is a micronucleus */
+      if (dev->descriptor.idVendor == MICRONUCLEUS_VENDOR_ID && dev->descriptor.idProduct == MICRONUCLEUS_PRODUCT_ID)  {
+        nucleus = malloc(sizeof(micronucleus));
+        nucleus->version.major = (dev->descriptor.bcdUSB >> 8) & 0xFF;
+        nucleus->version.minor = dev->descriptor.bcdUSB & 0xFF;
+        nucleus->device = usb_open(dev);
+        
+        // get nucleus info
+        unsigned char buffer[4];
+        int res = usb_control_msg(nucleus->device, 0xC0, 0, 0, 0, buffer, 4, MICRONUCLEUS_USB_TIMEOUT);
+        assert(res == 4);
+        
+        nucleus->flash_size = (buffer[0]<<8) + buffer[1];
+        nucleus->page_size = buffer[2];
+        nucleus->pages = (nucleus->flash_size / nucleus->page_size);
+        if (nucleus->pages * nucleus->page_size < nucleus->flash_size) nucleus->pages += 1;
+        nucleus->write_sleep = buffer[3];
+        nucleus->erase_sleep = nucleus->write_sleep * nucleus->pages;
+      }
+    }
+  }
 
-	return nucleus;
+  return nucleus;
 }
 
-int micronucleus_eraseFlash(micronucleus* deviceHandle)
-{
-	int res;
-	res = usb_control_msg(deviceHandle->device, 0xC0, 2, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
-	
-	// give microcontroller enough time to erase all writable pages and come back online
-	delay(deviceHandle->erase_sleep);
-	
-	if(res!=0)	
-		return -1;
-	else 
-		return 0;
+int micronucleus_eraseFlash(micronucleus* deviceHandle, micronucleus_callback progress) {
+  int res;
+  res = usb_control_msg(deviceHandle->device, 0xC0, 2, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
+  
+  // give microcontroller enough time to erase all writable pages and come back online
+  float i = 0;
+  while (i < 1.0) {
+    // update progress callback if one was supplied
+    if (progress) progress(i);
+    
+    delay(((float) deviceHandle->erase_sleep) / 100.0f);
+    i += 0.01;
+  }
+  
+  if(res!=0)
+    return -1;
+  else
+    return 0;
 }
 
-int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_size, unsigned char* program)
-{
-	unsigned char page_length = deviceHandle->page_size;
-	unsigned char page_buffer[page_length];
-	unsigned int  address; // overall flash memory address
-	unsigned int  page_address; // address within this page when copying buffer
-	unsigned int  res;
+int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_size, unsigned char* program, micronucleus_callback prog) {
+  unsigned char page_length = deviceHandle->page_size;
+  unsigned char page_buffer[page_length];
+  unsigned int  address; // overall flash memory address
+  unsigned int  page_address; // address within this page when copying buffer
+  unsigned int  res;
 
-	for (address = 0; address < deviceHandle->flash_size; address += deviceHandle->page_size) {
-		// work around a bug in older bootloader versions
-		if (deviceHandle->version.major == 1 && deviceHandle->version.minor <= 2
-				&& address / deviceHandle->page_size == deviceHandle->pages - 1) {
-			page_length = deviceHandle->flash_size % deviceHandle->page_size;
-		}
-		
-		// copy in bytes from user program
-		for (page_address = 0; page_address < page_length; page_address += 1) {
-			if (address + page_address > program_size) {
-				page_buffer[page_address] = 0xFF; // pad out remainder with unprogrammed bytes
-			} else {
-				page_buffer[page_address] = program[address + page_address]; // load from user program
-			}
-		}
-		
-		// ask microcontroller to write this page's data
-		res = usb_control_msg(deviceHandle->device,
-					 USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-					 1,
-					 page_length, address,
-					 page_buffer, page_length,
-					 MICRONUCLEUS_USB_TIMEOUT);
-		
-		// give microcontroller enough time to write this page and come back online
-		delay(deviceHandle->write_sleep);
-		
-		if (res != 64) return -1;
-	}
-	
-	return 0;
+  for (address = 0; address < deviceHandle->flash_size; address += deviceHandle->page_size) {
+    // work around a bug in older bootloader versions
+    if (deviceHandle->version.major == 1 && deviceHandle->version.minor <= 2
+        && address / deviceHandle->page_size == deviceHandle->pages - 1) {
+      page_length = deviceHandle->flash_size % deviceHandle->page_size;
+    }
+    
+    // copy in bytes from user program
+    for (page_address = 0; page_address < page_length; page_address += 1) {
+      if (address + page_address > program_size) {
+        page_buffer[page_address] = 0xFF; // pad out remainder with unprogrammed bytes
+      } else {
+        page_buffer[page_address] = program[address + page_address]; // load from user program
+      }
+    }
+    
+    // ask microcontroller to write this page's data
+    res = usb_control_msg(deviceHandle->device,
+           USB_ENDPOINT_OUT| USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+           1,
+           page_length, address,
+           page_buffer, page_length,
+           MICRONUCLEUS_USB_TIMEOUT);
+    
+    // call progress update callback if that's a thing
+    if (prog) prog(((float) address) / ((float) deviceHandle->flash_size));
+    
+    // give microcontroller enough time to write this page and come back online
+    delay(deviceHandle->write_sleep);
+    
+    if (res != 64) return -1;
+  }
+  
+  // call progress update callback with completion status
+  if (prog) prog(1.0);
+  
+  return 0;
 }
 
-int micronucleus_startApp(micronucleus* deviceHandle)
-{
-	int res;
-	res = usb_control_msg(deviceHandle->device, 0xC0, 4, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
-	
-	if(res!=0)	
-		return -1;
-	else 
-		return 0;
+int micronucleus_startApp(micronucleus* deviceHandle) {
+  int res;
+  res = usb_control_msg(deviceHandle->device, 0xC0, 4, 0, 0, NULL, 0, MICRONUCLEUS_USB_TIMEOUT);
+  
+  if(res!=0)  
+    return -1;
+  else 
+    return 0;
 }