Skip to content

Commit bd43639

Browse files
aiwyatt787davidflowers
authored andcommitted
Pull request #40: Release 1.1.2 - fix call to ADC complete status check
Merge in MCU16CE/dspic33a-curiosity-oob from develop to master * commit '47884c7d942a613e6bcbf4984b08baa037388452': Add channel param Remove extra period Fix ADC call to check the value of the function pointer rather than the value of the pointer
2 parents e35ac29 + 47884c7 commit bd43639

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
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.1",
7+
"version":"1.1.2",
88
"displayName":"dsPIC33A Curiosity Out of Box Demos",
99
"projectName":"dspic33a-curiosity-oob",
1010
"shortDescription":"dsPIC33A Curiosity Out of Box Demos",

changelog.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# dspic33a-curiosity-oob v1.1.2
2+
### Release Highlights
3+
1. Correct ADC conversion complete check in pot.c
4+
5+
### Features Added\Updated
6+
1. Correct ADC conversion complete check in pot.c
7+
18
# dspic33a-curiosity-oob v1.1.1
29
### Release Highlights
310
1. Add ADC conversion complete check in pot.c

dspic33ak128mc106_gp_dim/.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.dspic33ak128mc106-gp-dim-oob",
7-
"version":"1.1.1",
7+
"version":"1.1.2",
88
"displayName":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",
99
"projectName":"dspic33ak128mc106_gp_dim",
1010
"shortDescription":"dsPIC33AK128MC106 GP DIM Curiosity Out of Box Demo",

dspic33ak128mc106_gp_dim/dspic33ak128mc106_gp_dim.X/bsp/pot.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void POT_Initialize(void)
3131
uint16_t POT_Read(void)
3232
{
3333
ADC1.SoftwareTriggerEnable();
34-
while(!ADC1.IsConversionComplete)
34+
while(!ADC1.IsConversionComplete(ADC1_Channel0))
3535
{
3636
}
3737
return ADC1.ConversionResultGet(ADC1_Channel0);

0 commit comments

Comments
 (0)