From 50c08ced4cdef261aeabdf74e47809e9f9e6b021 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 2 Jun 2014 09:27:01 +1000 Subject: [PATCH] AP_Notify: fixes for HAL_GPIO_* --- libraries/AP_Notify/AP_BoardLED.cpp | 6 +++--- libraries/AP_Notify/Buzzer.cpp | 2 +- libraries/AP_Notify/ExternalLED.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/AP_Notify/AP_BoardLED.cpp b/libraries/AP_Notify/AP_BoardLED.cpp index df62ac500b..271f2761af 100644 --- a/libraries/AP_Notify/AP_BoardLED.cpp +++ b/libraries/AP_Notify/AP_BoardLED.cpp @@ -22,9 +22,9 @@ extern const AP_HAL::HAL& hal; void AP_BoardLED::init(void) { // setup the main LEDs as outputs - hal.gpio->pinMode(HAL_GPIO_A_LED_PIN, GPIO_OUTPUT); - hal.gpio->pinMode(HAL_GPIO_B_LED_PIN, GPIO_OUTPUT); - hal.gpio->pinMode(HAL_GPIO_C_LED_PIN, GPIO_OUTPUT); + hal.gpio->pinMode(HAL_GPIO_A_LED_PIN, HAL_GPIO_OUTPUT); + hal.gpio->pinMode(HAL_GPIO_B_LED_PIN, HAL_GPIO_OUTPUT); + hal.gpio->pinMode(HAL_GPIO_C_LED_PIN, HAL_GPIO_OUTPUT); // turn all lights off hal.gpio->write(HAL_GPIO_A_LED_PIN, HAL_GPIO_LED_OFF); diff --git a/libraries/AP_Notify/Buzzer.cpp b/libraries/AP_Notify/Buzzer.cpp index c140a29229..1627a366bb 100644 --- a/libraries/AP_Notify/Buzzer.cpp +++ b/libraries/AP_Notify/Buzzer.cpp @@ -31,7 +31,7 @@ void Buzzer::init() } // setup the pin and ensure it's off - hal.gpio->pinMode(BUZZER_PIN, GPIO_OUTPUT); + hal.gpio->pinMode(BUZZER_PIN, HAL_GPIO_OUTPUT); on(false); // set initial boot states. This prevents us issueing a arming diff --git a/libraries/AP_Notify/ExternalLED.cpp b/libraries/AP_Notify/ExternalLED.cpp index a3aa8b75a4..540059707b 100644 --- a/libraries/AP_Notify/ExternalLED.cpp +++ b/libraries/AP_Notify/ExternalLED.cpp @@ -28,10 +28,10 @@ void ExternalLED::init(void) } // setup the main LEDs as outputs - hal.gpio->pinMode(EXTERNAL_LED_ARMED, GPIO_OUTPUT); - hal.gpio->pinMode(EXTERNAL_LED_GPS, GPIO_OUTPUT); - hal.gpio->pinMode(EXTERNAL_LED_MOTOR1, GPIO_OUTPUT); - hal.gpio->pinMode(EXTERNAL_LED_MOTOR2, GPIO_OUTPUT); + hal.gpio->pinMode(EXTERNAL_LED_ARMED, HAL_GPIO_OUTPUT); + hal.gpio->pinMode(EXTERNAL_LED_GPS, HAL_GPIO_OUTPUT); + hal.gpio->pinMode(EXTERNAL_LED_MOTOR1, HAL_GPIO_OUTPUT); + hal.gpio->pinMode(EXTERNAL_LED_MOTOR2, HAL_GPIO_OUTPUT); // turn leds off hal.gpio->write(EXTERNAL_LED_ARMED, HAL_GPIO_LED_OFF);