Output after regeneration.

davidflowers · davidflowers · commit d72014a95674 · 2021-06-03T11:16:05.000-04:00
diff --git a/dspic33ck-can/app.X/MyConfig.mc3 b/dspic33ck-can/app.X/MyConfig.mc3
@@ -16084,11 +16084,11 @@
       </entry>
       <entry>
          <file>mcc_generated_files\boot\remapped_reset.S</file>
-         <hash>c16a5fff56accb0bf4d3de05882eb49bbea60da6abcef22e1741c25f264061c3</hash>
+         <hash>05078d30a781e24fb5000164bd918b9849a6d4a4a5ad90202f1933c54301a0b0</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\boot\hardware_interrupt_table.S</file>
-         <hash>4ebd468028515960099634f17534a67b79c24bb63cb2d186e0928cc4da931be9</hash>
+         <hash>9e9153e7b090fa37b0f2bfe9e90bbbfdeb375ac7878d3cf46ba706494ed63aa4</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\boot\postBuild.bat</file>
@@ -16106,17 +16106,13 @@
          <file>mcc_generated_files\delay.c</file>
          <hash>4a6b8bbd5d2fbe5f20e79db8d915e50e2cd43920940679b40db90f3789cbccd5</hash>
       </entry>
-      <entry>
-         <file>mcc_generated_files\delay.h</file>
-         <hash>dda77102dba9adc0f9aef1c8c542cfee6d6cccc96446f4cd1bf07be2150a4d95</hash>
-      </entry>
       <entry>
          <file>mcc_generated_files\system.c</file>
-         <hash>f5a2f0061874e998b981dd6edfe77008f1534df012f06efdff95d0016f1651a8</hash>
+         <hash>16bd5cd68ef7767b90a238c59f9162dca3f08d4c3ee9f00870fae29421a63e01</hash>
       </entry>
       <entry>
-         <file>mcc_generated_files\boot\certificate_checksum16.S</file>
-         <hash>d161097e4172b9f3de8651d8dfd1b7450eeda2a36f430354f6b0677e3a7fa7ea</hash>
+         <file>mcc_generated_files\delay.h</file>
+         <hash>dda77102dba9adc0f9aef1c8c542cfee6d6cccc96446f4cd1bf07be2150a4d95</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\clock.h</file>
@@ -16128,32 +16124,36 @@
       </entry>
       <entry>
          <file>mcc_generated_files\boot\user_interrupt_table.S</file>
-         <hash>3c0e9be93da37b87d4009762bbb5ad96932e789ae97a8cfe1d2f51b06911c9b5</hash>
-      </entry>
-      <entry>
-         <file>mcc_generated_files\boot\interrupts.S</file>
-         <hash>8e1d1b3a3f4607aff05c7b18b7de0c8584dfe69e739840e854cd42ff336bfe79</hash>
+         <hash>61322b7c38116ff8980bfed24372484e416c112a0678302a412df802d3c863d0</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\mcc.c</file>
          <hash>5063e41499c0f63905ad7982135b6028c9d95b5248884e01961ca9382753d7db</hash>
       </entry>
+      <entry>
+         <file>mcc_generated_files\boot\interrupts.S</file>
+         <hash>0f82052f71c3c5761ab996c603c345505ea29f8e3b6ef8ef5f199d99f7cb7524</hash>
+      </entry>
       <entry>
          <file>mcc_generated_files\reset.h</file>
          <hash>5149540a892aca5df6c9bb53d04603f9b18e94a5c1653f9c699920d46889ca79</hash>
       </entry>
       <entry>
-         <file>mcc_generated_files\mcc.h</file>
-         <hash>d1e28069148129a071d8084c655dddb4fa4f23551889d38521f651274a4b8ff6</hash>
+         <file>mcc_generated_files\boot\application_header_checksum16.S</file>
+         <hash>70aabbd5889fb4e73060ff3e79bd58304204b07336c246f5394ee4840500f4c1</hash>
       </entry>
       <entry>
-         <file>mcc_generated_files\boot\postBuild.sh</file>
-         <hash>098e034ead0463cd9848de5afb459ba0f9f12dbe58809c81435246521c5e68f1</hash>
+         <file>mcc_generated_files\mcc.h</file>
+         <hash>8143548201e79eb5f6d12334959a3470c3b4bd647d8576032433c8b8c08effb8</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\reset.c</file>
          <hash>7dcd545e4f0bbb78e0dd44ceebca36bd75873807a5302302bec77bea5fc16e05</hash>
       </entry>
