Merge pull request #3 from MicrochipTech/v2017_03_06

merging in the v2017_03_06 MLA release
MicrochipTech · Mar 14, 2017 · bde41c5 · bde41c5
2 parents 62fe6a5 + 53c65c7
commit bde41c5
Show file tree

Hide file tree

Showing 10 changed files with 1,447 additions and 21 deletions.
diff --git a/doc/help_mla_usb.jar b/doc/help_mla_usb.jar
diff --git a/doc/help_mla_usb.pdf b/doc/help_mla_usb.pdf
diff --git a/inc/usb_hal.h b/inc/usb_hal.h
@@ -43,6 +43,12 @@ please contact [email protected]
 	#else
             #include "usb_hal_pic24f.h"
 	#endif
+#elif defined(__XC32__)
+    #if defined(__PIC32MM__)
+        #include "usb_hal_pic32mm.h"
+    #else
+        #error "Silicon Platform not defined"
+    #endif
 #else
     #error "Silicon Platform not defined"
 #endif

diff --git a/inc/usb_hal_pic24f.h b/inc/usb_hal_pic24f.h
@@ -48,7 +48,7 @@ please contact [email protected]
 //IEC0-IEC7 on PIC24FJ128GC010 Family devices
 //IEC0-IEC7 on PIC24FJ128GB204 Family devices
 //IEC0-IEC7 on PIC24FJ256GB412 Family devices
-#if defined(__PIC24FJ64GB004__) || defined(__PIC24FJ32GB004__) || defined(__PIC24FJ32GB004__) || defined(__PIC24FJ32GB002__)    \
+#if defined(__PIC24FJ64GB004__) || defined(__PIC24FJ64GB002__) || defined(__PIC24FJ32GB004__) || defined(__PIC24FJ32GB002__)    \
     || defined(__PIC24FJ256GB110__) || defined(__PIC24FJ192GB110__) || defined(__PIC24FJ128GB110__) || defined(__PIC24FJ64GB110__) || defined(__PIC24FJ256GB108__) || defined(__PIC24FJ192GB108__) || defined(__PIC24FJ128GB108__) || defined(__PIC24FJ64GB108__)  || defined(__PIC24FJ256GB106__) || defined(__PIC24FJ192GB106__) || defined(__PIC24FJ128GB106__) || defined(__PIC24FJ64GB106__) 
 
     #define DEVICE_SPECIFIC_IEC_REGISTER_COUNT  6   //Number of IECx registers implemented in the microcontroller (varies from device to device, make sure this is set correctly for the intended CPU)