adc: refactor into arch-specific directories

This commit is contained in:
Beat Küng
2019-08-26 14:21:49 +02:00
parent ab43a83bed
commit 1cb6c36a00
57 changed files with 786 additions and 806 deletions
+1 -1
View File
@@ -15,6 +15,7 @@ px4_add_board(
TEL2:/dev/ttyS2
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_trigger
@@ -41,7 +42,6 @@ px4_add_board(
px4fmu
rc_input
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -16,6 +16,7 @@ px4_add_board(
TEL2:/dev/ttyS2
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -47,7 +48,6 @@ px4_add_board(
px4io
roboclaw
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -48,7 +49,6 @@ px4_add_board(
rc_input
#roboclaw
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -17,6 +17,7 @@ px4_add_board(
# /dev/ttyS5: UART7 (ESC telemetry)
DRIVERS
adc
barometer/bmp280
gps
imu/mpu6000
@@ -26,7 +27,6 @@ px4_add_board(
px4fmu
rc_input
stm32
stm32/adc
telemetry
tone_alarm
osd
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
#FRSKY:/dev/ttyS5
DRIVERS
adc
#barometer # all available barometer drivers
#barometer/dps310
batt_smbus
@@ -50,7 +51,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -15,6 +15,7 @@ px4_add_board(
TEL2:/dev/ttyS1
DRIVERS
adc
barometer # all available barometer drivers
barometer/mpl3115a2
batt_smbus
@@ -31,7 +32,6 @@ px4_add_board(
imu/mpu9250
irlock
kinetis
kinetis/adc
lights/blinkm
lights/oreoled
lights/rgbled
+1 -1
View File
@@ -12,6 +12,7 @@ px4_add_board(
URT6:/dev/ttyS2
DRIVERS
adc
#barometer # all available barometer drivers
barometer/bmp280
#batt_smbus
@@ -36,7 +37,6 @@ px4_add_board(
px4fmu
rc_input
stm32
stm32/adc
#tap_esc
#telemetry # all available telemetry drivers
telemetry/frsky_telemetry
+1 -1
View File
@@ -20,6 +20,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
#batt_smbus
@@ -56,7 +57,6 @@ px4_add_board(
px4io
#roboclaw
stm32
stm32/adc
#tap_esc
#telemetry # all available telemetry drivers
#test_ppm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
batt_smbus
@@ -36,7 +37,6 @@ px4_add_board(
px4fmu
px4io
stm32
stm32/adc
#telemetry # all available telemetry drivers
telemetry/iridiumsbd
tone_alarm
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
#batt_smbus
@@ -52,7 +53,6 @@ px4_add_board(
px4fmu
px4io
stm32
stm32/adc
#tap_esc
#telemetry # all available telemetry drivers
#test_ppm
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
barometer/ms5611
#batt_smbus
camera_capture
@@ -36,7 +37,6 @@ px4_add_board(
px4fmu
px4io
stm32
stm32/adc
tone_alarm
MODULES
+1 -1
View File
@@ -16,6 +16,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
barometer/ms5611
batt_smbus
camera_capture
@@ -32,7 +33,6 @@ px4_add_board(
px4fmu
px4io
stm32
stm32/adc
tone_alarm
MODULES
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
#batt_smbus
@@ -52,7 +53,6 @@ px4_add_board(
px4fmu
px4io
stm32
stm32/adc
#tap_esc
#telemetry # all available telemetry drivers
#test_ppm
+1 -1
View File
@@ -20,6 +20,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -55,7 +56,6 @@ px4_add_board(
px4io
roboclaw
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -20,6 +20,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
px4io
roboclaw
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -20,6 +20,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
px4io
roboclaw
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -16,6 +16,7 @@ px4_add_board(
TEL2:/dev/ttyS2
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -40,7 +41,6 @@ px4_add_board(
rc_input
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -16,6 +16,7 @@ px4_add_board(
TEL2:/dev/ttyS2
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -42,7 +43,6 @@ px4_add_board(
rc_input
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -16,6 +16,7 @@ px4_add_board(
TEL2:/dev/ttyS2
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -40,7 +41,6 @@ px4_add_board(
rc_input
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -53,7 +54,6 @@ px4_add_board(
px4io
roboclaw
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
TEL4:/dev/ttyS6
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_trigger
@@ -52,7 +53,6 @@ px4_add_board(
px4io
roboclaw
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -17,6 +17,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -38,7 +39,6 @@ px4_add_board(
rc_input
safety_button
stm32
stm32/adc
telemetry # all available telemetry drivers
tone_alarm
uavcan
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -42,7 +43,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
tone_alarm
+1 -1
View File
@@ -17,6 +17,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -42,7 +43,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
telemetry # all available telemetry drivers
tone_alarm
uavcan
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -52,7 +53,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -52,7 +53,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
GPS2:/dev/ttyS0
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
GPS2:/dev/ttyS0
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -48,7 +49,6 @@ px4_add_board(
rc_input
safety_button
stm32
stm32/adc
telemetry # all available telemetry drivers
tone_alarm
uavcan
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
GPS2:/dev/ttyS0
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -49,7 +50,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
tone_alarm
+1 -1
View File
@@ -18,6 +18,7 @@ px4_add_board(
GPS2:/dev/ttyS0
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -52,7 +53,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
telemetry # all available telemetry drivers
tone_alarm
uavcan
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
GPS2:/dev/ttyS0
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -19,6 +19,7 @@ px4_add_board(
GPS2:/dev/ttyS0
DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
@@ -54,7 +55,6 @@ px4_add_board(
roboclaw
safety_button
stm32
stm32/adc
tap_esc
telemetry # all available telemetry drivers
test_ppm
+1 -1
View File
@@ -16,6 +16,7 @@ px4_add_board(
TEL2:/dev/ttyS2
DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
batt_smbus
@@ -46,7 +47,6 @@ px4_add_board(
px4fmu
rc_input
stm32
stm32/adc
#tap_esc
telemetry # all available telemetry drivers
#test_ppm
@@ -0,0 +1,40 @@
/****************************************************************************
*
* Copyright (c) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#pragma once
#if SYSTEM_ADC_BASE == HW_REV_VER_ADC_BASE
# define SYSTEM_ADC_COUNT 1
#else
# define SYSTEM_ADC_COUNT 2
#endif
@@ -1,6 +1,6 @@
############################################################################
#
# Copyright (c) 2015 PX4 Development Team. All rights reserved.
# Copyright (c) 2015-2019 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -31,9 +31,6 @@
#
############################################################################
px4_add_module(
MODULE drivers__adc
MAIN adc
SRCS
adc.cpp
)
px4_add_library(arch_adc
adc.cpp
)
@@ -0,0 +1,182 @@
/****************************************************************************
*
* Copyright (C) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#include <board_config.h>
#include <drivers/drv_adc.h>
#include <drivers/drv_hrt.h>
#include <nuttx/analog/adc.h>
#include <kinetis.h>
#include <chip/kinetis_sim.h>
#include <chip/kinetis_adc.h>
#define _REG(_addr) (*(volatile uint32_t *)(_addr))
/* ADC register accessors */
#define REG(a, _reg) _REG(KINETIS_ADC##a##_BASE + (_reg))
#define rSC1A(adc) REG(adc, KINETIS_ADC_SC1A_OFFSET) /* ADC status and control registers 1 */
#define rSC1B(adc) REG(adc, KINETIS_ADC_SC1B_OFFSET) /* ADC status and control registers 1 */
#define rCFG1(adc) REG(adc, KINETIS_ADC_CFG1_OFFSET) /* ADC configuration register 1 */
#define rCFG2(adc) REG(adc, KINETIS_ADC_CFG2_OFFSET) /* Configuration register 2 */
#define rRA(adc) REG(adc, KINETIS_ADC_RA_OFFSET) /* ADC data result register */
#define rRB(adc) REG(adc, KINETIS_ADC_RB_OFFSET) /* ADC data result register */
#define rCV1(adc) REG(adc, KINETIS_ADC_CV1_OFFSET) /* Compare value registers */
#define rCV2(adc) REG(adc, KINETIS_ADC_CV2_OFFSET) /* Compare value registers */
#define rSC2(adc) REG(adc, KINETIS_ADC_SC2_OFFSET) /* Status and control register 2 */
#define rSC3(adc) REG(adc, KINETIS_ADC_SC3_OFFSET) /* Status and control register 3 */
#define rOFS(adc) REG(adc, KINETIS_ADC_OFS_OFFSET) /* ADC offset correction register */
#define rPG(adc) REG(adc, KINETIS_ADC_PG_OFFSET) /* ADC plus-side gain register */
#define rMG(adc) REG(adc, KINETIS_ADC_MG_OFFSET) /* ADC minus-side gain register */
#define rCLPD(adc) REG(adc, KINETIS_ADC_CLPD_OFFSET) /* ADC plus-side general calibration value register */
#define rCLPS(adc) REG(adc, KINETIS_ADC_CLPS_OFFSET) /* ADC plus-side general calibration value register */
#define rCLP4(adc) REG(adc, KINETIS_ADC_CLP4_OFFSET) /* ADC plus-side general calibration value register */
#define rCLP3(adc) REG(adc, KINETIS_ADC_CLP3_OFFSET) /* ADC plus-side general calibration value register */
#define rCLP2(adc) REG(adc, KINETIS_ADC_CLP2_OFFSET) /* ADC plus-side general calibration value register */
#define rCLP1(adc) REG(adc, KINETIS_ADC_CLP1_OFFSET) /* ADC plus-side general calibration value register */
#define rCLP0(adc) REG(adc, KINETIS_ADC_CLP0_OFFSET) /* ADC plus-side general calibration value register */
#define rCLMD(adc) REG(adc, KINETIS_ADC_CLMD_OFFSET) /* ADC minus-side general calibration value register */
#define rCLMS(adc) REG(adc, KINETIS_ADC_CLMS_OFFSET) /* ADC minus-side general calibration value register */
#define rCLM4(adc) REG(adc, KINETIS_ADC_CLM4_OFFSET) /* ADC minus-side general calibration value register */
#define rCLM3(adc) REG(adc, KINETIS_ADC_CLM3_OFFSET) /* ADC minus-side general calibration value register */
#define rCLM2(adc) REG(adc, KINETIS_ADC_CLM2_OFFSET) /* ADC minus-side general calibration value register */
#define rCLM1(adc) REG(adc, KINETIS_ADC_CLM1_OFFSET) /* ADC minus-side general calibration value register */
#define rCLM0(adc) REG(adc, KINETIS_ADC_CLM0_OFFSET) /* ADC minus-side general calibration value register */
int px4_arch_adc_init(uint32_t base_address)
{
/* Input is Buss Clock 56 Mhz We will use /8 for 7 Mhz */
irqstate_t flags = px4_enter_critical_section();
_REG(KINETIS_SIM_SCGC3) |= SIM_SCGC3_ADC1;
rCFG1(1) = ADC_CFG1_ADICLK_BUSCLK | ADC_CFG1_MODE_1213BIT | ADC_CFG1_ADIV_DIV8;
rCFG2(1) = 0;
rSC2(1) = ADC_SC2_REFSEL_DEFAULT;
px4_leave_critical_section(flags);
/* Clear the CALF and begin the calibration */
rSC3(1) = ADC_SC3_CAL | ADC_SC3_CALF;
while ((rSC1A(1) & ADC_SC1_COCO) == 0) {
usleep(100);
if (rSC3(1) & ADC_SC3_CALF) {
return -1;
}
}
/* dummy read to clear COCO of calibration */
int32_t r = rRA(1);
/* Check the state of CALF at the end of calibration */
if (rSC3(1) & ADC_SC3_CALF) {
return -1;
}
/* Calculate the calibration values for single ended positive */
r = rCLP0(1) + rCLP1(1) + rCLP2(1) + rCLP3(1) + rCLP4(1) + rCLPS(1) ;
r = 0x8000U | (r >> 1U);
rPG(1) = r;
/* Calculate the calibration values for double ended Negitive */
r = rCLM0(1) + rCLM1(1) + rCLM2(1) + rCLM3(1) + rCLM4(1) + rCLMS(1) ;
r = 0x8000U | (r >> 1U);
rMG(1) = r;
/* kick off a sample and wait for it to complete */
hrt_abstime now = hrt_absolute_time();
rSC1A(1) = ADC_SC1_ADCH(ADC_SC1_ADCH_TEMP);
while (!(rSC1A(1) & ADC_SC1_COCO)) {
/* don't wait for more than 500us, since that means something broke - should reset here if we see this */
if ((hrt_absolute_time() - now) > 500) {
return -1;
}
}
return 0;
}
void px4_arch_adc_uninit(uint32_t base_address)
{
irqstate_t flags = px4_enter_critical_section();
_REG(KINETIS_SIM_SCGC3) &= ~SIM_SCGC3_ADC1;
px4_leave_critical_section(flags);
}
uint16_t px4_arch_adc_sample(uint32_t base_address, unsigned channel)
{
irqstate_t flags = px4_enter_critical_section();
/* clear any previous COCC */
rRA(1);
/* run a single conversion right now - should take about 35 cycles (5 microseconds) max */
rSC1A(1) = ADC_SC1_ADCH(channel);
/* wait for the conversion to complete */
const hrt_abstime now = hrt_absolute_time();
while (!(rSC1A(1) & ADC_SC1_COCO)) {
/* don't wait for more than 10us, since that means something broke - should reset here if we see this */
if ((hrt_absolute_time() - now) > 10) {
px4_leave_critical_section(flags);
return 0xffff;
}
}
/* read the result and clear EOC */
uint16_t result = rRA(1);
px4_leave_critical_section(flags);
return result;
}
uint32_t px4_arch_adc_temp_sensor_mask()
{
return 1 << (ADC_SC1_ADCH_TEMP >> ADC_SC1_ADCH_SHIFT);
}
@@ -0,0 +1,41 @@
/****************************************************************************
*
* Copyright (c) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#pragma once
#include <board_config.h>
#define SYSTEM_ADC_BASE 0 // not used on kinetis
#include "../../common/px4_platform_adc.h"
@@ -32,6 +32,7 @@
############################################################################
add_subdirectory(../common/adc adc)
add_subdirectory(../common/tone_alarm tone_alarm)
@@ -0,0 +1,36 @@
/****************************************************************************
*
* Copyright (c) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#pragma once
#include "../common/px4_arch_adc.h"
@@ -0,0 +1,36 @@
############################################################################
#
# Copyright (c) 2015-2019 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name PX4 nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
px4_add_library(arch_adc
adc.cpp
)
@@ -0,0 +1,229 @@
/****************************************************************************
*
* Copyright (C) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#include <board_config.h>
#include <drivers/drv_adc.h>
#include <drivers/drv_hrt.h>
#include <stm32_adc.h>
#include <stm32_gpio.h>
/*
* Register accessors.
* For now, no reason not to just use ADC1.
*/
#define REG(base, _reg) (*(volatile uint32_t *)((base) + (_reg)))
#define rSR(base) REG((base), STM32_ADC_SR_OFFSET)
#define rCR1(base) REG((base), STM32_ADC_CR1_OFFSET)
#define rCR2(base) REG((base), STM32_ADC_CR2_OFFSET)
#define rSMPR1(base) REG((base), STM32_ADC_SMPR1_OFFSET)
#define rSMPR2(base) REG((base), STM32_ADC_SMPR2_OFFSET)
#define rJOFR1(base) REG((base), STM32_ADC_JOFR1_OFFSET)
#define rJOFR2(base) REG((base), STM32_ADC_JOFR2_OFFSET)
#define rJOFR3(base) REG((base), STM32_ADC_JOFR3_OFFSET)
#define rJOFR4(base) REG((base), STM32_ADC_JOFR4_OFFSET)
#define rHTR(base) REG((base), STM32_ADC_HTR_OFFSET)
#define rLTR(base) REG((base), STM32_ADC_LTR_OFFSET)
#define rSQR1(base) REG((base), STM32_ADC_SQR1_OFFSET)
#define rSQR2(base) REG((base), STM32_ADC_SQR2_OFFSET)
#define rSQR3(base) REG((base), STM32_ADC_SQR3_OFFSET)
#define rJSQR(base) REG((base), STM32_ADC_JSQR_OFFSET)
#define rJDR1(base) REG((base), STM32_ADC_JDR1_OFFSET)
#define rJDR2(base) REG((base), STM32_ADC_JDR2_OFFSET)
#define rJDR3(base) REG((base), STM32_ADC_JDR3_OFFSET)
#define rJDR4(base) REG((base), STM32_ADC_JDR4_OFFSET)
#define rDR(base) REG((base), STM32_ADC_DR_OFFSET)
#ifdef STM32_ADC_CCR
# define rCCR(base) REG((base), STM32_ADC_CCR_OFFSET)
/* Assuming VDC 2.4 - 3.6 */
#define ADC_MAX_FADC 36000000
# if STM32_PCLK2_FREQUENCY/2 <= ADC_MAX_FADC
# define ADC_CCR_ADCPRE_DIV ADC_CCR_ADCPRE_DIV2
# elif STM32_PCLK2_FREQUENCY/4 <= ADC_MAX_FADC
# define ADC_CCR_ADCPRE_DIV ADC_CCR_ADCPRE_DIV4
# elif STM32_PCLK2_FREQUENCY/6 <= ADC_MAX_FADC
# define ADC_CCR_ADCPRE_DIV ADC_CCR_ADCPRE_DIV6
# elif STM32_PCLK2_FREQUENCY/8 <= ADC_MAX_FADC
# define ADC_CCR_ADCPRE_DIV ADC_CCR_ADCPRE_DIV8
# else
# error "ADC PCLK2 too high - no divisor found "
# endif
#endif
int px4_arch_adc_init(uint32_t base_address)
{
/* Perform ADC init once per ADC */
static uint32_t once[SYSTEM_ADC_COUNT] {};
uint32_t *free = nullptr;
for (uint32_t i = 0; i < SYSTEM_ADC_COUNT; i++) {
if (once[i] == base_address) {
/* This one was done already */
return OK;
}
/* Use first free slot */
if (free == nullptr && once[i] == 0) {
free = &once[i];
}
}
if (free == nullptr) {
/* ADC misconfigured SYSTEM_ADC_COUNT too small */;
PANIC();
}
*free = base_address;
/* do calibration if supported */
#ifdef ADC_CR2_CAL
rCR2(base_address) |= ADC_CR2_CAL;
px4_usleep(100);
if (rCR2(base_address) & ADC_CR2_CAL) {
return -1;
}
#endif
/* arbitrarily configure all channels for 55 cycle sample time */
rSMPR1(base_address) = 0b00000011011011011011011011011011;
rSMPR2(base_address) = 0b00011011011011011011011011011011;
/* XXX for F2/4, might want to select 12-bit mode? */
rCR1(base_address) = 0;
/* enable the temperature sensor / Vrefint channel if supported*/
rCR2(base_address) =
#ifdef ADC_CR2_TSVREFE
/* enable the temperature sensor in CR2 */
ADC_CR2_TSVREFE |
#endif
0;
/* Soc have CCR */
#ifdef STM32_ADC_CCR
# ifdef ADC_CCR_TSVREFE
/* enable temperature sensor in CCR */
rCCR(base_address) = ADC_CCR_TSVREFE | ADC_CCR_ADCPRE_DIV;
# else
rCCR(base_address) = ADC_CCR_ADCPRE_DIV;
# endif
#endif
/* configure for a single-channel sequence */
rSQR1(base_address) = 0;
rSQR2(base_address) = 0;
rSQR3(base_address) = 0; /* will be updated with the channel each tick */
/* power-cycle the ADC and turn it on */
rCR2(base_address) &= ~ADC_CR2_ADON;
px4_usleep(10);
rCR2(base_address) |= ADC_CR2_ADON;
px4_usleep(10);
rCR2(base_address) |= ADC_CR2_ADON;
px4_usleep(10);
/* kick off a sample and wait for it to complete */
hrt_abstime now = hrt_absolute_time();
rCR2(base_address) |= ADC_CR2_SWSTART;
while (!(rSR(base_address) & ADC_SR_EOC)) {
/* don't wait for more than 500us, since that means something broke - should reset here if we see this */
if ((hrt_absolute_time() - now) > 500) {
return -1;
}
}
return 0;
}
void px4_arch_adc_uninit(uint32_t base_address)
{
// nothing to do
}
uint16_t px4_arch_adc_sample(uint32_t base_address, unsigned channel)
{
irqstate_t flags = px4_enter_critical_section();
/* clear any previous EOC */
if (rSR(base_address) & ADC_SR_EOC) {
rSR(base_address) &= ~ADC_SR_EOC;
}
/* run a single conversion right now - should take about 60 cycles (a few microseconds) max */
rSQR3(base_address) = channel;
rCR2(base_address) |= ADC_CR2_SWSTART;
/* wait for the conversion to complete */
const hrt_abstime now = hrt_absolute_time();
while (!(rSR(base_address) & ADC_SR_EOC)) {
/* don't wait for more than 50us, since that means something broke - should reset here if we see this */
if ((hrt_absolute_time() - now) > 50) {
px4_leave_critical_section(flags);
return 0xffff;
}
}
/* read the result and clear EOC */
uint16_t result = rDR(base_address);
px4_leave_critical_section(flags);
return result;
}
uint32_t px4_arch_adc_temp_sensor_mask()
{
return 1 << 16;
}
@@ -0,0 +1,57 @@
/****************************************************************************
*
* Copyright (c) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#pragma once
#include <board_config.h>
/* Historically PX4 used one ADC1 With FMUvnX this has changes.
* These defines maintain compatibility while allowing the
* new boards to override the ADC used from HW VER/REV and
* the system one.
*
* Depending on HW configuration (VER/REV POP options) hardware detection
* may or may NOT initialize a given ADC. SYSTEM_ADC_COUNT is used to size the
* singleton array to ensure this is only done once per ADC.
*/
#if !defined(HW_REV_VER_ADC_BASE)
# define HW_REV_VER_ADC_BASE STM32_ADC1_BASE
#endif
#if !defined(SYSTEM_ADC_BASE)
# define SYSTEM_ADC_BASE STM32_ADC1_BASE
#endif
#include "../../common/px4_platform_adc.h"
@@ -32,6 +32,7 @@
############################################################################
add_subdirectory(../stm32_common/adc adc)
add_subdirectory(../stm32_common/tone_alarm tone_alarm)
add_subdirectory(px4io_serial)
@@ -0,0 +1,36 @@
/****************************************************************************
*
* Copyright (c) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#pragma once
#include "../stm32_common/px4_arch_adc.h"
@@ -32,6 +32,7 @@
############################################################################
add_subdirectory(../stm32_common/adc adc)
add_subdirectory(../stm32_common/tone_alarm tone_alarm)
add_subdirectory(px4io_serial)
@@ -0,0 +1,36 @@
/****************************************************************************
*
* Copyright (c) 2019 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#pragma once
#include "../stm32_common/px4_arch_adc.h"
@@ -1,6 +1,6 @@
############################################################################
#
# Copyright (c) 2016 PX4 Development Team. All rights reserved.
# Copyright (c) 2019 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -36,4 +36,6 @@ px4_add_module(
MAIN adc
SRCS
adc.cpp
DEPENDS
arch_adc
)

Some files were not shown because too many files have changed in this diff Show More