aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_BattMonitor: support Disco battery monitoring

Browse Source
This commit is contained in:
Andrew Tridgell 2016-06-07 08:14:35 +10:00
parent d30e55fa44
commit 39dac57b56
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_BattMonitor/AP_BattMonitor.cpp
View File

@ -155,7 +155,7 @@ AP_BattMonitor::init()
return; return;
} }
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO
// force monitor for bebop // force monitor for bebop
_monitoring[0] = BattMonitor_TYPE_BEBOP; _monitoring[0] = BattMonitor_TYPE_BEBOP;
#endif #endif
@ -180,7 +180,7 @@ AP_BattMonitor::init()
_num_instances++; _num_instances++;
break; break;
case BattMonitor_TYPE_BEBOP: case BattMonitor_TYPE_BEBOP:
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO
state[instance].instance = instance; state[instance].instance = instance;
drivers[instance] = new AP_BattMonitor_Bebop(*this, instance, state[instance]); drivers[instance] = new AP_BattMonitor_Bebop(*this, instance, state[instance]);
_num_instances++; _num_instances++;

7
libraries/AP_BattMonitor/AP_BattMonitor_Bebop.cpp
View File

@ -18,10 +18,11 @@
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && \ #if CONFIG_HAL_BOARD == HAL_BOARD_LINUX && \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP (CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO)
#include "AP_BattMonitor_Bebop.h" #include "AP_BattMonitor_Bebop.h"
#include <AP_HAL_Linux/RCOutput_Bebop.h> #include <AP_HAL_Linux/RCOutput_Bebop.h>
#include <AP_HAL_Linux/RCOutput_Disco.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
@ -143,7 +144,11 @@ void AP_BattMonitor_Bebop::read(void)
BebopBLDC_ObsData data; BebopBLDC_ObsData data;
float remaining, vbat, vbat_raw; float remaining, vbat, vbat_raw;
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP
auto rcout = Linux::RCOutput_Bebop::from(hal.rcout); auto rcout = Linux::RCOutput_Bebop::from(hal.rcout);
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_DISCO
auto rcout = Linux::RCOutput_Disco::from(hal.rcout);
#endif
tnow = AP_HAL::micros(); tnow = AP_HAL::micros();
ret = rcout->read_obs_data(data); ret = rcout->read_obs_data(data);