Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 10:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

SITL: added support for new analog source

Browse Source 
removed analogRead() to prevent people using it
This commit is contained in:
Andrew Tridgell 2012-06-29 21:51:38 +10:00
parent e791cad9ef
commit 0341e0e5f0
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/Desktop/include/wiring.h
View File

@ -95,7 +95,7 @@ extern "C"{
#define bitSet(value, bit) ((value) |= (1UL << (bit))) #define bitSet(value, bit) ((value) |= (1UL << (bit)))
#define bitClear(value, bit) ((value) &= ~(1UL << (bit))) #define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit)) #define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
#define bit_is_set(value, bit) (((value) & bit) != 0)
typedef unsigned int word; typedef unsigned int word;
@ -109,7 +109,6 @@ void init(void);
void pinMode(uint8_t, uint8_t); void pinMode(uint8_t, uint8_t);
void digitalWrite(uint8_t, uint8_t); void digitalWrite(uint8_t, uint8_t);
int digitalRead(uint8_t); int digitalRead(uint8_t);
int analogRead(uint8_t);
void analogReference(uint8_t mode); void analogReference(uint8_t mode);
void analogWrite(uint8_t, int); void analogWrite(uint8_t, int);

5
libraries/Desktop/support/Arduino.cpp
View File

@ -129,11 +129,6 @@ void digitalWrite(uint8_t pin, uint8_t val)
{ {
} }
int analogRead(uint8_t pin)
{
return 0;
}
} }

5
libraries/Desktop/support/sitl.cpp
View File

@ -268,6 +268,11 @@ static void timer_handler(int signum)
sitl.state.airspeed); sitl.state.airspeed);
sitl_update_barometer(sitl.state.altitude); sitl_update_barometer(sitl.state.altitude);
sitl_update_compass(sitl.state.rollDeg, sitl.state.pitchDeg, sitl.state.heading); sitl_update_compass(sitl.state.rollDeg, sitl.state.pitchDeg, sitl.state.heading);
// clear the ADC conversion flag,
// so the ADC code doesn't get stuck
ADCSRA &= ~_BV(ADSC);
sei(); sei();
running = false; running = false;
} }