+      <entry>
+         <file>mcc_generated_files\boot\postBuild.sh</file>
+         <hash>098e034ead0463cd9848de5afb459ba0f9f12dbe58809c81435246521c5e68f1</hash>
+      </entry>
       <entry>
          <file>mcc_generated_files\clock.c</file>
          <hash>aed37dfcedda60f3e66684484125494a95884456c2a7026cfa327f3e3d717990</hash>
@@ -16168,15 +16168,15 @@
       </entry>
       <entry>
          <file>mcc_generated_files\boot\combineAppAndBootloaderHex.sh</file>
-         <hash>13e6e0a4b5784354b8b3ad08d16cb95826fed16d7eec046567b4accdcce9bcc3</hash>
+         <hash>5894ccf0fe60f99268ed53fb87ffcbc4cda41f28c72891c934a25ec4ec51359d</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\pin_manager.c</file>
          <hash>6757b4a1411952a65d51fc5bdee0acb7da0d05d1a04275926eb2ea4d1dd4765f</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\boot\boot_config.h</file>
-         <hash>7e63471a707c7c8d6b61b7982ec6f1d35fb0c34a73e3bac7e0d1052283e73c56</hash>
+         <hash>0f12877a6bf225005d7d395243adc72da5dea65c1f640a337990a1eab7bf26eb</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\traps.c</file>
@@ -16188,16 +16188,16 @@
       </entry>
       <entry>
          <file>mcc_generated_files\boot\memory_partition.S</file>
-         <hash>50f4afd8df929455b567746cdd6e3aa6c68909da4e408b808238b906b0db13e8</hash>
-      </entry>
-      <entry>
-         <file>mcc_generated_files\boot\combineAppAndBootloaderHex.bat</file>
-         <hash>13e6e0a4b5784354b8b3ad08d16cb95826fed16d7eec046567b4accdcce9bcc3</hash>
+         <hash>199b43cd9e4d24ac0ba8f9f377d499c8a1a6194f77e71c115b3036a146402195</hash>
       </entry>
       <entry>
          <file>mcc_generated_files\interrupt_manager.c</file>
          <hash>4b6369b051e4044ed8118d5249492400f12f125925d973cbfdae44a5acd57f17</hash>
       </entry>
+      <entry>
+         <file>mcc_generated_files\boot\combineAppAndBootloaderHex.bat</file>
+         <hash>5894ccf0fe60f99268ed53fb87ffcbc4cda41f28c72891c934a25ec4ec51359d</hash>
+      </entry>
       <entry>
          <file>mcc_generated_files\watchdog.h</file>
          <hash>384df8adb20de417a989a378d2dfd0c260ed296650f21c97fab792e7038a654c</hash>
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/application_header_checksum16.S b/dspic33ck-can/app.X/mcc_generated_files/boot/application_header_checksum16.S
@@ -5,15 +5,15 @@
     Microchip Technology Inc.
 
   @File Name: 
-    certificate_checksum16.S
+    application_header_checksum16.S
 
   @Summary:
-    This is the certificate_checksum16.S file generated using 16-bit Bootloader
+    This is the application_header_checksum16.S file generated using 16-bit Bootloader
 
   @Description:
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
-        Product Revision  :  16-bit Bootloader - 1.18.4-SNAPSHOT
+        Product Revision  :  16-bit Bootloader - 1.18.4
         Device            :  dsPIC33CK256MP508
     The generated drivers are tested against the following:
         Compiler          :  XC16 v1.36B
@@ -53,13 +53,13 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
     such restrictions will not apply to such third party software.
 */
 
-/* This file puts a certificate at the start of the application image that the
+/* This file puts an application header at the start of the application image that the
  * bootloader will use to verify the integrity of the application image.
  */
 
 #include "boot_config.h"
 
-//#error "A script to append verification checksum has been added to your project. You must add a call to it as a post-build step in your project properties. Delete this warning after you have done so."  
+#error "A script to append verification checksum has been added to your project. You must add a call to it as a post-build step in your project properties. Delete this warning after you have done so."  
 /*
 * Steps to append verification checksum to the project hex file:  
 * 1. Right click on your project, and click 'Properties'.
@@ -71,7 +71,7 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
 * 5. Delete or comment out the #error message above
 */
 
