Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-24 15:40:31 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

nxphlite-v3:Use ADC reading for VBUS

Browse Source 
On this HW the VBUS detection is on the ADC. The ADC module
   reads the value and sets a global flag as well as publishing
   the value via uOrb.
This commit is contained in:
David Sidrane
2017-06-21 18:12:01 -10:00
committed by Daniel Agar
parent 57892805e2
commit 58a6e57452
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/boards/nxphlite-v3/board_config.h
+1 -1
View File
@@ -416,7 +416,7 @@ __BEGIN_DECLS
* this board support the ADC system_power interface, and therefore
* provides the true logic GPIO BOARD_ADC_xxxx macros.
*/
#define BOARD_ADC_USB_CONNECTED board_read_VBUS_state()
#define BOARD_ADC_USB_CONNECTED ADC_USB_VBUS_VALID /* VBUS valid is read on an ADC pin */
#define BOARD_ADC_BRICK_VALID (1)
#define BOARD_ADC_SERVO_VALID (1)
#define BOARD_ADC_PERIPH_5V_OC (0)
src/drivers/boards/nxphlite-v3/nxphlite_init.c
+2 -1
View File
@@ -115,6 +115,7 @@ __BEGIN_DECLS
extern void led_init(void);
extern void led_on(int led);
extern void led_off(int led);
extern bool g_board_usb_connected;
__END_DECLS
/****************************************************************************
@@ -139,7 +140,7 @@ __END_DECLS
int board_read_VBUS_state(void)
{
// read * 36 ADC0_SE21 USB_VBUS_VALID
return 0;
return g_board_usb_connected ? 0 : 1;
}
/************************************************************************************
src/drivers/kinetis/adc/adc.cpp
+18 -4
View File
@@ -72,7 +72,7 @@
#include <uORB/topics/system_power.h>
#include <uORB/topics/adc_report.h>
#if 1|defined(ADC_CHANNELS)
#if defined(ADC_CHANNELS)
typedef uint32_t adc_chan_t;
#define ADC_TOTAL_CHANNELS 32
@@ -111,6 +111,8 @@ typedef uint32_t adc_chan_t;
#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 */
bool g_board_usb_connected = false;
class ADC : public device::CDev
{
public:
@@ -370,13 +372,25 @@ ADC::update_system_power(hrt_abstime now)
system_power.voltage5V_v = 0;
#if defined(ADC_5V_RAIL_SENSE)
#if defined(ADC_5V_RAIL_SENSE) || defined(BOARD_ADC_USB_CONNECTED)
for (unsigned i = 0; i < _channel_count; i++) {
#if defined(ADC_5V_RAIL_SENSE)
if (_samples[i].am_channel == ADC_5V_RAIL_SENSE) {
// it is 2:1 scaled
system_power.voltage5V_v = _samples[i].am_data * (6.6f / 4096);
}
#endif
#if defined(BOARD_ADC_USB_CONNECTED)
if (_samples[i].am_channel == BOARD_ADC_USB_CONNECTED) {
// > that 50% assum connected
system_power.usb_connected = _samples[i].am_data > (4096 / 2);
}
#endif
}
#endif
@@ -387,7 +401,7 @@ ADC::update_system_power(hrt_abstime now)
// these are not ADC related, but it is convenient to
// publish these to the same topic
system_power.usb_connected = BOARD_ADC_USB_CONNECTED;
g_board_usb_connected = system_power.usb_connected;
system_power.brick_valid = BOARD_ADC_BRICK_VALID;
system_power.servo_valid = BOARD_ADC_SERVO_VALID;
@@ -459,7 +473,7 @@ test(void)
}
for (unsigned i = 0; i < 50; i++) {
adc_msg_s data[12];
adc_msg_s data[ADC_TOTAL_CHANNELS];
ssize_t count = read(fd, data, sizeof(data));
if (count < 0) {