Pull request #34: Develop

Merge in MCU16CE/dspic33a-curiosity-oob from develop to master

* commit 'b038974f1c09efee878474c787d1798926135fdc':
  Update version numbers and change log
  Restore main back to original state and stub in unused functions in bsp files
  Re-add bsp files and abstract adc calls
  Replace bsp with MCC modules

Author: davidflowers

.main-meta/main.json

@@ -4,7 +4,7 @@
    "content":{
       "metaDataVersion":"1.3.0",
       "name":"com.microchip.mplabx.project.dspic33a-curiosity-oob",
-      "version":"1.0.0",
+      "version":"1.1.0",
       "displayName":"dsPIC33A Curiosity Out of Box Demos",
       "projectName":"dspic33a-curiosity-oob",
       "shortDescription":"dsPIC33A Curiosity Out of Box Demos",

changelog.md

@@ -1,3 +1,11 @@
+# dspic33a-curiosity-oob v1.1.0
+### Release Highlights
+1. Update dsPIC33AK128MC106 GP DIM demo to use MCC generated peripherals (v1.1.0)
+
+
+### Features Added\Updated
+1. Update dsPIC33AK128MC106 GP DIM demo to use MCC generated peripherals (v1.1.0)
+
 # dspic33a-curiosity-oob v1.0.0
 ### Release Highlights
 1. dsPIC33AK128MC106 GP DIM support added

dspic33ak128mc106_gp_dim/.main-meta/main.json

@@ -4,7 +4,7 @@
    "content":{
       "metaDataVersion":"1.3.0",
       "name":"com.microchip.mplabx.project.dspic33ak128mc106-gp-dim-oob",
-      "version":"1.0.0",
+      "version":"1.1.0",
       "displayName":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",
       "projectName":"dspic33ak128mc106_gp_dim",
       "shortDescription":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",

dspic33ak128mc106_gp_dim/dspic33ak128mc106_gp_dim.X/bsp/led_blue.c

@@ -21,63 +21,47 @@
 
 #include <xc.h>
 #include "led_blue.h"
+#include "../mcc_generated_files/pwm/sccp3.h"
 
-void LED_BLUE_Initialize(void)
+static bool issccp3Enabled = false;
+
+void LED_BLUE_Initialize(void) 
 {
-    TRISDbits.TRISD2 = 0;
-    
-    /* PWM control register configuration */
-    PCLKCONbits.MCLKSEL = 0b1;
-    
-    PG1CON = 0;
-    PG1CONbits.CLKSEL = 1;
-    PG1CONbits.MODSEL = 0b000;      /* Independent edge triggered mode */
-       
-    PG1IOCON = 0;
-    PG1IOCONbits.PMOD = 0b10;       /* Independent mode */
-    PG1IOCONbits.PENH = 1;          /* High output enabled */ 
 
-    /* PWM uses PG1DC, PG1PER, PG1PHASE registers */
-    /* PWM Generator does not broadcast UPDATE status bit state or EOC signal */
-    /* Update the data registers at start of next PWM cycle (SOC) */
-    /* PWM Generator operates in Single Trigger mode */
-    /* Start of cycle (SOC) = local EOC */
-    /* Write to DATA REGISTERS */
-    PG1PER = 0x10000; /* PWM frequency */
-    PG1DC = 0x8000;   /* 50% duty */
-
-    PG1CONbits.ON = 0;
 }
 
 void LED_BLUE_On(void)
 {
-    PG1CONbits.ON = 1;
+    SCCP3_PWM_Enable();
+    issccp3Enabled = true;
 }
 
 void LED_BLUE_Off(void)
 {
-    PG1CONbits.ON = 0;
+    SCCP3_PWM_Disable();
+    issccp3Enabled = false;
 }
 
 void LED_BLUE_Toggle(void)
 {
-    PG1CONbits.ON ^= 1;
+    if (issccp3Enabled == true) 
+    {
+        LED_BLUE_Off();
+    } 
+    else 
+    {
+        LED_BLUE_On();
+    }
 }
 
 void LED_BLUE_Set(bool on)
 {
-    PG1CONbits.ON = on;
+    
 }
 
 void LED_BLUE_SetIntensity(uint16_t request)
 {  
-    while(PG1STATbits.UPDATE == 1)
-    {
-    }
-    
-    PG1DC = request;
-    
-    PG1STATbits.UPDREQ = 1;
+    SCCP3_PWM_DutyCycleSet(request);
 } 
 
 const struct LED_DIMMABLE ledBlue = 

dspic33ak128mc106_gp_dim/dspic33ak128mc106_gp_dim.X/bsp/led_green.c

@@ -21,63 +21,47 @@
 
 #include <xc.h>
 #include "led_green.h"
+#include "../mcc_generated_files/pwm/sccp2.h"
+
+static bool issccp2Enabled = false;
 
 void LED_GREEN_Initialize(void)
 {
-    TRISDbits.TRISD0 = 0;
-    
-    /* PWM control register configuration */
-    PCLKCONbits.MCLKSEL = 0b1;
-    
-    PG2CON = 0;
-    PG2CONbits.CLKSEL = 1;
-    PG2CONbits.MODSEL = 0b000;      /* Independent edge triggered mode */
-       
-    PG2IOCON = 0;
-    PG2IOCONbits.PMOD = 0b10;       /* Independent mode */
-    PG2IOCONbits.PENH = 1;          /* High output enabled */ 
 
-    /* PWM uses PG2DC, PG2PER, PG2PHASE registers */
-    /* PWM Generator does not broadcast UPDATE status bit state or EOC signal */
-    /* Update the data registers at start of next PWM cycle (SOC) */
-    /* PWM Generator operates in Single Trigger mode */
-    /* Start of cycle (SOC) = local EOC */
-    /* Write to DATA REGISTERS */
-    PG2PER = 0x10000; /* PWM frequency */
-    PG2DC = 0x8000;   /* 50% duty */
-
-    PG2CONbits.ON = 0;
 }
 
 void LED_GREEN_On(void)
 {
-    PG2CONbits.ON = 1;
+    SCCP2_PWM_Enable();
+    issccp2Enabled = true;
 }
 
 void LED_GREEN_Off(void)
 {
-    PG2CONbits.ON = 0;
+    SCCP2_PWM_Disable();
+    issccp2Enabled = false;
 }
 
 void LED_GREEN_Toggle(void)
 {
-    PG2CONbits.ON ^= 1;
+    if (issccp2Enabled == true) 
+    {
+        LED_GREEN_Off();
+    } 
+    else 
+    {
+        LED_GREEN_On();
+    }
 }
 
 void LED_GREEN_Set(bool on)
 {
-    PG2CONbits.ON = on;
+    
 }
 
 void LED_GREEN_SetIntensity(uint16_t request)
 {  
-    while(PG2STATbits.UPDATE == 1)
-    {
-    }
-    
-    PG2DC = request;
-    
-    PG2STATbits.UPDREQ = 1;
+    SCCP2_PWM_DutyCycleSet(request);
 } 
 
 const struct LED_DIMMABLE ledGreen = 

dspic33ak128mc106_gp_dim/dspic33ak128mc106_gp_dim.X/bsp/led_red.c

@@ -21,63 +21,47 @@
 
 #include <xc.h>
 #include "led_red.h"
+#include "../mcc_generated_files/pwm/sccp1.h"
+
+static bool issccp1Enabled = false;
 
 void LED_RED_Initialize(void)
 {
-    TRISCbits.TRISC2 = 0;
-    
-    /* PWM control register configuration */
-    PCLKCONbits.MCLKSEL = 0b1;
-    
-    PG4CON = 0;
-    PG4CONbits.CLKSEL = 1;
-    PG4CONbits.MODSEL = 0b000;      /* Independent edge triggered mode */
-       
-    PG4IOCON = 0;
-    PG4IOCONbits.PMOD = 0b10;       /* Independent mode */
-    PG4IOCONbits.PENH = 1;          /* High output enabled */ 
 
-    /* PWM uses PG4DC, PG4PER, PG4PHASE registers */
-    /* PWM Generator does not broadcast UPDATE status bit state or EOC signal */
-    /* Update the data registers at start of next PWM cycle (SOC) */
-    /* PWM Generator operates in Single Trigger mode */
-    /* Start of cycle (SOC) = local EOC */
-    /* Write to DATA REGISTERS */
-    PG4PER = 0x10000; /* PWM frequency */
-    PG4DC = 0x8000;   /* 50% duty */
-
-    PG4CONbits.ON = 0;
 }
 
 void LED_RED_On(void)
 {
-    PG4CONbits.ON = 1;
+    SCCP1_PWM_Enable();
+    issccp1Enabled = true;
 }
 
 void LED_RED_Off(void)
 {
-    PG4CONbits.ON = 0;
+    SCCP1_PWM_Disable();
+    issccp1Enabled = false;
 }
 
 void LED_RED_Toggle(void)
 {
-    PG4CONbits.ON ^= 1;
+    if (issccp1Enabled == true) 
+    {
+        LED_RED_Off();
+    } 
+    else 
+    {
+        LED_RED_On();
+    }
 }
 
-void LED_RED_Set(bool on)
+void LED_RED_Set(bool on) 
 {
-    PG4CONbits.ON = on;
+    
 }
 
 void LED_RED_SetIntensity(uint16_t request)
 {  
-    while(PG4STATbits.UPDATE == 1)
-    {
-    }
-    
-    PG4DC = request;
-    
-    PG4STATbits.UPDREQ = 1;
+    SCCP1_PWM_DutyCycleSet(request);
 } 
 
 const struct LED_DIMMABLE ledRed = 

dspic33ak128mc106_gp_dim/dspic33ak128mc106_gp_dim.X/bsp/led_rgb.c

@@ -29,9 +29,7 @@
 
 void LED_RGB_Initialize(void)
 {
-    ledRed.initialize();
-    ledGreen.initialize();
-    ledBlue.initialize();
+
 }
 
 void LED_RGB_On(void)
@@ -57,9 +55,7 @@ void LED_RGB_Toggle(void)
 
 void LED_RGB_Set(bool on)
 {
-    ledRed.set(on);
-    ledGreen.set(on);
-    ledBlue.set(on);
+
 }
 
 void LED_RGB_SetColor(uint8_t red, uint8_t green, uint8_t blue)

dspic33ak128mc106_gp_dim/dspic33ak128mc106_gp_dim.X/bsp/pot.c

@@ -20,56 +20,18 @@
 */
 
 #include "pot.h"
+#include "../mcc_generated_files/adc/adc1.h"
 #include <xc.h>
 
 void POT_Initialize(void)
 {
-    // In this example channel 4 will be used.
-    // Oversampling conversion mode.
-    AD1CH1CONbits.MODE = 3;
-    // Set number of conversions accumulated to 256.
-    AD1CH1CONbits.ACCNUM = 2;
-    // The oversampling if started cannot be interrupted
-    // by a high priority channels conversion requests.
-    AD1CH1CONbits.ACCBRST = 1;
 
-    // Software trigger will start a conversion.
-    AD1CH1CONbits.TRG1SRC = 1; 
-    
-     // Re-trigger back to back.
-    AD1CH1CONbits.TRG2SRC = 2;
-    
-    // Use a single ended input.
-    AD1CH1CONbits.DIFF = 0;
-    // Select the AN6 analog positive input/pin for the signal.
-    AD1CH1CONbits.PINSEL = 6;
-    // Select the GND as negative input/pin for the signal.
-    AD1CH1CONbits.NINSEL = 0;
-    // Select signal sampling time (6.5 TADs = 81 nS).
-    AD1CH1CONbits.SAMC = 3;
-    // Set ADC to RUN mode.
-    AD1CONbits.MODE = 2;
-    // Enable ADC.
-    AD1CONbits.ON = 1;
-    
-    // Wait when ADC will be ready/calibrated.
-    while(AD1CONbits.ADRDY == 0)
-    {
-    }
 }
 
 uint16_t POT_Read(void)
 {
-    // Trigger channel #1 in software and wait for the result.
-    AD1SWTRGbits.CH1TRG = 1;
-    // Wait for a conversion ready flag.
-    while(AD1STATbits.CH1RDY == 0)
-    {
-    }
-    
-    // Read result. It will clear the conversion ready flag.
-    // Convert to 16-bit value.
-    return AD1CH1DATA<<1;
+    ADC1.SoftwareTriggerEnable();
+    return ADC1.ConversionResultGet(ADC1_Channel0);
 }
 
 const struct POT pot =