Skip to content

Commit 0017b05

Browse files
committed
Update instructions for boot_demo merge
1 parent 84ce4ed commit 0017b05

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

dsPIC33CK1024MP710/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ The associated bootloader and application projects demonstrate the following:
6060
![Force Update](./images/MCC_Force_Update.png)
6161
4. Click "Generate"
6262
![Generate](./images/MCC_Generate.png)
63-
5. Accept all incoming code changes by selecting "Replace All" in the merge helper UI
63+
5. Accept all incoming code changes for files **within the CryptoAuthenticationLibrary directory** by selecting "Replace All" in the merge helper UI. **NOTE: DO NOT accept incoming changes for boot_demo.c. Accept all other file changes and close out of MCC**
6464
![Merge Resolution](./images/MCC_Merge_Resolution.PNG)
6565
6. Press the “Make and Program” button on the top bar
6666
![Make and Program Device](./images/make_and_program.png)
6767
7. Select the appropriate programmer if prompted
6868
8. The project should compile and program successfully
6969
9. Verify the LED11 is solid on the Development Board. This indicates the bootloader is running
70-
a. If LED11 is blinking instead of solid, then the application code was programmed instead of only compiled. Go back to the “Programming the Bootloader” stage and re-program the bootloader
7170

7271
#### Building the Application
7372
1. Open the app.X project in MPLAB® X
7473
2. Press the “Clean and Build Project” button on the top bar. **NOTE**: Make sure not to hit the program button. This will program the application code over the bootloader that was just programmed
7574
![Clean and Build](./images/clean_and_build.png)
7675
3. The project should compile cleanly. app.X/dist/default/production/app.X.production.hex should be generated
7776
4. Verify that LED11 is still solid
77+
a. If LED11 is blinking instead of solid, then the application code was programmed instead of only compiled. Go back to the “Programming the Bootloader” stage and re-program the bootloader
7878

7979
#### Loading the Application
8080
1. Open the Universal Bootloader Host Application tool (UBHA)

0 commit comments

Comments
 (0)