Pull request #32: Feature/MCU16GITHUB-937 see about maxing out the clock speed of the device for the demo 2

Merge in MCU16CE/dspic33-dsc-bootloader-code-examples from ~C12109/dspic33-dsc-bootloader-code-examples:feature/MCU16GITHUB-937-see-about-maxing-out-the-clock-speed-of-the-device-for-the-demo-2 to develop

Squashed commit of the following:

commit 0c0625d765b0a24cd9abe7c350e7a97434bd598b
Author: David Flowers <david.flowers@microchip.com>
Date:   Wed Mar 20 10:57:02 2024 -0400

    remove the CAL files from project.

commit d67c24e442b134b262c72df6b2ed81ff509173c4
Author: David Flowers <david.flowers@microchip.com>
Date:   Wed Mar 20 10:45:01 2024 -0400

    fix double post-build include.

commit 182b8ca4a64f9d253021c1988b78c10325eb1d92
Author: David Flowers <david.flowers@microchip.com>
Date:   Wed Mar 20 10:39:22 2024 -0400

    update to put chmod first.

commit 777396d6f74e67b55fd2b45e1557b4e75a552dc2
Author: David Flowers <david.flowers@microchip.com>
Date:   Wed Mar 20 10:36:02 2024 -0400

    Update to faster clock speed.

Author: davidflowers

secure_boot_and_secure_firmware_upgrade_over_canfd/app.X/app.mc3

@@ -25,13 +25,15 @@
     Main application
  */
 
