Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Ardupilot
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
Ardupilot
Commits
79996986
Commit
79996986
authored
11 years ago
by
Emile Castelnuovo
Committed by
Andrew Tridgell
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
VRBRAIN: corrected ADC pins for volt and current sensing.
parent
a9bd4e9d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libraries/AP_HAL_VRBRAIN/AnalogIn.cpp
+3
-2
3 additions, 2 deletions
libraries/AP_HAL_VRBRAIN/AnalogIn.cpp
libraries/AP_HAL_VRBRAIN/AnalogIn.h
+6
-6
6 additions, 6 deletions
libraries/AP_HAL_VRBRAIN/AnalogIn.h
libraries/AP_HAL_VRBRAIN/GPIO.h
+2
-2
2 additions, 2 deletions
libraries/AP_HAL_VRBRAIN/GPIO.h
with
11 additions
and
10 deletions
libraries/AP_HAL_VRBRAIN/AnalogIn.cpp
+
3
−
2
View file @
79996986
...
...
@@ -41,10 +41,11 @@ static const struct {
float
scaling
;
}
pin_scaling
[]
=
{
#ifdef CONFIG_ARCH_BOARD_VRBRAIN_V4
{
0
,
3.3
f
/
4096
},
{
0
,
3.3
f
/
4096
},
{
10
,
3.3
f
/
4096
},
{
11
,
3.3
f
/
4096
},
#elif CONFIG_ARCH_BOARD_VRBRAIN_V5
{
0
,
3.3
f
/
4096
},
{
0
,
3.3
f
/
4096
},
{
10
,
3.3
f
/
4096
},
{
11
,
3.3
f
/
4096
},
#elif CONFIG_ARCH_BOARD_VRHERO_V1
...
...
This diff is collapsed.
Click to expand it.
libraries/AP_HAL_VRBRAIN/AnalogIn.h
+
6
−
6
View file @
79996986
...
...
@@ -12,14 +12,14 @@
#if defined(CONFIG_ARCH_BOARD_VRBRAIN_V4)
// these are virtual pins that read from the ORB
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
0
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 1
0
1
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 11
#elif defined(CONFIG_ARCH_BOARD_VRBRAIN_V5)
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
0
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 1
0
1
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 11
#elif defined(CONFIG_ARCH_BOARD_VRHERO_V1)
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
0
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 1
0
1
#define VRBRAIN_ANALOG_ORB_BATTERY_VOLTAGE_PIN 10
#define VRBRAIN_ANALOG_ORB_BATTERY_CURRENT_PIN 11
#endif
class
VRBRAIN
::
VRBRAINAnalogSource
:
public
AP_HAL
::
AnalogSource
{
...
...
This diff is collapsed.
Click to expand it.
libraries/AP_HAL_VRBRAIN/GPIO.h
+
2
−
2
View file @
79996986
...
...
@@ -23,8 +23,8 @@
# define HAL_GPIO_A_LED_PIN 27
# define HAL_GPIO_B_LED_PIN 26
# define HAL_GPIO_C_LED_PIN 25
# define HAL_GPIO_LED_ON
LOW
# define HAL_GPIO_LED_OFF
HIGH
# define HAL_GPIO_LED_ON
HIGH
# define HAL_GPIO_LED_OFF
LOW
#endif
class
VRBRAIN
::
VRBRAINGPIO
:
public
AP_HAL
::
GPIO
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment