Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_ADC: ADS1115: coding style fixes 

- Clean trailing whitespaces
  - Fix switch
  - Use pragma once
This commit is contained in:
Lucas De Marchi 2016-01-28 18:12:12 -02:00
parent c1d19fa4dc
commit 4562c0cffc
2 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libraries/AP_ADC/AP_ADC_ADS1115.cpp
View File

@ -84,19 +84,18 @@
#define debug(fmt, args ...) do {hal.console->printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## args); } while(0) #define debug(fmt, args ...) do {hal.console->printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## args); } while(0)
#define error(fmt, args ...) do {fprintf(stderr,"%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## args); } while(0) #define error(fmt, args ...) do {fprintf(stderr,"%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## args); } while(0)
#else #else
#define debug(fmt, args ...) #define debug(fmt, args ...)
#define error(fmt, args ...) #define error(fmt, args ...)
#endif #endif
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL &hal;
#define ADS1115_CHANNELS_COUNT 6 #define ADS1115_CHANNELS_COUNT 6
const uint8_t AP_ADC_ADS1115::_channels_number = ADS1115_CHANNELS_COUNT; const uint8_t AP_ADC_ADS1115::_channels_number = ADS1115_CHANNELS_COUNT;
/* Only two differential channels used */ /* Only two differential channels used */
static const uint16_t mux_table[ADS1115_CHANNELS_COUNT] = static const uint16_t mux_table[ADS1115_CHANNELS_COUNT] = {
{
ADS1115_MUX_P1_N3, ADS1115_MUX_P1_N3,
ADS1115_MUX_P2_N3, ADS1115_MUX_P2_N3,
ADS1115_MUX_P0_NG, ADS1115_MUX_P0_NG,
@ -117,7 +116,7 @@ bool AP_ADC_ADS1115::init()
{ {
hal.scheduler->suspend_timer_procs(); hal.scheduler->suspend_timer_procs();
_gain = ADS1115_PGA_4P096; _gain = ADS1115_PGA_4P096;
_i2c_sem = hal.i2c->get_semaphore(); _i2c_sem = hal.i2c->get_semaphore();
hal.scheduler->register_timer_process(FUNCTOR_BIND_MEMBER(&AP_ADC_ADS1115::_update, void)); hal.scheduler->register_timer_process(FUNCTOR_BIND_MEMBER(&AP_ADC_ADS1115::_update, void));
@ -133,7 +132,7 @@ bool AP_ADC_ADS1115::_start_conversion(uint8_t channel)
uint8_t b[2]; uint8_t b[2];
} config; } config;
config.w = ADS1115_OS_ACTIVE | _gain | mux_table[channel] | config.w = ADS1115_OS_ACTIVE | _gain | mux_table[channel] |
ADS1115_MODE_SINGLESHOT | ADS1115_COMP_QUE_DISABLE | ADS1115_RATE_250; ADS1115_MODE_SINGLESHOT | ADS1115_COMP_QUE_DISABLE | ADS1115_RATE_250;
config.w = config.b[0] << 8 | config.b[1]; config.w = config.b[0] << 8 | config.b[1];
@ -161,41 +160,41 @@ float AP_ADC_ADS1115::_convert_register_data_to_mv(int16_t word) const
float pga; float pga;
switch (_gain) { switch (_gain) {
case ADS1115_PGA_6P144: case ADS1115_PGA_6P144:
pga = ADS1115_MV_6P144; pga = ADS1115_MV_6P144;
break; break;
case ADS1115_PGA_4P096: case ADS1115_PGA_4P096:
pga = ADS1115_MV_4P096; pga = ADS1115_MV_4P096;
break; break;
case ADS1115_PGA_2P048: case ADS1115_PGA_2P048:
pga = ADS1115_MV_2P048; pga = ADS1115_MV_2P048;
break; break;
case ADS1115_PGA_1P024: case ADS1115_PGA_1P024:
pga = ADS1115_MV_1P024; pga = ADS1115_MV_1P024;
break; break;
case ADS1115_PGA_0P512: case ADS1115_PGA_0P512:
pga = ADS1115_MV_0P512; pga = ADS1115_MV_0P512;
break; break;
case ADS1115_PGA_0P256: case ADS1115_PGA_0P256:
pga = ADS1115_MV_0P256; pga = ADS1115_MV_0P256;
break; break;
case ADS1115_PGA_0P256B: case ADS1115_PGA_0P256B:
pga = ADS1115_MV_0P256B; pga = ADS1115_MV_0P256B;
break; break;
case ADS1115_PGA_0P256C: case ADS1115_PGA_0P256C:
pga = ADS1115_MV_0P256C; pga = ADS1115_MV_0P256C;
break; break;
default: default:
pga = 0.0f; pga = 0.0f;
hal.console->printf("Wrong gain"); hal.console->printf("Wrong gain");
AP_HAL::panic("ADS1115: wrong gain selected"); AP_HAL::panic("ADS1115: wrong gain selected");
break; break;
} }
return (float) word * pga; return (float) word * pga;
} }
void AP_ADC_ADS1115::_update() void AP_ADC_ADS1115::_update()
{ {
/* TODO: make update rate configurable */ /* TODO: make update rate configurable */
if (AP_HAL::micros() - _last_update_timestamp < 100000) { if (AP_HAL::micros() - _last_update_timestamp < 100000) {

10
libraries/AP_ADC/AP_ADC_ADS1115.h
View File

@ -1,14 +1,12 @@
/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- /// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
#ifndef __AP_ADC_ADS1115_H__ #pragma once
#define __AP_ADC_ADS1115_H__
#include <inttypes.h> #include <inttypes.h>
#include "AP_ADC.h" #include "AP_ADC.h"
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
struct adc_report_s struct adc_report_s
{ {
uint8_t id; uint8_t id;
float data; float data;
@ -22,7 +20,7 @@ public:
bool init(); bool init();
size_t read(adc_report_s *report, size_t length) const; size_t read(adc_report_s *report, size_t length) const;
uint8_t get_channels_number() const uint8_t get_channels_number() const
{ {
return _channels_number; return _channels_number;
} }
@ -43,5 +41,3 @@ private:
float _convert_register_data_to_mv(int16_t word) const; float _convert_register_data_to_mv(int16_t word) const;
}; };
#endif