+#define BLINK_DELAY_COUNT 0x80000UL
+
 int main(void) {
-    unsigned int counter = 0;
+    uint32_t counter = 0;
 
     SYSTEM_Initialize();
 
     while (1) {
-        if ((counter++ % 0x8000) == 0) {
+        if ((counter++ % BLINK_DELAY_COUNT) == 0) {
             IO_RE9_Toggle();
         }
     }

secure_boot_and_secure_firmware_upgrade_over_canfd/app.X/main.c

@@ -47,7 +47,7 @@
   @brief    This macro is used to read the System clock (FOSC) Frequency configured in 
             the MCC Melody User Interface
 */
-#define CLOCK_SystemFrequencyGet()        (8000000UL)
+#define CLOCK_SystemFrequencyGet()        (200000000UL)
 
 /** 
   @ingroup  clockdriver

secure_boot_and_secure_firmware_upgrade_over_canfd/app.X/mcc_generated_files/system/clock.h

@@ -44,21 +44,25 @@ void CLOCK_Initialize(void)
 {
     /*  
        Input frequency                               :  8.00 MHz
-       Clock source                                  :  FRC Oscillator
-       System frequency (Fosc)                       :  8.00 MHz
-       Clock switching enabled                       :  false
+       Clock source                                  :  External Oscillator with PLL
+       System frequency (Fosc)                       :  200.00 MHz [(8.00 MHz / 1) * 50 / 1 / 2 = 200.00 MHz]
+       PLL VCO frequency (Fvco)                      :  400.00 MHz [(8.00 MHz / 1) * 50 = 400.00 MHz]
+       PLL output frequency (Fpllo)                  :  400.00 MHz [(8.00 MHz / 1) * 50 / 1 = 400.00 MHz]
+       PLL VCO divider frequency (Fvcodiv)           :  100.00 MHz [400.00 MHz / 4 = 100.00 MHz]
+       Clock switching enabled                       :  true
+       Clock source when device boots                :  FRC Oscillator
        Auxiliary clock source                        :  FRC Oscillator
        Auxiliary clock input frequency               :  8.00 MHz
        Auxiliary clock PLL output frequency (AFpllo) :  8.00 MHz
     */
     // RCDIV FRC/1; PLLPRE 1:1; DOZE 1:8; DOZEN disabled; ROI disabled; 
     CLKDIV = 0x3001;
-    // PLLDIV 150; 
-    PLLFBD = 0x96;
+    // PLLDIV 50; 
+    PLLFBD = 0x32;
     // TUN Center frequency; 
     OSCTUN = 0x0;
-    // PLLPOST 1:4; VCODIV FVCO/4; POST2DIV 1:1; 
-    PLLDIV = 0x41;
+    // PLLPOST 1:1; VCODIV FVCO/4; POST2DIV 1:1; 
+    PLLDIV = 0x11;
     // ENAPLL disabled; FRCSEL FRC Oscillator; APLLPRE 1:1; 
     ACLKCON1 = 0x101;
     // APLLFBDIV 150; 
@@ -91,9 +95,12 @@ void CLOCK_Initialize(void)
     PMD7 = 0x0;
     // DMTMD enabled; CLC3MD enabled; OPAMPMD enabled; BIASMD enabled; CLC4MD enabled; SENT1MD enabled; CLC1MD enabled; CLC2MD enabled; SENT2MD enabled; 
     PMD8 = 0x0;
-    // CF no clock failure; NOSC FRC; CLKLOCK unlocked; OSWEN Switch is Complete; 
-    __builtin_write_OSCCONH((uint8_t) (0x00));
-    __builtin_write_OSCCONL((uint8_t) (0x00));
+    // CF no clock failure; NOSC PRIPLL; CLKLOCK unlocked; OSWEN Switch is Complete; 
+    __builtin_write_OSCCONH((uint8_t) (0x03));
+    __builtin_write_OSCCONL((uint8_t) (0x01));
+    // Wait for Clock switch to occur
+    while (OSCCONbits.OSWEN != 0);
+    while (OSCCONbits.LOCK != 1);
 }
 
 bool CLOCK_AuxPllLockStatusGet(void)

secure_boot_and_secure_firmware_upgrade_over_canfd/app.X/mcc_generated_files/system/src/clock.c

@@ -55,9 +55,9 @@
 #pragma config IESO = OFF    //Two-speed Oscillator Start-up Enable bit->Start up with user-selected oscillator source
 
 // FOSC
-#pragma config POSCMD = NONE    //Primary Oscillator Mode Select bits->Primary Oscillator disabled
+#pragma config POSCMD = EC    //Primary Oscillator Mode Select bits->EC (External Clock) Mode
 #pragma config OSCIOFNC = ON    //OSC2 Pin Function bit->OSC2 is general purpose digital I/O pin
-#pragma config FCKSM = CSDCMD    //Clock Switching Mode bits->Both Clock switching and Fail-safe Clock Monitor are disabled
+#pragma config FCKSM = CSECMD    //Clock Switching Mode bits->Clock switching is enabled,Fail-safe Clock Monitor is disabled
 #pragma config PLLKEN = ON    //PLL Lock Status Control->PLL lock signal will be used to disable PLL clock output if lock is lost
 #pragma config XTCFG = G3    //XT Config->24-32 MHz crystals
 #pragma config XTBST = ENABLE    //XT Boost->Boost the kick-start

secure_boot_and_secure_firmware_upgrade_over_canfd/app.X/mcc_generated_files/system/src/config_bits.c

@@ -98,7 +98,7 @@ void PINS_Initialize(void)
      * Setting the Analog/Digital Configuration SFR(s)
      ***************************************************************************/
     ANSELA = 0x001F;
-    ANSELB = 0x009F;
+    ANSELB = 0x009E;
     ANSELC = 0x00CF;
     ANSELD = 0x2C00;
     ANSELE = 0x000F;

secure_boot_and_secure_firmware_upgrade_over_canfd/app.X/mcc_generated_files/system/src/pins.c

@@ -25,6 +25,20 @@
         </logicalFolder>
       </logicalFolder>
     </logicalFolder>
+    <logicalFolder name="ExternalFiles"
+                   displayName="Important Files"
+                   projectFiles="true">
+      <logicalFolder name="MCC Generated Files"
+                     displayName="MCC Generated Files"
+                     projectFiles="true">
+        <logicalFolder name="boot" displayName="boot" projectFiles="true">
+          <itemPath>mcc_generated_files/boot/postBuild.bat</itemPath>
+          <itemPath>mcc_generated_files/boot/combineAppAndBootloaderHex.bat</itemPath>
+        </logicalFolder>
+      </logicalFolder>
+      <itemPath>Makefile</itemPath>
+      <itemPath>app.mc3</itemPath>
+    </logicalFolder>
     <logicalFolder name="LinkerScript"
                    displayName="Linker Files"
                    projectFiles="true">
@@ -60,20 +74,6 @@
       </logicalFolder>
       <itemPath>main.c</itemPath>
     </logicalFolder>
-    <logicalFolder name="ExternalFiles"
-                   displayName="Important Files"
-                   projectFiles="false">
-      <logicalFolder name="MCC Generated Files"
-                     displayName="MCC Generated Files"
-                     projectFiles="true">
-        <logicalFolder name="boot" displayName="boot" projectFiles="true">
-          <itemPath>mcc_generated_files/boot/postBuild.bat</itemPath>
-          <itemPath>mcc_generated_files/boot/combineAppAndBootloaderHex.bat</itemPath>
-        </logicalFolder>
-      </logicalFolder>
-      <itemPath>Makefile</itemPath>
-      <itemPath>app.mc3</itemPath>
-    </logicalFolder>
   </logicalFolder>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
@@ -113,7 +113,7 @@
         <makeUseCleanTarget>false</makeUseCleanTarget>
         <makeCustomizationPreStep></makeCustomizationPreStep>
         <makeCustomizationPostStepEnabled>true</makeCustomizationPostStepEnabled>
-        <makeCustomizationPostStep>cd mcc_generated_files/boot &amp;&amp; chmod +x postBuild$(ShExtension) &amp;&amp; .$(_/_)postBuild$(ShExtension) $(MP_CC_DIR) ${ProjectDir} ${ImageDir} ${ImageName} ${IsDebug}</makeCustomizationPostStep>
+        <makeCustomizationPostStep>chmod +x mcc_generated_files/boot/postBuild$(ShExtension) &amp;&amp; cd mcc_generated_files/boot &amp;&amp; .$(_/_)postBuild$(ShExtension) $(MP_CC_DIR) ${ProjectDir} ${ImageDir} ${ImageName} ${IsDebug}</makeCustomizationPostStep>
         <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
         <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
         <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>

secure_boot_and_secure_firmware_upgrade_over_canfd/app.X/nbproject/configurations.xml

@@ -1184,7 +1184,7 @@
     "privateKeyPath": "private_key.pem",
     "secureElementStorage": {}
   },
-  "bootloaderFoscValue": 4000000,
+  "bootloaderFoscValue": 100000000,
   "isCodeProtectEnabled": true,
   "isAntiRollBackEnabled": true,
   "downloadStartAddress": 372736,

secure_boot_and_secure_firmware_upgrade_over_canfd/boot.X/boot.mc3

@@ -81,7 +81,7 @@ static const struct SPI1_HOST_CONFIG config[] = {
                                         { 
                                             /*Configuration setting for CrytoAuthenticationLibrary.
                                             SPI Mode : Mode 0, Sampled at : Middle, Clock Frequency : 1000 kHz*/
-                                            0x1,//SPI1BRGL
+                                            0x31,//SPI1BRGL
                                             0x121,//SPI1CON1L
                                         },
                                     };