Merge pull request #27 from embedded-creations/simplefixes2

a couple fixes

2 files changed, 27 insertions, 27 deletions

diff --git a/commandline/library/micronucleus_lib.c b/commandline/library/micronucleus_lib.c
index 9efbc3d..4317af5 100644
--- a/commandline/library/micronucleus_lib.c
+++ b/commandline/library/micronucleus_lib.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.
 */
 
 /***************************************************************/
@@ -30,38 +30,38 @@
 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->version.major = (dev->descriptor.bcdDevice >> 8) & 0xFF;
+        nucleus->version.minor = dev->descriptor.bcdDevice & 0xFF;
+
         if (nucleus->version.major > MICRONUCLEUS_MAX_MAJOR_VERSION) {
 	        fprintf(stderr, "Warning: device with unknown new version of Micronucleus detected.\n");
 	        fprintf(stderr, "This tool doesn't know how to upload to this new device. Updates may be available.\n");
 	        fprintf(stderr, "Device reports version as: %d.%d\n", nucleus->version.major, nucleus->version.minor);
 	        return NULL;
         }
-        
+
         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);
@@ -78,17 +78,17 @@ micronucleus* micronucleus_connect() {
 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;
   }
-  
+
   /* Under Linux, the erase process is often aborted with errors such as:
    usbfs: USBDEVFS_CONTROL failed cmd micronucleus rqt 192 rq 2 len 0 ret -84
    This seems to be because the erase is taking long enough that the device
@@ -96,7 +96,7 @@ int micronucleus_eraseFlash(micronucleus* deviceHandle, micronucleus_callback pr
    and automatically reconnects prior to uploading the program.  To get the
    the same functionality, we must flag this state (the "-84" error result) by
    converting the return to -2 for the upper layer.
-   
+
    On Mac OS a common error is -34 = epipe, but adding it to this list causes:
    Assertion failed: (res >= 4), function micronucleus_connect, file library/micronucleus_lib.c, line 63.
   */
@@ -105,7 +105,7 @@ int micronucleus_eraseFlash(micronucleus* deviceHandle, micronucleus_callback pr
       usb_close(deviceHandle->device);
       deviceHandle->device = NULL;
     }
-    
+
     return 1; // recoverable errors
   } else {
     return res;
@@ -125,7 +125,7 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
         && 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) {
@@ -134,7 +134,7 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
         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,
@@ -142,29 +142,29 @@ int micronucleus_writeFlash(micronucleus* deviceHandle, unsigned int program_siz
            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)  
+
+  if(res!=0)
     return -1;
-  else 
+  else
     return 0;
 }
 
diff --git a/firmware/main.c b/firmware/main.c
index 6e39cfa..e56de62 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -70,7 +70,7 @@ static void leaveBootloader() __attribute__((__noreturn__));
 //////// Stuff Bluebie Added
 // postscript are the few bytes at the end of programmable memory which store tinyVectors
 // and used to in USBaspLoader-tiny85 store the checksum iirc
-#define POSTSCRIPT_SIZE 4
+#define POSTSCRIPT_SIZE 6
 #define PROGMEM_SIZE (BOOTLOADER_ADDRESS - POSTSCRIPT_SIZE) /* max size of user program */
 
 // verify the bootloader address aligns with page size