fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

nxphlite-v3:ADC digital USB connected

Browse Source
This commit is contained in:
David Sidrane 2017-09-27 18:24:00 -10:00
parent 7a0254d9f3
commit 3e863dff5d
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/boards/nxphlite-v3/nxphlite_init.c
View File

@ -115,7 +115,6 @@ __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
/****************************************************************************

25
src/drivers/kinetis/adc/adc.cpp
View File

@ -111,8 +111,6 @@ 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:
@ -372,36 +370,33 @@ ADC::update_system_power(hrt_abstime now)
system_power.voltage5V_v = 0;
#if defined(ADC_5V_RAIL_SENSE) || defined(BOARD_ADC_USB_CONNECTED)
#if defined(ADC_5V_RAIL_SENSE)
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
/* Note once the board_config.h provides BOARD_ADC_USB_CONNECTED,
* It must provide the true logic GPIO BOARD_ADC_xxxx macros.
*/
// these are not ADC related, but it is convenient to
// publish these to the same topic
g_board_usb_connected = system_power.usb_connected;
system_power.usb_connected = BOARD_ADC_USB_CONNECTED;
/* If provided used the Valid signal from HW*/
#if defined(BOARD_ADC_USB_VALID)
system_power.usb_vaild = BOARD_ADC_USB_VALID;
#else
/* If not provided then use connected */
system_power.usb_vaild = system_power.usb_connected;
#endif
system_power.brick_valid = BOARD_ADC_BRICK_VALID;
system_power.servo_valid = BOARD_ADC_SERVO_VALID;