Pull request #100: Add fix and update version and changelog, MCU16GITHUB-1786, MCU16GITHUB-1788

Merge in MCU16CE/dspic33-dsc-bootloader-code-examples from ~C74569/dspic33-dsc-bootloader-code-examples:bugfix/MCU16GITHUB-1796-fix-invalid-mode to develop

* commit 'e82ec3499213e5bddb7a35b8f04f43653959c4a8':
  Add fix and update version and changelog

Author: aiwyatt787

.main-meta/main.json

@@ -4,7 +4,7 @@
    "content": {
       "metaDataVersion": "1.3.0",
       "name": "com.microchip.mplabx.project.dspic33-dsc-bootloader-code-examples",
-      "version": "1.2.4",
+      "version": "1.2.5",
       "displayName": "dsPIC33 DSC Bootloader Code Examples",
       "projectName": "dspic33-dsc-bootloader-code-examples",
       "shortDescription": "dsPIC33 DSC Bootloader Code Examples",

changelog.md

@@ -1,3 +1,10 @@
+# dsPIC33 DSC Bootloader Code Examples v1.2.5
+### Release Highlights
+* Removed invalid mode change in dspic33a_secure_boot demo.
+
+### Features Added\Updated
+* Removed invalid mode change in dspic33a_secure_boot demo.
+
 # dsPIC33 DSC Bootloader Code Examples v1.2.4
 ### Release Highlights
 * Corrected application/executable entry address in dspic33a_bootloader_and_firmware_upgrade_demo and dspic33a_secure_boot.

dspic33a_secure_boot/.main-meta/main.json

@@ -4,7 +4,7 @@
    "content": {
       "metaDataVersion": "1.3.0",
       "name": "com.microchip.mplabx.project.dspic33a-secure-boot-and-secure-firmware-upgrade-demo",
-      "version": "1.2.4",
+      "version": "1.2.5",
       "displayName": "dsPIC33A Secure Boot and Secure Firmware Upgrade Demo",
       "projectName": "dspic33a-secure-boot-and-secure-firmware-upgrade-demo",
       "shortDescription": "This MPLAB® X IDE example demonstrates how to perform secure boot authentication and secure firmware upgrade via UART with Microchip Device Firmware Update Protocol (M-DFU) and ECDSA with P-384 verification within MCC Melody.",

dspic33a_secure_boot/boot.X/mdfu/mdfu_boot_demo.c

@@ -153,8 +153,8 @@ void MDFU_BootDemoTasks(void)
             if(executable.modeChange(MDFU_PARTITION_MODE_READ & MDFU_PARTITION_MODE_WRITE) == MDFU_PARTITION_STATUS_SUCCESS)
             {
                 executable.copy(&download); 
-                /* Make the executable partition readable and locked to prevent self writes. */
-                if (executable.modeChange(MDFU_PARTITION_MODE_READ & MDFU_PARTITION_MODE_LOCKED) != MDFU_PARTITION_STATUS_SUCCESS)
+                /* Make the executable partition readable to prevent self writes. */
+                if (executable.modeChange(MDFU_PARTITION_MODE_READ) != MDFU_PARTITION_STATUS_SUCCESS)
                 {
                     Reset();
                 }

dspic33a_secure_boot/boot.X/mdfu/mdfu_partition_executable.c

@@ -276,6 +276,11 @@ static enum MDFU_PARTITION_STATUS ModeChange(enum MDFU_PARTITION_MODE mode)
         enum FLASH_REGION_PERMISSION permissions = (FLASH_REGION_PERMISSION_EXECUTION_ENABLED & FLASH_REGION_PERMISSION_READ_ENABLED);
         status = flashRegion2.permissionsSet(permissions, true) ? MDFU_PARTITION_STATUS_SUCCESS : MDFU_PARTITION_STATUS_LOCKED;
     }
+    else if (mode == (enum MDFU_PARTITION_MODE)(MDFU_PARTITION_MODE_READ))
+    {
+        enum FLASH_REGION_PERMISSION permissions = (FLASH_REGION_PERMISSION_READ_ENABLED);
+        status = flashRegion2.permissionsSet(permissions, false) ? MDFU_PARTITION_STATUS_SUCCESS : MDFU_PARTITION_STATUS_LOCKED;
+    }
     else
     {
     }