Skip to content

Commit 2dd0360

Browse files
davidflowersdavidflowers
committed
Pull request #10: Bugfix/CC16BOOT-1237 issues report on can demo
Merge in MCU16CE/pic24-dspic-can-canfd-bootloader from ~C12109/pic24-dspic-can-canfd-bootloader:bugfix/CC16BOOT-1237-issues-report-on-can-demo to develop * commit 'ebedac1e40d7eb5a3f6fbb83246bc1610b834f73': 1.18.5-SNAPSHOT bootloader (internal snapshot) -> 1.18.4 (publicly released) Update to use the released version of the bootloader rather than an internal build. Removing newly generated error that is already fixed. file actually generated from 1.18.4 including white space differences. forcing a difference so we can check in the whitespace difference. Output after regeneration. Update to use public released version instead of internal build version of bootloader library module. Correct path to the bootloader project.
2 parents 19fa5aa + ebedac1 commit 2dd0360

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+10203
-10241
lines changed

‎dspic33ck-can/app.X/MyConfig.mc3‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@
88
<string>Main Manager</string>
99
<string>class com.microchip.mcc.mcu16.mainManager.MainManager</string>
1010
</entry>
11-
<entry>
12-
<string>WATCHDOG</string>
13-
<string>class com.microchip.mcc.mcu16.systemManager.wdt.Wdt</string>
14-
</entry>
1511
<entry>
1612
<string>Pin Module</string>
1713
<string>class com.microchip.mcc.mcu16.pinManager.PinManager</string>
1814
</entry>
1915
<entry>
20-
<string>DMT</string>
21-
<string>class com.microchip.mcc.mcu16.systemManager.dmt.DMT</string>
16+
<string>WATCHDOG</string>
17+
<string>class com.microchip.mcc.mcu16.systemManager.wdt.Wdt</string>
2218
</entry>
2319
<entry>
24-
<string>ICD</string>
25-
<string>class com.microchip.mcc.mcu16.systemManager.icd.Icd</string>
20+
<string>DMT</string>
21+
<string>class com.microchip.mcc.mcu16.systemManager.dmt.DMT</string>
2622
</entry>
2723
<entry>
2824
<string>RESET</string>
2925
<string>class com.microchip.mcc.mcu16.systemManager.reset.RESET</string>
3026
</entry>
27+
<entry>
28+
<string>ICD</string>
29+
<string>class com.microchip.mcc.mcu16.systemManager.icd.Icd</string>
30+
</entry>
3131
<entry>
3232
<string>Interrupt Module</string>
3333
<string>class com.microchip.mcc.mcu16.interruptManager_dsPIC.InterruptManager_dsPIC</string>
@@ -55,9 +55,9 @@
5555
</usedClasses>
5656
<usedLibraries class="java.util.ArrayList">
5757
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.mcu16.Mcu16PeripheralLibrary" version="1.169.2"/>
58+
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.bootloader16.mcc.Library" version="1.18.4"/>
5859
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.boardsupportlibrary.BoardSuppportLibrary" version="1.12.0"/>
5960
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.foundationservices.library.FoundationServicesLibrary" version="0.2.2"/>
60-
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.bootloader16.mcc.Library" version="1.18.4-SNAPSHOT"/>
6161
</usedLibraries>
6262
<tokenMap class="java.util.HashMap">
6363
<entry>
@@ -14062,7 +14062,7 @@
1406214062
</entry>
1406314063
<entry>
1406414064
<key class="com.microchip.mcc.core.tokenManager.CustomKey" moduleName="16-bit Bootloader" name="state"/>
14065-
<value>{&quot;contractPath&quot;:&quot;..\\..\\boot&quot;}</value>
14065+
<value>{&quot;contractPath&quot;:&quot;..\\boot.X&quot;}</value>
1406614066
</entry>
1406714067
<entry>
1406814068
<key class="com.microchip.mcc.core.tokenManager.SettingKey" moduleName="Pin Module" registerAlias="CNEN0C" settingAlias="CNIE0C0"/>
@@ -16084,11 +16084,11 @@
1608416084
</entry>
1608516085
<entry>
1608616086
<file>mcc_generated_files\boot\remapped_reset.S</file>
16087-
<hash>c16a5fff56accb0bf4d3de05882eb49bbea60da6abcef22e1741c25f264061c3</hash>
16087+
<hash>05078d30a781e24fb5000164bd918b9849a6d4a4a5ad90202f1933c54301a0b0</hash>
1608816088
</entry>
1608916089
<entry>
1609016090
<file>mcc_generated_files\boot\hardware_interrupt_table.S</file>
16091-
<hash>4ebd468028515960099634f17534a67b79c24bb63cb2d186e0928cc4da931be9</hash>
16091+
<hash>9e9153e7b090fa37b0f2bfe9e90bbbfdeb375ac7878d3cf46ba706494ed63aa4</hash>
1609216092
</entry>
1609316093
<entry>
1609416094
<file>mcc_generated_files\boot\postBuild.bat</file>
@@ -16112,39 +16112,39 @@
1611216112
</entry>
1611316113
<entry>
1611416114
<file>mcc_generated_files\system.c</file>
16115-
<hash>f5a2f0061874e998b981dd6edfe77008f1534df012f06efdff95d0016f1651a8</hash>
16116-
</entry>
16117-
<entry>
16118-
<file>mcc_generated_files\boot\certificate_checksum16.S</file>
16119-
<hash>d161097e4172b9f3de8651d8dfd1b7450eeda2a36f430354f6b0677e3a7fa7ea</hash>
16115+
<hash>411a8e963c36e74a376c557eefdbf12772753b5b2fa592e5ef75733e6c090a1f</hash>
1612016116
</entry>
1612116117
<entry>
1612216118
<file>mcc_generated_files\clock.h</file>
1612316119
<hash>0b6275aa971cc3c1b29838d943ce7208a8e85d7fef146dcf45d1942c668079d1</hash>
1612416120
</entry>
1612516121
<entry>
16126-
<file>mcc_generated_files\docs\delay.dox</file>
16127-
<hash>13d4874d789b563dd4499efacd71882cbc38f8459da91ac17f13fa76079be93b</hash>
16122+
<file>mcc_generated_files\boot\user_interrupt_table.S</file>
16123+
<hash>61322b7c38116ff8980bfed24372484e416c112a0678302a412df802d3c863d0</hash>
1612816124
</entry>
1612916125
<entry>
16130-
<file>mcc_generated_files\boot\user_interrupt_table.S</file>
16131-
<hash>3c0e9be93da37b87d4009762bbb5ad96932e789ae97a8cfe1d2f51b06911c9b5</hash>
16126+
<file>mcc_generated_files\docs\delay.dox</file>
16127+
<hash>13d4874d789b563dd4499efacd71882cbc38f8459da91ac17f13fa76079be93b</hash>
1613216128
</entry>
1613316129
<entry>
1613416130
<file>mcc_generated_files\boot\interrupts.S</file>
16135-
<hash>8e1d1b3a3f4607aff05c7b18b7de0c8584dfe69e739840e854cd42ff336bfe79</hash>
16131+
<hash>0f82052f71c3c5761ab996c603c345505ea29f8e3b6ef8ef5f199d99f7cb7524</hash>
1613616132
</entry>
1613716133
<entry>
1613816134
<file>mcc_generated_files\mcc.c</file>
1613916135
<hash>5063e41499c0f63905ad7982135b6028c9d95b5248884e01961ca9382753d7db</hash>
1614016136
</entry>
16137+
<entry>
16138+
<file>mcc_generated_files\boot\application_header_checksum16.S</file>
16139+
<hash>70aabbd5889fb4e73060ff3e79bd58304204b07336c246f5394ee4840500f4c1</hash>
16140+
</entry>
1614116141
<entry>
1614216142
<file>mcc_generated_files\reset.h</file>
1614316143
<hash>5149540a892aca5df6c9bb53d04603f9b18e94a5c1653f9c699920d46889ca79</hash>
1614416144
</entry>
1614516145
<entry>
1614616146
<file>mcc_generated_files\mcc.h</file>
16147-
<hash>d1e28069148129a071d8084c655dddb4fa4f23551889d38521f651274a4b8ff6</hash>
16147+
<hash>68e41ad2e3739b91356745d5d8f9ab743894bf6212d828dda41e01bff3d3b325</hash>
1614816148
</entry>
1614916149
<entry>
1615016150
<file>mcc_generated_files\boot\postBuild.sh</file>
@@ -16168,15 +16168,15 @@
1616816168
</entry>
1616916169
<entry>
1617016170
<file>mcc_generated_files\boot\combineAppAndBootloaderHex.sh</file>
16171-
<hash>13e6e0a4b5784354b8b3ad08d16cb95826fed16d7eec046567b4accdcce9bcc3</hash>
16171+
<hash>5894ccf0fe60f99268ed53fb87ffcbc4cda41f28c72891c934a25ec4ec51359d</hash>
1617216172
</entry>
1617316173
<entry>
1617416174
<file>mcc_generated_files\pin_manager.c</file>
1617516175
<hash>6757b4a1411952a65d51fc5bdee0acb7da0d05d1a04275926eb2ea4d1dd4765f</hash>
1617616176
</entry>
1617716177
<entry>
1617816178
<file>mcc_generated_files\boot\boot_config.h</file>
16179-
<hash>7e63471a707c7c8d6b61b7982ec6f1d35fb0c34a73e3bac7e0d1052283e73c56</hash>
16179+
<hash>0f12877a6bf225005d7d395243adc72da5dea65c1f640a337990a1eab7bf26eb</hash>
1618016180
</entry>
1618116181
<entry>
1618216182
<file>mcc_generated_files\traps.c</file>
@@ -16188,11 +16188,11 @@
1618816188
</entry>
1618916189
<entry>
1619016190
<file>mcc_generated_files\boot\memory_partition.S</file>
16191-
<hash>50f4afd8df929455b567746cdd6e3aa6c68909da4e408b808238b906b0db13e8</hash>
16191+
<hash>199b43cd9e4d24ac0ba8f9f377d499c8a1a6194f77e71c115b3036a146402195</hash>
1619216192
</entry>
1619316193
<entry>
1619416194
<file>mcc_generated_files\boot\combineAppAndBootloaderHex.bat</file>
16195-
<hash>13e6e0a4b5784354b8b3ad08d16cb95826fed16d7eec046567b4accdcce9bcc3</hash>
16195+
<hash>5894ccf0fe60f99268ed53fb87ffcbc4cda41f28c72891c934a25ec4ec51359d</hash>
1619616196
</entry>
1619716197
<entry>
1619816198
<file>mcc_generated_files\interrupt_manager.c</file>

