From 9f7e20090c91dddf7232c81f6858aa57f7e61bb3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 13 Feb 2015 19:21:24 +1100 Subject: [PATCH] AP_Notify: change for new PX4 device paths --- libraries/AP_Notify/ToneAlarm_PX4.cpp | 4 ++-- libraries/AP_Notify/ToshibaLED_PX4.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Notify/ToneAlarm_PX4.cpp b/libraries/AP_Notify/ToneAlarm_PX4.cpp index 7d7b645620..2e2b96311c 100644 --- a/libraries/AP_Notify/ToneAlarm_PX4.cpp +++ b/libraries/AP_Notify/ToneAlarm_PX4.cpp @@ -68,9 +68,9 @@ const ToneAlarm_PX4::Tone ToneAlarm_PX4::_tones[] { bool ToneAlarm_PX4::init() { // open the tone alarm device - _tonealarm_fd = open(TONEALARM_DEVICE_PATH, O_WRONLY); + _tonealarm_fd = open(TONEALARM0_DEVICE_PATH, O_WRONLY); if (_tonealarm_fd == -1) { - hal.console->printf("Unable to open " TONEALARM_DEVICE_PATH); + hal.console->printf("ToneAlarm_PX4: Unable to open " TONEALARM0_DEVICE_PATH); return false; } diff --git a/libraries/AP_Notify/ToshibaLED_PX4.cpp b/libraries/AP_Notify/ToshibaLED_PX4.cpp index e9d3a13700..e1bd7760c1 100644 --- a/libraries/AP_Notify/ToshibaLED_PX4.cpp +++ b/libraries/AP_Notify/ToshibaLED_PX4.cpp @@ -35,9 +35,9 @@ extern const AP_HAL::HAL& hal; bool ToshibaLED_PX4::hw_init() { // open the rgb led device - _rgbled_fd = open(RGBLED_DEVICE_PATH, 0); + _rgbled_fd = open(RGBLED0_DEVICE_PATH, 0); if (_rgbled_fd == -1) { - hal.console->printf("Unable to open " RGBLED_DEVICE_PATH); + hal.console->printf("Unable to open " RGBLED0_DEVICE_PATH); return false; } ioctl(_rgbled_fd, RGBLED_SET_MODE, (unsigned long)RGBLED_MODE_ON);