Skip to content

Commit 2c5e691

Browse files
davidflowersdavidflowers
committed
merge conflict resolution. add check for programmed by bootloader.
2 parents 21b6b1d + c6ce6f5 commit 2c5e691

File tree

3 files changed

+88
-12
lines changed

3 files changed

+88
-12
lines changed

‎secure_boot_and_secure_firmware_upgrade_over_canfd/icsp_inhibit.X/main.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
THIS SOFTWARE.
2020
*/
2121

22-
/* WARNING: THIS PROJECT WHEN BOOTLOADED WILL CAUSE THE DEVICE TO NO LONGER
23-
BE PROGRAMMABLE VIA AN EXTERNAL PROGRAMMER. Programming this project in
24-
directly should not allow programming to be disabled. A keyword must also
25-
be typed into the terminal console for the programming disable to occur. */
22+
/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
23+
#warning "!!RUNNING THIS PROGRAM AND FOLLOWING THE STEPS OUTLINED IN THE CONSOLE WILL PERMANENTLY DISABLE DIRECT PROGRAMMING OF THE BOARD. FOR ADDITIONAL INFORMATION, SEE THE README.MD INCLUDED WITH THIS PROJECT AND THE FAMILY DATA SHEET LOCATED AT https://ww1.microchip.com/downloads/aemDocuments/documents/MCU16/ProductDocuments/DataSheets/dsPIC33CK1024MP710-Family-Data-Sheet-DS70005496.pdf"
2624

2725
#include <stdio.h>
2826
#include <string.h>
@@ -65,16 +63,18 @@ int main(void)
6563
{
6664
}
6765
}
68-
69-
PrintWarning();
70-
71-
while (1)
66+
else
7267
{
73-
if (UART1_IsRxReady())
68+
PrintWarning();
69+
70+
while (1)
7471
{
75-
char receivedChar = UART1_Read();
76-
ProcessReceivedChar(receivedChar, window, &windowIndex);
77-
CheckForUnlockCommand(window, &windowIndex);
72+
if (UART1_IsRxReady())
73+
{
74+
char receivedChar = UART1_Read();
75+
ProcessReceivedChar(receivedChar, window, &windowIndex);
76+
CheckForUnlockCommand(window, &windowIndex);
77+
}
7878
}
7979
}
8080
}

‎secure_boot_and_secure_firmware_upgrade_over_canfd/icsp_inhibit.X/mcc-manifest-autosave.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This file has been autogenerated by MPLAB Code Configurator. Please do not edit this file.
2+
3+
manifest_file_version: 1.0.0
4+
project: icsp_inhibit
5+
creation_date: 2024-03-21T16:07:09.058-04:00[America/New_York]
6+
operating_system: Windows 10
7+
mcc_mode: IDE
8+
mcc_mode_version: v6.20
9+
device_name: dsPIC33CK1024MP710
10+
compiler: XC16 2.10
11+
mcc_version: 5.5.0
12+
mcc_core_version: 5.7.0
13+
content_manager_version: 5.0.0
14+
is_mcc_offline: false
15+
is_using_prerelease_versions: true
16+
mcc_content_registries: https://registry.npmjs.org/, https://artifacts.microchip.com/artifactory/api/npm/npm/
17+
device_library: {library_class: com.microchip.mcc.melody.Library, name: Melody, version: 2.6.5}
18+
packs: {name: dsPIC33CK-MP_DFP, version: 1.14.376}
19+
modules:
20+
- {name: com.microchip.bootloader16.mcc.Library, type: CLASSIC, version: 1.25.0}
21+
- {name: '@mchp-mcc/clock-16bit-driver', type: MELODY, version: 1.2.1}
22+
- {name: '@mchp-mcc/dmt-16bit-driver', type: MELODY, version: 1.0.6}
23+
- {name: '@mchp-mcc/dspic33-configuration-bits', type: MELODY, version: 1.2.2}
24+
- {name: '@mchp-mcc/flash-basic-user', type: MELODY, version: 2.1.1}
25+
- {name: '@mchp-mcc/icd-16bit-driver', type: MELODY, version: 1.0.3}
26+
- {name: '@mchp-mcc/main-16bit-manager', type: MELODY, version: 1.1.2}
27+
- {name: '@mchp-mcc/pic-16bit', type: MELODY, version: 5.11.3}
28+
- {name: '@mchp-mcc/pic24-dspic33-clock-sib', type: MELODY, version: 1.4.2}
29+
- {name: '@mchp-mcc/pic24-dspic33-dmt-upb', type: MELODY, version: 1.1.1}
30+
- {name: '@mchp-mcc/pic24-dspic33-interrupt', type: MELODY, version: 1.3.1}
31+
- {name: '@mchp-mcc/pic24-dspic33-nvm-ctrl-16bit-v1', type: MELODY, version: 3.2.1}
32+
- {name: '@mchp-mcc/pic24-dspic33-pin-manager', type: MELODY, version: 1.3.0}
33+
- {name: '@mchp-mcc/pic24-dspic33-reset', type: MELODY, version: 1.1.0}
34+
- {name: '@mchp-mcc/pic24-dspic33-uart-protocol-upb', type: MELODY, version: 1.4.1}
35+
- {name: '@mchp-mcc/pic24-dspic33-wdt-upb-v1', type: MELODY, version: 1.2.1}
36+
- {name: '@mchp-mcc/pin-content-processor', type: MELODY, version: 3.8.0}
37+
- {name: '@mchp-mcc/uart-driver', type: MELODY, version: 1.8.0}
38+
- {name: '@mchp-mcc/wdt-16bit-driver', type: MELODY, version: 1.0.7}