dspic33ck-can/app.X/mcc_generated_files/boot/certificate_checksum16.S renamed to dspic33ck-can/app.X/mcc_generated_files/boot/application_header_checksum16.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
Microchip Technology Inc.
66
77
@File Name:
8-
certificate_checksum16.S
8+
application_header_checksum16.S
99
1010
@Summary:
11-
This is the certificate_checksum16.S file generated using 16-bit Bootloader
11+
This is the application_header_checksum16.S file generated using 16-bit Bootloader
1212
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4-SNAPSHOT
16+
Product Revision : 16-bit Bootloader - 1.18.4
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
@@ -53,7 +53,7 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
5353
such restrictions will not apply to such third party software.
5454
*/
5555

56-
/* This file puts a certificate at the start of the application image that the
56+
/* This file puts an application header at the start of the application image that the
5757
* bootloader will use to verify the integrity of the application image.
5858
*/
5959

@@ -71,7 +71,7 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
7171
* 5. Delete or comment out the #error message above
7272
*/
7373

74-
.section .certificate_checksum16, code, address(BOOT_CONFIG_APPLICATION_IMAGE_CERTIFICATE_ADDRESS), keep
74+
.section .application_header_checksum16, code, address(BOOT_CONFIG_APPLICATION_IMAGE_APPLICATION_HEADER_ADDRESS), keep
7575

