VRBRAIN: corrected ADC pins for volt and current sensing.

This commit is contained in:
Emile Castelnuovo 2014-04-07 18:49:09 +02:00 committed by Andrew Tridgell
parent a9bd4e9da1
commit 79996986ad
3 changed files with 11 additions and 10 deletions

View File

@ -41,10 +41,11 @@ static const struct {
float scaling; float scaling;
} pin_scaling[] = { } pin_scaling[] = {
#ifdef CONFIG_ARCH_BOARD_VRBRAIN_V4 #ifdef CONFIG_ARCH_BOARD_VRBRAIN_V4
{ 0, 3.3f/4096 }, { 0, 3.3f/4096 },
{ 10, 3.3f/4096 }, { 10, 3.3f/4096 },
{ 11, 3.3f/4096 },
#elif CONFIG_ARCH_BOARD_VRBRAIN_V5 #elif CONFIG_ARCH_BOARD_VRBRAIN_V5
{ 0, 3.3f/4096 }, { 0, 3.3f/4096 },
{ 10, 3.3f/4096 }, { 10, 3.3f/4096 },
{ 11, 3.3f/4096 }, { 11, 3.3f/4096 },
#elif CONFIG_ARCH_BOARD_VRHERO_V1 #elif CONFIG_ARCH_BOARD_VRHERO_V1

View File

@ -12,14 +12,14 @@
#if defined(CONFIG_ARCH_BOARD_VRBRAIN_V4) #if defined(CONFIG_ARCH_BOARD_VRBRAIN_V4)
// these are virtual pins that read from the ORB // these are virtual pins that read from the ORB
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 100 #define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 101 #define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 11
#elif defined(CONFIG_ARCH_BOARD_VRBRAIN_V5) #elif defined(CONFIG_ARCH_BOARD_VRBRAIN_V5)
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 100 #define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 101 #define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 11
#elif defined(CONFIG_ARCH_BOARD_VRHERO_V1) #elif defined(CONFIG_ARCH_BOARD_VRHERO_V1)
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 100 #define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 101 #define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 11
#endif #endif
class VRBRAIN::VRBRAINAnalogSource : public AP_HAL::AnalogSource { class VRBRAIN::VRBRAINAnalogSource : public AP_HAL::AnalogSource {

View File

@ -23,8 +23,8 @@
# define HAL_GPIO_A_LED_PIN 27 # define HAL_GPIO_A_LED_PIN 27
# define HAL_GPIO_B_LED_PIN 26 # define HAL_GPIO_B_LED_PIN 26
# define HAL_GPIO_C_LED_PIN 25 # define HAL_GPIO_C_LED_PIN 25
# define HAL_GPIO_LED_ON LOW # define HAL_GPIO_LED_ON HIGH
# define HAL_GPIO_LED_OFF HIGH # define HAL_GPIO_LED_OFF LOW
#endif #endif
class VRBRAIN::VRBRAINGPIO : public AP_HAL::GPIO { class VRBRAIN::VRBRAINGPIO : public AP_HAL::GPIO {