Skip to content

Commit 5593b70

Browse files
royabeanroyabean
committed
fix sh and bat delimiter issues. Uprev application.
1 parent 3d49976 commit 5593b70

File tree

14 files changed

+186
-152
lines changed

14 files changed

+186
-152
lines changed

‎dspic33ck-canfd-ta100/app.X/MyConfig.mc3‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
<string>DMT</string>
2121
<string>class com.microchip.mcc.mcu16.systemManager.dmt.DMT</string>
2222
</entry>
23-
<entry>
24-
<string>RESET</string>
25-
<string>class com.microchip.mcc.mcu16.systemManager.reset.RESET</string>
26-
</entry>
2723
<entry>
2824
<string>ICD</string>
2925
<string>class com.microchip.mcc.mcu16.systemManager.icd.Icd</string>
3026
</entry>
27+
<entry>
28+
<string>RESET</string>
29+
<string>class com.microchip.mcc.mcu16.systemManager.reset.RESET</string>
30+
</entry>
3131
<entry>
3232
<string>Interrupt Module</string>
3333
<string>class com.microchip.mcc.mcu16.interruptManager_dsPIC.InterruptManager_dsPIC</string>
@@ -54,10 +54,10 @@
5454
</entry>
5555
</usedClasses>
5656
<usedLibraries class="java.util.ArrayList">
57+
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.boardsupportlibrary.BoardSuppportLibrary" version="1.12.0"/>
58+
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.bootloader16.mcc.Library" version="1.19.0"/>
5759
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.mcu16.Mcu16PeripheralLibrary" version="1.169.2"/>
5860
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.foundationservices.library.FoundationServicesLibrary" version="0.2.2"/>
59-
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.mcc.boardsupportlibrary.BoardSuppportLibrary" version="1.12.0"/>
60-
<ILibraryFile class="com.microchip.mcc.core.library.BaseLibraryFile" libraryClass="com.microchip.bootloader16.mcc.Library" version="1.18.4"/>
6161
</usedLibraries>
6262
<tokenMap class="java.util.HashMap">
6363
<entry>
@@ -16086,21 +16086,17 @@
1608616086
<file>mcc_generated_files\boot\signing_tool.jar</file>
1608716087
<hash>8345418e391fdba976f1a94fc5f3b8b45f0688029677982a5c486f1de6eae162</hash>
1608816088
</entry>
16089-
<entry>
16090-
<file>mcc_generated_files\boot\remapped_reset.S</file>
16091-
<hash>05078d30a781e24fb5000164bd918b9849a6d4a4a5ad90202f1933c54301a0b0</hash>
16092-
</entry>
1609316089
<entry>
1609416090
<file>mcc_generated_files\boot\application_header_requirements.c</file>
16095-
<hash>446a3914b7c620993916167270e8a824c4729fb36567ae21b1b5be07805efd20</hash>
16091+
<hash>f791970d282562293db3dcf0296199b65f5f2dd68af1d7958b48d7fa42e78a53</hash>
1609616092
</entry>
1609716093
<entry>
1609816094
<file>mcc_generated_files\boot\hardware_interrupt_table.S</file>
16099-
<hash>9e9153e7b090fa37b0f2bfe9e90bbbfdeb375ac7878d3cf46ba706494ed63aa4</hash>
16095+
<hash>b4eefe0edfc08ea9840a55540214b966fa3440def254b988d5836cf2efced5bf</hash>
1610016096
</entry>
1610116097
<entry>
1610216098
<file>mcc_generated_files\boot\postBuild.bat</file>
16103-
<hash>2f24873b4a41e6c3e592411a7efd291ea3ff0000f4c703a09fc68adb2c1f96b8</hash>
16099+
<hash>577855c7a33f616aee0d24439e13298bdb70e577690238ec02ffcf6391b8ecb7</hash>
1610416100
</entry>
1610516101
<entry>
1610616102
<file>mcc_generated_files\system_types.h</file>
@@ -16112,15 +16108,15 @@
1611216108
</entry>
1611316109
<entry>
1611416110
<file>mcc_generated_files\boot\application_header_atecc608.S</file>
16115-
<hash>fac6761425664734a0e051de2c8c2edc91ade8121bcd4ecfc56b71fa29fcd21b</hash>
16111+
<hash>d050e872426962b577f0afc243f5de5f189454c376f3235fc63163d9b09dc371</hash>
1611616112
</entry>
1611716113
<entry>
1611816114
<file>mcc_generated_files\delay.c</file>
1611916115
<hash>4a6b8bbd5d2fbe5f20e79db8d915e50e2cd43920940679b40db90f3789cbccd5</hash>
1612016116
</entry>
1612116117
<entry>
1612216118
<file>mcc_generated_files\system.c</file>
16123-
<hash>a82a3145c0dffada6647597aac62379c68b92ee4cadf4d5e13dc2fcf479fedf4</hash>
16119+
<hash>77ec91afcd91792a29e3e01ede7a3fdf13c7c1d54fb7dd42c5abc1e553c2cdc1</hash>
1612416120
</entry>
1612516121
<entry>
1612616122
<file>mcc_generated_files\delay.h</file>
@@ -16130,37 +16126,37 @@
1613016126
<file>mcc_generated_files\clock.h</file>
1613116127
<hash>0b6275aa971cc3c1b29838d943ce7208a8e85d7fef146dcf45d1942c668079d1</hash>
1613216128
</entry>
16129+
<entry>
16130+
<file>mcc_generated_files\boot\user_interrupt_table.S</file>
16131+
<hash>2125578a9499a5418a83a12063093662d5e2a4001a8cd588e8178541c26411a4</hash>
16132+
</entry>
1613316133
<entry>
1613416134
<file>mcc_generated_files\docs\delay.dox</file>
1613516135
<hash>13d4874d789b563dd4499efacd71882cbc38f8459da91ac17f13fa76079be93b</hash>
1613616136
</entry>
1613716137
<entry>
16138-
<file>mcc_generated_files\boot\user_interrupt_table.S</file>
16139-
<hash>61322b7c38116ff8980bfed24372484e416c112a0678302a412df802d3c863d0</hash>
16138+
<file>mcc_generated_files\boot\interrupts.S</file>
16139+
<hash>506f92989683bbfab5fbc57c10230f8065c18cc707ed0c60a369391a2d53fc9f</hash>
1614016140
</entry>
1614116141
<entry>
1614216142
<file>mcc_generated_files\mcc.c</file>
1614316143
<hash>5063e41499c0f63905ad7982135b6028c9d95b5248884e01961ca9382753d7db</hash>
1614416144
</entry>
16145-
<entry>
16146-
<file>mcc_generated_files\boot\interrupts.S</file>
16147-
<hash>0f82052f71c3c5761ab996c603c345505ea29f8e3b6ef8ef5f199d99f7cb7524</hash>
16148-
</entry>
1614916145
<entry>
1615016146
<file>mcc_generated_files\reset.h</file>
1615116147
<hash>5149540a892aca5df6c9bb53d04603f9b18e94a5c1653f9c699920d46889ca79</hash>
1615216148
</entry>
1615316149
<entry>
1615416150
<file>mcc_generated_files\mcc.h</file>
16155-
<hash>0f75fe6fbb7bccf9b8043df95b3b055e42529f3e09c1ab8ef446d980d2b8c154</hash>
16151+
<hash>acd0a66505a2eeea1e86720d1c55cd2871f1a334f7fa1185108dc9784b92303f</hash>
1615616152
</entry>
1615716153
<entry>
16158-
<file>mcc_generated_files\reset.c</file>
16159-
<hash>7dcd545e4f0bbb78e0dd44ceebca36bd75873807a5302302bec77bea5fc16e05</hash>
16154+
<file>mcc_generated_files\boot\postBuild.sh</file>
16155+
<hash>79ce20336ec6cf95b65fd0db8f8d6caa51778569c0847b023c9f0045f5dd78aa</hash>
1616016156
</entry>
1616116157
<entry>
16162-
<file>mcc_generated_files\boot\postBuild.sh</file>
16163-
<hash>c4b530e0f3d3c738e8148246eb36b5bcee0d81cf101e74d05e91d5dbd2a6a41e</hash>
16158+
<file>mcc_generated_files\reset.c</file>
16159+
<hash>7dcd545e4f0bbb78e0dd44ceebca36bd75873807a5302302bec77bea5fc16e05</hash>
1616416160
</entry>
1616516161
<entry>
1616616162
<file>mcc_generated_files\clock.c</file>
@@ -16170,21 +16166,21 @@
1617016166
<file>main.c</file>
1617116167
<hash>e0fda6a558a2f90af7640d6f94174dd624e9f8c3f3ae9c2259ef8bd5200b49d4</hash>
1617216168
</entry>
16173-
<entry>
16174-
<file>mcc_generated_files\pin_manager.h</file>
16175-
<hash>0e68bbc6ba1cad4260b0a5337e739fcfb2ed5c02b7dae12da512f272dff67997</hash>
16176-
</entry>
1617716169
<entry>
1617816170
<file>mcc_generated_files\boot\combineAppAndBootloaderHex.sh</file>
1617916171
<hash>748cf8cd87189e8935d98fa049dc1280be9ca449b20f28d7cc11e32226c9309b</hash>
1618016172
</entry>
16173+
<entry>
16174+
<file>mcc_generated_files\pin_manager.h</file>
16175+
<hash>0e68bbc6ba1cad4260b0a5337e739fcfb2ed5c02b7dae12da512f272dff67997</hash>
16176+
</entry>
1618116177
<entry>
1618216178
<file>mcc_generated_files\pin_manager.c</file>
1618316179
<hash>6757b4a1411952a65d51fc5bdee0acb7da0d05d1a04275926eb2ea4d1dd4765f</hash>
1618416180
</entry>
1618516181
<entry>
1618616182
<file>mcc_generated_files\boot\boot_config.h</file>
16187-
<hash>b8695dc7b94c227f0248d56e8ca52a16446e0a1ecfb2e4770e9f3f235dae19b4</hash>
16183+
<hash>8ad40aeee8900cf092e56fe4b59def0ae0768a2fc666ea0f528bc989432830ce</hash>
1618816184
</entry>
1618916185
<entry>
1619016186
<file>mcc_generated_files\traps.c</file>
@@ -16196,16 +16192,16 @@
1619616192
</entry>
1619716193
<entry>
1619816194
<file>mcc_generated_files\boot\memory_partition.S</file>
16199-
<hash>199b43cd9e4d24ac0ba8f9f377d499c8a1a6194f77e71c115b3036a146402195</hash>
16200-
</entry>
16201-
<entry>
16202-
<file>mcc_generated_files\interrupt_manager.c</file>
16203-
<hash>4b6369b051e4044ed8118d5249492400f12f125925d973cbfdae44a5acd57f17</hash>
16195+
<hash>07637d6628b23bb8608aaccadf5513f4e84f74bb0b57015003885b5ea4d77460</hash>
1620416196
</entry>
1620516197
<entry>
1620616198
<file>mcc_generated_files\boot\combineAppAndBootloaderHex.bat</file>
1620716199
<hash>748cf8cd87189e8935d98fa049dc1280be9ca449b20f28d7cc11e32226c9309b</hash>
1620816200
</entry>
16201+
<entry>
16202+
<file>mcc_generated_files\interrupt_manager.c</file>
16203+
<hash>4b6369b051e4044ed8118d5249492400f12f125925d973cbfdae44a5acd57f17</hash>
16204+
</entry>
1620916205
<entry>
1621016206
<file>mcc_generated_files\watchdog.h</file>
1621116207
<hash>384df8adb20de417a989a378d2dfd0c260ed296650f21c97fab792e7038a654c</hash>

‎dspic33ck-canfd-ta100/app.X/mcc_generated_files/boot/application_header_atecc608.S‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
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
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626
@@ -66,8 +66,8 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
6666
* 2. Select the 'Building' left navigation node.
6767
* 3. Check the box next to 'Execute this line after the build'.
6868
* 4. In the text field below,
69-
* add "cd mcc_generated_files/boot && postBuild.bat $(MP_CC_DIR)" (without quotes) if you are on a Windows machine, or
70-
* add "cd mcc_generated_files/boot && ./postBuild.sh $(MP_CC_DIR)" (without quotes) if you are on a Linux/Unix/Mac machine.
69+
* add "cd mcc_generated_files/boot && postBuild.bat $(MP_CC_DIR) ${ProjectDir} ${ImageDir} ${ImageName} ${IsDebug}" (without quotes) if you are on a Windows machine, or
70+
* add "cd mcc_generated_files/boot && ./postBuild.sh $(MP_CC_DIR) ${ProjectDir} ${ImageDir} ${ImageName} ${IsDebug}" (without quotes) if you are on a Linux/Unix/Mac machine.
7171
*/
7272

7373
.section .application_header_atecc608, code, address(BOOT_CONFIG_APPLICATION_IMAGE_APPLICATION_HEADER_ADDRESS), keep
@@ -98,3 +98,24 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
9898
/* Address where to end the hash for the signature */
9999
.long(0x2B7FE)
100100