‎secure_boot_and_secure_firmware_upgrade_over_canfd/icsp_inhibit.X/mcc-manifest-generated-success.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This file has been autogenerated by MPLAB Code Configurator. Please do not edit this file.
2+
3+
manifest_file_version: 1.0.0
4+
project: icsp_inhibit
5+
creation_date: 2024-03-21T16:07:09.012-04:00[America/New_York]
6+
operating_system: Windows 10
7+
mcc_mode: IDE
8+
mcc_mode_version: v6.20
9+
device_name: dsPIC33CK1024MP710
10+
compiler: XC16 2.10
11+
mcc_version: 5.5.0
12+
mcc_core_version: 5.7.0
13+
content_manager_version: 5.0.0
14+
is_mcc_offline: false
15+
is_using_prerelease_versions: true
16+
mcc_content_registries: https://registry.npmjs.org/, https://artifacts.microchip.com/artifactory/api/npm/npm/
17+
device_library: {library_class: com.microchip.mcc.melody.Library, name: Melody, version: 2.6.5}
18+
packs: {name: dsPIC33CK-MP_DFP, version: 1.14.376}
19+
modules:
20+
- {name: com.microchip.bootloader16.mcc.Library, type: CLASSIC, version: 1.25.0}
21+
- {name: '@mchp-mcc/clock-16bit-driver', type: MELODY, version: 1.2.1}
22+
- {name: '@mchp-mcc/dmt-16bit-driver', type: MELODY, version: 1.0.6}
23+
- {name: '@mchp-mcc/dspic33-configuration-bits', type: MELODY, version: 1.2.2}
24+
- {name: '@mchp-mcc/flash-basic-user', type: MELODY, version: 2.1.1}
25+
- {name: '@mchp-mcc/icd-16bit-driver', type: MELODY, version: 1.0.3}
26+
- {name: '@mchp-mcc/main-16bit-manager', type: MELODY, version: 1.1.2}
27+
- {name: '@mchp-mcc/pic-16bit', type: MELODY, version: 5.11.3}
28+
- {name: '@mchp-mcc/pic24-dspic33-clock-sib', type: MELODY, version: 1.4.2}
29+
- {name: '@mchp-mcc/pic24-dspic33-dmt-upb', type: MELODY, version: 1.1.1}
30+
- {name: '@mchp-mcc/pic24-dspic33-interrupt', type: MELODY, version: 1.3.1}
31+
- {name: '@mchp-mcc/pic24-dspic33-nvm-ctrl-16bit-v1', type: MELODY, version: 3.2.1}
32+
- {name: '@mchp-mcc/pic24-dspic33-pin-manager', type: MELODY, version: 1.3.0}
33+
- {name: '@mchp-mcc/pic24-dspic33-reset', type: MELODY, version: 1.1.0}
34+
- {name: '@mchp-mcc/pic24-dspic33-uart-protocol-upb', type: MELODY, version: 1.4.1}
35+
- {name: '@mchp-mcc/pic24-dspic33-wdt-upb-v1', type: MELODY, version: 1.2.1}
36+
- {name: '@mchp-mcc/pin-content-processor', type: MELODY, version: 3.8.0}
37+
- {name: '@mchp-mcc/uart-driver', type: MELODY, version: 1.8.0}
38+
- {name: '@mchp-mcc/wdt-16bit-driver', type: MELODY, version: 1.0.7}

0 commit comments

Comments
 (0)