Plane: workaround conflicts between wirish and APM compatibility

This commit is contained in:
Mike McCauley 2013-09-23 13:38:38 +10:00 committed by Andrew Tridgell
parent 2e061fc507
commit 767884b7f1

View File

@ -1,36 +1,35 @@
void delay(uint32_t ms)
static void delay(uint32_t ms)
{
hal.scheduler->delay(ms);
}
void mavlink_delay(uint32_t ms)
static void mavlink_delay(uint32_t ms)
{
hal.scheduler->delay(ms);
}
uint32_t millis()
static uint32_t millis()
{
return hal.scheduler->millis();
}
uint32_t micros()
static uint32_t micros()
{
return hal.scheduler->micros();
}
void pinMode(uint8_t pin, uint8_t output)
static void pinMode(uint8_t pin, uint8_t output)
{
hal.gpio->pinMode(pin, output);
}
void digitalWrite(uint8_t pin, uint8_t out)
static void digitalWrite(uint8_t pin, uint8_t out)
{
hal.gpio->write(pin,out);
}
uint8_t digitalRead(uint8_t pin)
static uint8_t digitalRead(uint8_t pin)
{
return hal.gpio->read(pin);
}