101+
/* Firmware Image Reset Remap */
102+
goto __resetPRI
103+
104+
/* Start of Extended Application Header */
105+
.word 0
106+
107+
/* Length of Extended Application Header */
108+
.long (2)
109+
110+
/* Count of Items in Application Header */
111+
.word (2)
112+
113+
/* Version Number ID */
114+
.word (2)
115+
116+
/* Version Number Length */
117+
.long (4)
118+
119+
/* Version Number Data */
120+
.long(0x0)
121+

‎dspic33ck-canfd-ta100/app.X/mcc_generated_files/boot/application_header_requirements.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
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
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626

‎dspic33ck-canfd-ta100/app.X/mcc_generated_files/boot/boot_config.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
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
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626
@@ -58,6 +58,9 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
5858
#define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW 0x8000
5959
#define BOOT_CONFIG_PROGRAMMABLE_ADDRESS_HIGH 0x2B7FE
6060

61+
#define BOOT_CONFIG_DOWNLOAD_LOW 0x8000
62+
#define BOOT_CONFIG_DOWNLOAD_HIGH 0x2B7FE
63+
6164
#define BOOT_CONFIG_VERIFICATION_APPLICATION_HEADER_SIZE 72
6265

6366
#define BOOT_CONFIG_APPLICATION_IMAGE_APPLICATION_HEADER_ADDRESS (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW)