-    .section .certificate_checksum16, code, address(BOOT_CONFIG_APPLICATION_IMAGE_CERTIFICATE_ADDRESS), keep
+    .section .application_header_checksum16, code, address(BOOT_CONFIG_APPLICATION_IMAGE_APPLICATION_HEADER_ADDRESS), keep
     
     /* Skip the instruction that holds the Checksum - this will have to be injected
      * by a tool later, but we need to reserve the space for it. 
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/boot_config.h b/dspic33ck-can/app.X/mcc_generated_files/boot/boot_config.h
@@ -13,7 +13,7 @@
   @Description:
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
-        Product Revision  :  16-bit Bootloader - 1.18.4-SNAPSHOT
+        Product Revision  :  16-bit Bootloader - 1.18.4
         Device            :  dsPIC33CK256MP508
     The generated drivers are tested against the following:
         Compiler          :  XC16 v1.36B
@@ -58,11 +58,11 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
 #define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW 0x3000
 #define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_HIGH 0x2B7FE
 
-#define BOOT_CONFIG_VERIFICATION_CERTIFICATE_SIZE 10
+#define BOOT_CONFIG_VERIFICATION_APPLICATION_HEADER_SIZE 10
 
-#define BOOT_CONFIG_APPLICATION_IMAGE_CERTIFICATE_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW)
+#define BOOT_CONFIG_APPLICATION_IMAGE_APPLICATION_HEADER_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW)
 
-#define BOOT_CONFIG_APPLICATION_RESET_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW + BOOT_CONFIG_VERIFICATION_CERTIFICATE_SIZE)
+#define BOOT_CONFIG_APPLICATION_RESET_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW + BOOT_CONFIG_VERIFICATION_APPLICATION_HEADER_SIZE)
 
 #define BOOT_CONFIG_USER_IVT_TABLE_ADDRESS 0x3200
 
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/combineAppAndBootloaderHex.bat b/dspic33ck-can/app.X/mcc_generated_files/boot/combineAppAndBootloaderHex.bat
@@ -1 +1 @@
-hexmate r0-5FFF,..\..\..\..\boot\dist\default\production\boot.production.hex r6000-56FFF,..\..\dist\default\production\app.X.production.hex r57000-FFFFFFFF,..\..\..\..\boot\dist\default\production\boot.production.hex -O..\..\dist\default\production\combined.production.hex
+hexmate r0-5FFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex r6000-56FFF,..\..\dist\default\production\app.X.production.hex r57000-FFFFFFFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex -O..\..\dist\default\production\combined.production.hex
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/combineAppAndBootloaderHex.sh b/dspic33ck-can/app.X/mcc_generated_files/boot/combineAppAndBootloaderHex.sh
@@ -1 +1 @@
-hexmate r0-5FFF,..\..\..\..\boot\dist\default\production\boot.production.hex r6000-56FFF,..\..\dist\default\production\app.X.production.hex r57000-FFFFFFFF,..\..\..\..\boot\dist\default\production\boot.production.hex -O..\..\dist\default\production\combined.production.hex
+hexmate r0-5FFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex r6000-56FFF,..\..\dist\default\production\app.X.production.hex r57000-FFFFFFFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex -O..\..\dist\default\production\combined.production.hex
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/hardware_interrupt_table.S b/dspic33ck-can/app.X/mcc_generated_files/boot/hardware_interrupt_table.S
@@ -13,7 +13,7 @@
   @Description:
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
-        Product Revision  :  16-bit Bootloader - 1.18.4-SNAPSHOT
+        Product Revision  :  16-bit Bootloader - 1.18.4
         Device            :  dsPIC33CK256MP508
     The generated drivers are tested against the following:
         Compiler          :  XC16 v1.36B
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/interrupts.S b/dspic33ck-can/app.X/mcc_generated_files/boot/interrupts.S
@@ -13,7 +13,7 @@
   @Description:
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
-        Product Revision  :  16-bit Bootloader - 1.18.4-SNAPSHOT
+        Product Revision  :  16-bit Bootloader - 1.18.4
         Device            :  dsPIC33CK256MP508
     The generated drivers are tested against the following:
         Compiler          :  XC16 v1.36B
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/memory_partition.S b/dspic33ck-can/app.X/mcc_generated_files/boot/memory_partition.S
@@ -13,7 +13,7 @@
   @Description:
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
-        Product Revision  :  16-bit Bootloader - 1.18.4-SNAPSHOT
+        Product Revision  :  16-bit Bootloader - 1.18.4
         Device            :  dsPIC33CK256MP508
     The generated drivers are tested against the following:
         Compiler          :  XC16 v1.36B
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/remapped_reset.S b/dspic33ck-can/app.X/mcc_generated_files/boot/remapped_reset.S
@@ -13,7 +13,7 @@
   @Description:
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
-        Product Revision  :  16-bit Bootloader - 1.18.4-SNAPSHOT
+        Product Revision  :  16-bit Bootloader - 1.18.4
         Device            :  dsPIC33CK256MP508
     The generated drivers are tested against the following:
         Compiler          :  XC16 v1.36B
diff --git a/dspic33ck-can/app.X/mcc_generated_files/boot/user_interrupt_table.S b/dspic33ck-can/app.X/mcc_generated_files/boot/user_interrupt_table.S
@@ -13,7 +13,7 @@
   @Description:
     This header file provides implementations for driver APIs for all modules selected in the GUI.
     Generation Information :
-        Product Revision  :  16-bit Bootloader - 1.18.4-SNAPSHOT
+        Product Revision  :  16-bit Bootloader - 1.18.4
         Device            :  dsPIC33CK256MP508
     The generated drivers are tested against the following:
         Compiler          :  XC16 v1.36B
diff --git a/dspic33ck-can/app.X/mcc_generated_files/mcc.h b/dspic33ck-can/app.X/mcc_generated_files/mcc.h
@@ -53,11 +53,11 @@
 #include "system_types.h"
 #include "reset.h"
 
-#include "watchdog.h"
-#include "delay.h"
+#include "reset.h"
 #include "interrupt_manager.h"
 #include "traps.h"
-#include "reset.h"
+#include "watchdog.h"
+#include "delay.h"
 
 #warning "This file will be removed in future MCC releases. Use system.h instead."
 
diff --git a/dspic33ck-can/app.X/mcc_generated_files/system.c b/dspic33ck-can/app.X/mcc_generated_files/system.c
@@ -124,15 +124,15 @@
 #include "clock.h"
 #include "system.h"
 #include "system_types.h"
-#include "delay.h"
 #include "interrupt_manager.h"
 #include "traps.h"
+#include "delay.h"
 
 void SYSTEM_Initialize(void)
 {
     PIN_MANAGER_Initialize();
-    INTERRUPT_Initialize();
     CLOCK_Initialize();
+    INTERRUPT_Initialize();
     INTERRUPT_GlobalEnable();
     SYSTEM_CORCONModeOperatingSet(CORCON_MODE_PORVALUES);
 }
diff --git a/dspic33ck-can/app.X/nbproject/configurations.xml b/dspic33ck-can/app.X/nbproject/configurations.xml
@@ -35,13 +35,13 @@
                      projectFiles="true">
         <logicalFolder name="boot" displayName="boot" projectFiles="true">
           <itemPath>mcc_generated_files/boot/user_interrupt_table.S</itemPath>
-          <itemPath>mcc_generated_files/boot/certificate_checksum16.S</itemPath>
           <itemPath>mcc_generated_files/boot/memory_partition.S</itemPath>
           <itemPath>mcc_generated_files/boot/interrupts.S</itemPath>
           <itemPath>mcc_generated_files/boot/postBuild.sh</itemPath>
           <itemPath>mcc_generated_files/boot/combineAppAndBootloaderHex.sh</itemPath>
           <itemPath>mcc_generated_files/boot/hardware_interrupt_table.S</itemPath>
           <itemPath>mcc_generated_files/boot/remapped_reset.S</itemPath>
+          <itemPath>mcc_generated_files/boot/application_header_checksum16.S</itemPath>
         </logicalFolder>
         <logicalFolder name="docs" displayName="docs" projectFiles="true">
           <itemPath>mcc_generated_files/docs/delay.dox</itemPath>
@@ -107,6 +107,7 @@
       </compileType>
       <makeCustomizationType>
         <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
+        <makeUseCleanTarget>false</makeUseCleanTarget>
         <makeCustomizationPreStep></makeCustomizationPreStep>
         <makeCustomizationPostStepEnabled>true</makeCustomizationPostStepEnabled>
         <makeCustomizationPostStep>cd mcc_generated_files/boot &amp;&amp; postBuild.bat $(MP_CC_DIR)</makeCustomizationPostStep>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-hexmate r0-5FFF,..\..\..\..\boot\dist\default\production\boot.production.hex r6000-56FFF,..\..\dist\default\production\app.X.production.hex r57000-FFFFFFFF,..\..\..\..\boot\dist\default\production\boot.production.hex -O..\..\dist\default\production\combined.production.hex`
	`1`	`+hexmate r0-5FFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex r6000-56FFF,..\..\dist\default\production\app.X.production.hex r57000-FFFFFFFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex -O..\..\dist\default\production\combined.production.hex`