Skip to content

Commit e35ac29

Browse files
aiwyatt787davidflowers
authored andcommitted
Pull request #37: Release 1.1.1 - fix missing ADC complete status check
Merge in MCU16CE/dspic33a-curiosity-oob from develop to master * commit '85eddd1ea4b355f36b0dfbd85b5428a04d47de04': (26 commits) Fix to be MISRA compliance Update branch with develop Add fix and bump version Remove old file path and yml files add breaks ahead of pictures. Add documentation to explain where to find additional bit rate settings in PEAK software. switch to BRS transmit Note intended CAN bit rates Add documentation for which CAN IDs are transmit and receive. setup clock for CAN Add CAN demo functionality add pin comments Clock debugging setup CAN TX/RX and transceiver STBY pin Add CAN files call initialize add demo fix pin names for dfp fix uart pins Renamed variables for DFP add documentation for bsp functions. ...
2 parents 0b19a6e + 85eddd1 commit e35ac29

File tree

4 files changed

+96
-87
lines changed

4 files changed

+96
-87
lines changed

.main-meta/main.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"content":{
55
"metaDataVersion":"1.3.0",
66
"name":"com.microchip.mplabx.project.dspic33a-curiosity-oob",
7-
"version":"1.1.0",
7+
"version":"1.1.1",
88
"displayName":"dsPIC33A Curiosity Out of Box Demos",
99
"projectName":"dspic33a-curiosity-oob",
1010
"shortDescription":"dsPIC33A Curiosity Out of Box Demos",

changelog.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
# dspic33a-curiosity-oob v1.1.1
2+
### Release Highlights
3+
1. Add ADC conversion complete check in pot.c
4+
5+
### Features Added\Updated
6+
1. Add ADC conversion complete check in pot.c
7+
18
# dspic33a-curiosity-oob v1.1.0
29
### Release Highlights
310
1. Update dsPIC33AK128MC106 GP DIM demo to use MCC generated peripherals (v1.1.0)
411

5-
612
### Features Added\Updated
713
1. Update dsPIC33AK128MC106 GP DIM demo to use MCC generated peripherals (v1.1.0)
814

+43-43
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
{
2-
"metaDataVersion":"1.0.0",
3-
"category":"com.microchip.ide.project",
4-
"content":{
5-
"metaDataVersion":"1.3.0",
6-
"name":"com.microchip.mplabx.project.dspic33ak128mc106-gp-dim-oob",
7-
"version":"1.1.0",
8-
"displayName":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",
9-
"projectName":"dspic33ak128mc106_gp_dim",
10-
"shortDescription":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",
11-
"ide":{
12-
"name":"MPLABX",
13-
"semverRange":">=6.20.0"
14-
},
15-
"compiler":{
16-
"name":"XCDSC",
17-
"semverRange":"^3.10"
18-
},
19-
"dfp":{
20-
"name":"dsPIC33AK-MC_DFP",
21-
"semverRange":">=1.0.33"
22-
},
23-
"configurator": {
24-
"name": "MCC",
25-
"semverRange": ">=4.0.1"
26-
},
27-
"device":{
28-
"metaDataVersion":"1.0.0",
29-
"category":"com.microchip.portal.contentRef",
30-
"content":{
31-
"metaDataVersion":"1.0.0",
32-
"category":"com.microchip.device",
33-
"name":"dsPIC33AK128MC106",
34-
"versionRange":"*"
35-
}
36-
},
37-
"keywords":[
38-
"ADC",
39-
"PWM",
40-
"UART",
41-
"GPIO"
42-
]
43-
}
1+
{
2+
"metaDataVersion":"1.0.0",
3+
"category":"com.microchip.ide.project",
4+
"content":{
5+
"metaDataVersion":"1.3.0",
6+
"name":"com.microchip.mplabx.project.dspic33ak128mc106-gp-dim-oob",
7+
"version":"1.1.1",
8+
"displayName":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",
9+
"projectName":"dspic33ak128mc106_gp_dim",
10+
"shortDescription":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",
11+
"ide":{
12+
"name":"MPLABX",
13+
"semverRange":">=6.20.0"
14+
},
15+
"compiler":{
16+
"name":"XCDSC",
17+
"semverRange":"^3.10"
18+
},
19+
"dfp":{
20+
"name":"dsPIC33AK-MC_DFP",
21+
"semverRange":">=1.0.33"
22+
},
23+
"configurator": {
24+
"name": "MCC",
25+
"semverRange": ">=4.0.1"
26+
},
27+
"device":{
28+
"metaDataVersion":"1.0.0",
29+
"category":"com.microchip.portal.contentRef",
30+
"content":{
31+
"metaDataVersion":"1.0.0",
32+
"category":"com.microchip.device",
33+
"name":"dsPIC33AK128MC106",
34+
"versionRange":"*"
35+
}
36+
},
37+
"keywords":[
38+
"ADC",
39+
"PWM",
40+
"UART",
41+
"GPIO"
42+
]
43+
}
4444
}
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,45 @@
1-
/*
2-
© [2024] Microchip Technology Inc. and its subsidiaries.
3-
4-
Subject to your compliance with these terms, you may use Microchip
5-
software and any derivatives exclusively with Microchip products.
6-
You are responsible for complying with 3rd party license terms
7-
applicable to your use of 3rd party software (including open source
8-
software) that may accompany Microchip software. SOFTWARE IS ?AS IS.?
9-
NO WARRANTIES, WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS
10-
SOFTWARE, INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT,
11-
MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
12-
WILL MICROCHIP BE LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE,
13-
INCIDENTAL OR CONSEQUENTIAL LOSS, DAMAGE, COST OR EXPENSE OF ANY
14-
KIND WHATSOEVER RELATED TO THE SOFTWARE, HOWEVER CAUSED, EVEN IF
15-
MICROCHIP HAS BEEN ADVISED OF THE POSSIBILITY OR THE DAMAGES ARE
16-
FORESEEABLE. TO THE FULLEST EXTENT ALLOWED BY LAW, MICROCHIP?S
17-
TOTAL LIABILITY ON ALL CLAIMS RELATED TO THE SOFTWARE WILL NOT
18-
EXCEED AMOUNT OF FEES, IF ANY, YOU PAID DIRECTLY TO MICROCHIP FOR
19-
THIS SOFTWARE.
20-
*/
21-
22-
#include "pot.h"
23-
#include "../mcc_generated_files/adc/adc1.h"
24-
#include <xc.h>
25-
26-
void POT_Initialize(void)
27-
{
28-
29-
}
30-
31-
uint16_t POT_Read(void)
32-
{
33-
ADC1.SoftwareTriggerEnable();
34-
return ADC1.ConversionResultGet(ADC1_Channel0);
35-
}
36-
37-
const struct POT pot =
38-
{
39-
&POT_Initialize,
40-
&POT_Read
41-
};
42-
1+
/*
2+
© [2024] Microchip Technology Inc. and its subsidiaries.
3+
4+
Subject to your compliance with these terms, you may use Microchip
5+
software and any derivatives exclusively with Microchip products.
6+
You are responsible for complying with 3rd party license terms
7+
applicable to your use of 3rd party software (including open source
8+
software) that may accompany Microchip software. SOFTWARE IS ?AS IS.?
9+
NO WARRANTIES, WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS
10+
SOFTWARE, INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT,
11+
MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
12+
WILL MICROCHIP BE LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE,
13+
INCIDENTAL OR CONSEQUENTIAL LOSS, DAMAGE, COST OR EXPENSE OF ANY
14+
KIND WHATSOEVER RELATED TO THE SOFTWARE, HOWEVER CAUSED, EVEN IF
15+
MICROCHIP HAS BEEN ADVISED OF THE POSSIBILITY OR THE DAMAGES ARE
16+
FORESEEABLE. TO THE FULLEST EXTENT ALLOWED BY LAW, MICROCHIP?S
17+
TOTAL LIABILITY ON ALL CLAIMS RELATED TO THE SOFTWARE WILL NOT
18+
EXCEED AMOUNT OF FEES, IF ANY, YOU PAID DIRECTLY TO MICROCHIP FOR
19+
THIS SOFTWARE.
20+
*/
21+
22+
#include "pot.h"
23+
#include "../mcc_generated_files/adc/adc1.h"
24+
#include <xc.h>
25+
26+
void POT_Initialize(void)
27+
{
28+
29+
}
30+
31+
uint16_t POT_Read(void)
32+
{
33+
ADC1.SoftwareTriggerEnable();
34+
while(!ADC1.IsConversionComplete)
35+
{
36+
}
37+
return ADC1.ConversionResultGet(ADC1_Channel0);
38+
}
39+
40+
const struct POT pot =
41+
{
42+
&POT_Initialize,
43+
&POT_Read
44+
};
45+

0 commit comments

Comments
 (0)