‎dspic33ck-canfd-ta100/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-FFFF,..\..\..\boot.X\dist\default\production\boot.X.production.hex r10000-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
1+
hexmate r0-FFFF,../../../boot.X/dist/default/production/boot.X.production.hex r10000-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-canfd-ta100/app.X/mcc_generated_files/boot/hardware_interrupt_table.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
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
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626

‎dspic33ck-canfd-ta100/app.X/mcc_generated_files/boot/interrupts.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
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
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626

‎dspic33ck-canfd-ta100/app.X/mcc_generated_files/boot/memory_partition.S‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
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
16+
Product Revision : 16-bit Bootloader - 1.19.0
1717
Device : dsPIC33CK256MP508
1818
The generated drivers are tested against the following:
1919
Compiler : XC16 v1.36B
2020
MPLAB : MPLAB X v5.15
2121
*/
2222
/*
23-
Copyright (c) [2012-2019] Microchip Technology Inc.
23+
Copyright (c) [2012-2021] Microchip Technology Inc.
2424
2525
All rights reserved.
2626
@@ -52,27 +52,36 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
5252
third party licenses prohibit any of the restrictions described here,
5353
such restrictions will not apply to such third party software.
5454
*/
55-
/* This code will block out the space reserved by the boot loader so that the
56-
* application code can't link into that area.
57-
*
58-
* The value in the address() field defines the start address of the
59-
* boot code.
60-
*
61-
* The number on the .space defines the size of this block in PC units (2 per
62-
* instruction).
63-
*/
55+
6456
#include "boot_config.h"
6557
.equ ERASE_PAGE_MASK,(~((2048) - 1))
6658
.equ LAST_PAGE_START_ADDRESS, (0x2BEFE & ERASE_PAGE_MASK)
67-
68-
59+
.equ RESERVED_MEMORY_START, (0x2B7FE+2)
6960
.equ PROGRAM_MEMORY_ORIGIN, (0x000200)
61+
.equ LAST_ADDRESS_OF_MEMORY, (0x2BEFE)
7062

63+
/* The exectuable application image lives between:
64+
* Start Address = 0x8000
65+
* End Address = 0x2B7FE
66+
*
67+
* All other memory on the device must be reserved so that executable
68+
* application code can't link to those addresses. This includes the space
69+
* required by the bootloader.
70+
*
71+
* The value in the address() field defines the start address.
72+
* The number on the .space defines the size of this block in PC units (2 per
73+
* instruction).
74+
*/
75+
76+
/* Reserve the memory used by the bootloader */
7177
.section *, code, address(PROGRAM_MEMORY_ORIGIN), noload, keep
7278
boot_loader_memory:
7379
.space (BOOT_CONFIG_PROGRAMMABLE_ADDRESS_LOW - PROGRAM_MEMORY_ORIGIN), 0x00
7480

75-
.section *, code, address(LAST_PAGE_START_ADDRESS), noload, keep
81+
/* Reserve all of the memory after the last instruction of the executable
82+
* image, through the end of device memory.
83+
*/
84+
.section *, code, address(RESERVED_MEMORY_START), noload, keep
7685
config_page_memory:
77-
.space (0x2BEFE-LAST_PAGE_START_ADDRESS), 0x00
86+
.space (LAST_ADDRESS_OF_MEMORY-RESERVED_MEMORY_START), 0x00
7887

0 commit comments

Comments
 (0)