Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-08 17:03:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_FLYMAPLE: fix for HAL_GPIO_*

Browse Source
This commit is contained in:
Andrew Tridgell 2014-06-02 09:29:46 +10:00
parent 3015356671
commit 805d79debe
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_FLYMAPLE/AnalogSource.cpp
View File

@ -130,7 +130,7 @@ float FLYMAPLEAnalogSource::_read_average()
void FLYMAPLEAnalogSource::setup_read() { void FLYMAPLEAnalogSource::setup_read() {
if (_stop_pin != ANALOG_INPUT_NONE) { if (_stop_pin != ANALOG_INPUT_NONE) {
uint8_t digital_pin = hal.gpio->analogPinToDigitalPin(_stop_pin); uint8_t digital_pin = hal.gpio->analogPinToDigitalPin(_stop_pin);
hal.gpio->pinMode(digital_pin, GPIO_OUTPUT); hal.gpio->pinMode(digital_pin, HAL_GPIO_OUTPUT);
hal.gpio->write(digital_pin, 1); hal.gpio->write(digital_pin, 1);
} }
if (_settle_time_ms != 0) { if (_settle_time_ms != 0) {
@ -151,7 +151,7 @@ void FLYMAPLEAnalogSource::setup_read() {
void FLYMAPLEAnalogSource::stop_read() { void FLYMAPLEAnalogSource::stop_read() {
if (_stop_pin != ANALOG_INPUT_NONE) { if (_stop_pin != ANALOG_INPUT_NONE) {
uint8_t digital_pin = hal.gpio->analogPinToDigitalPin(_stop_pin); uint8_t digital_pin = hal.gpio->analogPinToDigitalPin(_stop_pin);
hal.gpio->pinMode(digital_pin, GPIO_OUTPUT); hal.gpio->pinMode(digital_pin, HAL_GPIO_OUTPUT);
hal.gpio->write(digital_pin, 0); hal.gpio->write(digital_pin, 0);
} }
} }

4
libraries/AP_HAL_FLYMAPLE/GPIO.cpp
View File

@ -82,9 +82,9 @@ bool FLYMAPLEGPIO::attach_interrupt(uint8_t interrupt_num, AP_HAL::Proc p, uint8
{ {
// Flymaple can only handle RISING, FALLING and CHANGE // Flymaple can only handle RISING, FALLING and CHANGE
ExtIntTriggerMode flymaple_interrupt_mode; ExtIntTriggerMode flymaple_interrupt_mode;
if (mode == GPIO_INTERRUPT_FALLING) if (mode == HAL_GPIO_INTERRUPT_FALLING)
flymaple_interrupt_mode = FALLING; flymaple_interrupt_mode = FALLING;
else if (mode == GPIO_INTERRUPT_RISING) else if (mode == HAL_GPIO_INTERRUPT_RISING)
flymaple_interrupt_mode = RISING; flymaple_interrupt_mode = RISING;
else else
return false; return false;

8
libraries/AP_HAL_FLYMAPLE/examples/Blink/Blink.pde
View File

@ -30,16 +30,16 @@ void loop (void) {
} }
void setup (void) { void setup (void) {
hal.gpio->pinMode(13, GPIO_OUTPUT); hal.gpio->pinMode(13, HAL_GPIO_OUTPUT);
hal.gpio->write(13, 0); hal.gpio->write(13, 0);
a_led = hal.gpio->channel(27); a_led = hal.gpio->channel(27);
b_led = hal.gpio->channel(26); b_led = hal.gpio->channel(26);
c_led = hal.gpio->channel(25); c_led = hal.gpio->channel(25);
a_led->mode(GPIO_OUTPUT); a_led->mode(HAL_GPIO_OUTPUT);
b_led->mode(GPIO_OUTPUT); b_led->mode(HAL_GPIO_OUTPUT);
c_led->mode(GPIO_OUTPUT); c_led->mode(HAL_GPIO_OUTPUT);
a_led->write(0); a_led->write(0);
b_led->write(0); b_led->write(0);

2
libraries/AP_HAL_FLYMAPLE/examples/RCInput/RCInput.pde
View File

@ -56,7 +56,7 @@ void loop (void) {
} }
void setup (void) { void setup (void) {
hal.gpio->pinMode(13, GPIO_OUTPUT); hal.gpio->pinMode(13, HAL_GPIO_OUTPUT);
hal.gpio->write(13, 0); hal.gpio->write(13, 0);
} }

2
libraries/AP_HAL_FLYMAPLE/examples/RCPassthroughTest/RCPassthroughTest.pde
View File

@ -78,7 +78,7 @@ void loop (void) {
void setup (void) { void setup (void) {
// hal.scheduler->delay(5000); // hal.scheduler->delay(5000);
hal.gpio->pinMode(13, GPIO_OUTPUT); hal.gpio->pinMode(13, HAL_GPIO_OUTPUT);
hal.gpio->write(13, 0); hal.gpio->write(13, 0);
for (uint8_t i=0; i<16; i++) { for (uint8_t i=0; i<16; i++) {
hal.rcout->enable_ch(i); hal.rcout->enable_ch(i);

2
libraries/AP_HAL_FLYMAPLE/examples/Scheduler/Scheduler.pde
View File

@ -54,7 +54,7 @@ void schedule_toggle_hang(void) {
void setup_pin(int pin_num) { void setup_pin(int pin_num) {
hal.console->printf_P(PSTR("Setup pin %d\r\n"), pin_num); hal.console->printf_P(PSTR("Setup pin %d\r\n"), pin_num);
hal.gpio->pinMode(pin_num,GPIO_OUTPUT); hal.gpio->pinMode(pin_num,HAL_GPIO_OUTPUT);
/* Blink so we can see setup on the logic analyzer.*/ /* Blink so we can see setup on the logic analyzer.*/
hal.gpio->write(pin_num,1); hal.gpio->write(pin_num,1);
hal.gpio->write(pin_num,0); hal.gpio->write(pin_num,0);

2
libraries/AP_HAL_FLYMAPLE/examples/Semaphore/Semaphore.pde
View File

@ -54,7 +54,7 @@ void blink_a3() {
void setup_pin(int pin_num) { void setup_pin(int pin_num) {
hal.console->printf_P(PSTR("Setup pin %d\r\n"), pin_num); hal.console->printf_P(PSTR("Setup pin %d\r\n"), pin_num);
hal.gpio->pinMode(pin_num,GPIO_OUTPUT); hal.gpio->pinMode(pin_num,HAL_GPIO_OUTPUT);
/* Blink so we can see setup on the logic analyzer.*/ /* Blink so we can see setup on the logic analyzer.*/
hal.gpio->write(pin_num,1); hal.gpio->write(pin_num,1);
hal.gpio->write(pin_num,0); hal.gpio->write(pin_num,0);