You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/11/29 15:53:21 UTC
[incubator-nuttx] branch master updated (87dff7c -> 2ce0dff)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 87dff7c Fix nxstyle warning
new cbab6b7 nrf52 ADC: minor fixes
new 2ce0dff nrf52 ADC: pass configuration struct as const
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/nrf52/nrf52_adc.c | 30 +++++++++++++++++++-----------
arch/arm/src/nrf52/nrf52_adc.h | 5 +++--
2 files changed, 22 insertions(+), 13 deletions(-)
[incubator-nuttx] 01/02: nrf52 ADC: minor fixes
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit cbab6b79da04270bf4173fafb6b95d444cb0d4fb
Author: Matias N <ma...@protobits.dev>
AuthorDate: Sat Nov 21 18:17:48 2020 -0300
nrf52 ADC: minor fixes
---
arch/arm/src/nrf52/nrf52_adc.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/arch/arm/src/nrf52/nrf52_adc.c b/arch/arm/src/nrf52/nrf52_adc.c
index 621d296..4e14186 100644
--- a/arch/arm/src/nrf52/nrf52_adc.c
+++ b/arch/arm/src/nrf52/nrf52_adc.c
@@ -280,6 +280,10 @@ static int nrf52_adc_configure(FAR struct nrf52_adc_s *priv)
static int nrf52_adc_calibrate(FAR struct nrf52_adc_s *priv)
{
+ /* Clear Event */
+
+ nrf52_adc_putreg(priv, NRF52_SAADC_EVENTS_CALDONE_OFFSET, 0);
+
/* Start calibration */
nrf52_adc_putreg(priv, NRF52_SAADC_TASKS_CALOFFSET_OFFSET, 1);
@@ -648,7 +652,7 @@ static int nrf52_adc_chancfg(FAR struct nrf52_adc_s *priv, uint8_t chan,
/* Configure negative input */
- regval = nrf52_adc_chanpsel(cfg->p_psel);
+ regval = nrf52_adc_chanpsel(cfg->n_psel);
nrf52_adc_putreg(priv, NRF52_SAADC_CHPSELN_OFFSET(chan), regval);
/* Get channel configuration */
@@ -732,16 +736,16 @@ static int nrf52_adc_setup(FAR struct adc_dev_s *dev)
DEBUGASSERT(dev);
DEBUGASSERT(priv);
- /* Enable ADC */
+ /* Disable ADC */
- nrf52_adc_putreg(priv, NRF52_SAADC_ENABLE_OFFSET, 1);
+ nrf52_adc_putreg(priv, NRF52_SAADC_ENABLE_OFFSET, 0);
- /* Calibrate ADC */
+ /* Configure ADC */
- ret = nrf52_adc_calibrate(priv);
+ ret = nrf52_adc_configure(priv);
if (ret < 0)
{
- aerr("ERROR: adc calibration failed: %d\n", ret);
+ aerr("ERROR: nrf52_adc_configure failed: %d\n", ret);
goto errout;
}
@@ -757,12 +761,16 @@ static int nrf52_adc_setup(FAR struct adc_dev_s *dev)
}
}
- /* Confgiure ADC */
+ /* Enable ADC */
- ret = nrf52_adc_configure(priv);
+ nrf52_adc_putreg(priv, NRF52_SAADC_ENABLE_OFFSET, 1);
+
+ /* Calibrate ADC */
+
+ ret = nrf52_adc_calibrate(priv);
if (ret < 0)
{
- aerr("ERROR: nrf52_adc_configure failed: %d\n", ret);
+ aerr("ERROR: adc calibration failed: %d\n", ret);
goto errout;
}
[incubator-nuttx] 02/02: nrf52 ADC: pass configuration struct as
const
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2ce0dfffaf47d0fcb7b8bf5a1228873fc73ce401
Author: Matias N <ma...@protobits.dev>
AuthorDate: Fri Nov 6 13:12:15 2020 -0300
nrf52 ADC: pass configuration struct as const
---
arch/arm/src/nrf52/nrf52_adc.c | 4 ++--
arch/arm/src/nrf52/nrf52_adc.h | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/nrf52/nrf52_adc.c b/arch/arm/src/nrf52/nrf52_adc.c
index 4e14186..1b82fdf 100644
--- a/arch/arm/src/nrf52/nrf52_adc.c
+++ b/arch/arm/src/nrf52/nrf52_adc.c
@@ -912,8 +912,8 @@ static int nrf52_adc_ioctl(FAR struct adc_dev_s *dev, int cmd,
*
****************************************************************************/
-struct adc_dev_s *nrf52_adcinitialize(FAR struct nrf52_adc_channel_s *chan,
- int channels)
+struct adc_dev_s *nrf52_adcinitialize(
+ FAR const struct nrf52_adc_channel_s *chan, int channels)
{
FAR struct adc_dev_s *dev = NULL;
FAR struct nrf52_adc_s *priv = NULL;
diff --git a/arch/arm/src/nrf52/nrf52_adc.h b/arch/arm/src/nrf52/nrf52_adc.h
index 53bef1c..28d3d6c 100644
--- a/arch/arm/src/nrf52/nrf52_adc.h
+++ b/arch/arm/src/nrf52/nrf52_adc.h
@@ -155,7 +155,8 @@ struct nrf52_adc_channel_s
*
****************************************************************************/
-struct adc_dev_s *nrf52_adcinitialize(FAR struct nrf52_adc_channel_s *chan,
- int channels);
+struct adc_dev_s *nrf52_adcinitialize(
+ FAR const struct nrf52_adc_channel_s *chan,
+ int channels);
#endif /* __ARCH_ARM_SRC_NRF52_NRF52_ADC_H */