MPAE-15877 improving the Q10 HPC demo to support new melody

Author: Nicolas Termer

.main-meta/main.json

@@ -2,29 +2,29 @@
     "metaDataVersion": "1.0.0",
     "category": "com.microchip.ide.project",
     "content": {
-        "metaDataVersion": "1.1.0",
+        "metaDataVersion": "1.3.0",
         "name": "com.microchip.mcu8.mplabx.project.pic18f47q10-curiosity-hpc-demo-code",
-        "version": "2.0.0",
+        "version": "2.0.1",
         "displayName": "PIC18F47Q10 High-Pin-Count Curiosity Board Demo Code",
         "projectName": "pic18f47q10-curiosity-hpc-demo-code",
         "shortDescription": "Demo code for HPC board for PIC18-Q10 devices",
         "ide": {
             "name": "MPLAB X",
-            "semverRange": ">=5.45.0"
+            "semverRange": ">=6.10.0"
         },
         "compiler": [
 			{
 				"name": "XC8",
-				"semverRange": "^2.31.0"
+				"semverRange": "^2.41.0"
 			}
 		],
         "dfp": {
             "name": "PIC18F-Q_DFP",
-            "semverRange": "^1.11.185"
+            "semverRange": "^1.18.389"
         },
         "configurator": {
             "name": "MCC",
-            "semverRange": ">=4.1.0"
+            "semverRange": ">=5.3.2"
         },
         "device": {
             "metaDataVersion": "1.0.0",
@@ -37,50 +37,18 @@
             }
         },
         "author": "Microchip",
-        "subcategories": [
-            "MCC",
-            [
-                "Peripherals",
-                "ADCC"
-            ],
-            [
-                "Peripherals",
-                "UART"
-            ],
-            [
-                "Peripherals",
-                "Timer"
-            ],
-            [
-                "Peripherals",
-                "Interrupts"
-            ],
-            [
-                "Peripherals",
-                "Watchdog"
-            ],
-            [
-                "Peripherals",
-                "Sleep"
-            ],
-            [
-                "Peripherals",
-                "PWM"
-            ]
-        ],
         "peripherals": [
             "ADCC",
             "UART",
             "WWDT",
+	    "TMR0",
             "TMR1",
+	    "TMR2",
             "PWM"
         ],
         "keywords": [
-            "Demo Code",
             "Getting Started",
-            "Q10",
-            "PIC18-Q10",
-            "Curiosity Board",
+            "Curiosity",
             "Melody"		
         ],
         "additionalData": {

pic18f47q10-curiosity-hpc-demo-code.X/Labs/Lab02_Blink/Blink.c

@@ -59,15 +59,15 @@ static uint8_t flagCounter = 0;
 void Blink(void) {
     if (labState  == NOT_RUNNING) {
         LEDs_SetLow();
-        Timer1_Start();
+        TMR1_Start();
 
         labState = RUNNING;
     }
 
     if (labState == RUNNING) {
-        while(!Timer1_HasOverflowOccured());   
+        while(!TMR1_HasOverflowOccured());   
         TMR1IF = 0;  
-        Timer1_Reload();
+        TMR1_Reload();
         flagCounter++;
 
         if(flagCounter == FLAG_COUNTER_MAX){       
@@ -77,7 +77,7 @@ void Blink(void) {
     }
 
     if (switchEvent) {
-        Timer1_Stop();
+        TMR1_Stop();
         labState = NOT_RUNNING;
     }
 }

pic18f47q10-curiosity-hpc-demo-code.X/Labs/Lab06_PulseWidthModulation/PWM.c

@@ -61,7 +61,7 @@ void PWM(void) {
     if (labState == NOT_RUNNING) {
         LEDs_SetLow();
         PWM_Output_D5_Enable();
-        Timer2_Start();
+        TMR2_Start();
 
         labState = RUNNING;
     }
@@ -74,7 +74,7 @@ void PWM(void) {
     }
 
     if (switchEvent) {
-        Timer2_Stop();
+        TMR2_Stop();
         PWM_Output_D5_Disable();
         labState = NOT_RUNNING;
     }

pic18f47q10-curiosity-hpc-demo-code.X/Labs/Lab07_Timers/Timers.c

@@ -60,14 +60,14 @@ void Timers(void) {
         //Initialize temporary register to begin at 1
         rotateReg = 1;
 
-        Timer1_Start();
+        TMR1_Start();
         labState = RUNNING;
     }
 
     if (labState == RUNNING) {
-        while(!Timer1_HasOverflowOccured());       
+        while(!TMR1_HasOverflowOccured());       
         TMR1IF = 0;                
-        Timer1_Reload();
+        TMR1_Reload();
 
         rotateReg <<= 1;
 
@@ -81,7 +81,7 @@ void Timers(void) {
     }
 
     if (switchEvent) {
-        Timer1_Stop();
+        TMR1_Stop();
         labState = NOT_RUNNING;
     }
 }

pic18f47q10-curiosity-hpc-demo-code.X/Labs/Lab08_Interrupts/Interrupt.c

@@ -68,7 +68,7 @@ void Interrupt(void) {
         INTERRUPT_PeripheralInterruptEnable();
         INTERRUPT_TMR0InterruptEnable();
 
-        Timer0_OverflowCallbackRegister(LAB_ISR);
+        TMR0_OverflowCallbackRegister(LAB_ISR);
         labState = RUNNING;
     }
 

pic18f47q10-curiosity-hpc-demo-code.X/Labs/Lab10_EEPROM/EEPROM.c

@@ -46,7 +46,7 @@
 /**
   Section: Macro Declaration
  */
-#define EEAddr    0x0000      // EEPROM starting address
+#define EEAddr    0x310000      // EEPROM starting address
 
 /**
   Section: Local Variable Declarations
@@ -68,10 +68,11 @@ void EEPROM(void) {
     if (labState == RUNNING) {
         //Get the top 4 MSBs of the ADC and write them to EEPROM
         adcResult = ADCC_GetSingleConversion(POT_CHANNEL) >> 12;
-        DATAEE_WriteByte(EEAddr, adcResult);
+        NVM_UnlockKeySet(UNLOCK_KEY_WORD_BYTE_WRITE);
+        EEPROM_Write(EEAddr, adcResult);
 
         //Load whatever is in EEPROM to the LED Display
-        ledDisplay = DATAEE_ReadByte(EEAddr);
+        ledDisplay = EEPROM_Read(EEAddr);
 
         //Determine which LEDs will light up
         LEDs = ledDisplay << 4;

pic18f47q10-curiosity-hpc-demo-code.X/defmplabxtrace.log

@@ -0,0 +1,2 @@
+dist/free/debug\doprnt.p1: \
+  C:\Program\ Files\Microchip\xc8\v2.41\pic\sources\c99\common\doprnt.c