7676
/* Skip the instruction that holds the Checksum - this will have to be injected
7777
* by a tool later, but we need to reserve the space for it.

‎dspic33ck-can/app.X/mcc_generated_files/boot/boot_config.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4-SNAPSHOT
16+
Product Revision : 16-bit Bootloader - 1.18.4
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
@@ -58,11 +58,11 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
5858
#define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW 0x3000
5959
#define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_HIGH 0x2B7FE
6060

61-
#define BOOT_CONFIG_VERIFICATION_CERTIFICATE_SIZE 10
61+
#define BOOT_CONFIG_VERIFICATION_APPLICATION_HEADER_SIZE 10
6262

63-
#define BOOT_CONFIG_APPLICATION_IMAGE_CERTIFICATE_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW)
63+
#define BOOT_CONFIG_APPLICATION_IMAGE_APPLICATION_HEADER_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW)
6464

65-
#define BOOT_CONFIG_APPLICATION_RESET_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW + BOOT_CONFIG_VERIFICATION_CERTIFICATE_SIZE)
65+
#define BOOT_CONFIG_APPLICATION_RESET_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW + BOOT_CONFIG_VERIFICATION_APPLICATION_HEADER_SIZE)
6666

6767
#define BOOT_CONFIG_USER_IVT_TABLE_ADDRESS 0x3200
6868

‎dspic33ck-can/app.X/mcc_generated_files/boot/combineAppAndBootloaderHex.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

‎dspic33ck-can/app.X/mcc_generated_files/boot/combineAppAndBootloaderHex.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

‎dspic33ck-can/app.X/mcc_generated_files/boot/hardware_interrupt_table.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4-SNAPSHOT
16+
Product Revision : 16-bit Bootloader - 1.18.4
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B

‎dspic33ck-can/app.X/mcc_generated_files/boot/interrupts.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4-SNAPSHOT
16+
Product Revision : 16-bit Bootloader - 1.18.4
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B

‎dspic33ck-can/app.X/mcc_generated_files/boot/memory_partition.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4-SNAPSHOT
16+
Product Revision : 16-bit Bootloader - 1.18.4
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B

‎dspic33ck-can/app.X/mcc_generated_files/boot/remapped_reset.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4-SNAPSHOT
16+
Product Revision : 16-bit Bootloader - 1.18.4
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B

‎dspic33ck-can/app.X/mcc_generated_files/boot/user_interrupt_table.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Description:
1414
This header file provides implementations for driver APIs for all modules selected in the GUI.
1515
Generation Information :
16-
Product Revision : 16-bit Bootloader - 1.18.4-SNAPSHOT
16+
Product Revision : 16-bit Bootloader - 1.18.4
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B

0 commit comments

Comments
 (0)