aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Notify: rename more variables, types and defines

Browse Source
This commit is contained in:
Andrew Tridgell 2023-04-08 14:09:10 +10:00
parent 5d6b7b04d8
commit 05d5b56bfa
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_Notify/AP_Notify.cpp
View File

@ -32,7 +32,7 @@
#include "DiscreteRGBLed.h"
#include "DiscoLED.h"
#include "Led_Sysfs.h"
#include "UAVCAN_RGB_LED.h"
#include "DroneCAN_RGB_LED.h"
#include "SITL_SFML_LED.h"
#include <stdio.h>
#include "AP_BoardLED2.h"
@ -79,7 +79,7 @@ AP_Notify *AP_Notify::_singleton;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_EDGE
#define BUILD_DEFAULT_LED_TYPE (Notify_LED_Board | I2C_LEDS |\
Notify_LED_UAVCAN)
Notify_LED_DroneCAN)
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI || \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BLUE || \
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_POCKET || \
@ -347,10 +347,10 @@ void AP_Notify::add_backends(void)
}
#endif
break;
case Notify_LED_UAVCAN:
#if HAL_ENABLE_LIBUAVCAN_DRIVERS
ADD_BACKEND(new UAVCAN_RGB_LED(0));
#endif // HAL_ENABLE_LIBUAVCAN_DRIVERS
case Notify_LED_DroneCAN:
#if HAL_ENABLE_DRONECAN_DRIVERS
ADD_BACKEND(new DroneCAN_RGB_LED(0));
#endif // HAL_ENABLE_DRONECAN_DRIVERS
break;
case Notify_LED_Scripting:

2
libraries/AP_Notify/AP_Notify.h
View File

@ -69,7 +69,7 @@ public:
Notify_LED_PCA9685LED_I2C_External = (1 << 3), // External PCA9685_I2C
#endif
Notify_LED_OreoLED = (1 << 4), // Oreo
Notify_LED_UAVCAN = (1 << 5), // UAVCAN RGB LED
Notify_LED_DroneCAN = (1 << 5), // UAVCAN RGB LED
#if AP_NOTIFY_NCP5623_ENABLED
Notify_LED_NCP5623_I2C_External = (1 << 6), // External NCP5623
Notify_LED_NCP5623_I2C_Internal = (1 << 7), // Internal NCP5623

14
libraries/AP_Notify/DroneCAN_RGB_LED.cpp
View File

@ -17,8 +17,8 @@
#include <AP_HAL/AP_HAL.h>
#include <AP_HAL/system.h>
#if HAL_ENABLE_LIBUAVCAN_DRIVERS
#include "UAVCAN_RGB_LED.h"
#if HAL_ENABLE_DRONECAN_DRIVERS
#include "DroneCAN_RGB_LED.h"
#include <AP_DroneCAN/AP_DroneCAN.h>
@ -29,13 +29,13 @@
#define LED_MEDIUM ((LED_FULL_BRIGHT / 5) * 4)
#define LED_DIM ((LED_FULL_BRIGHT / 5) * 2)
UAVCAN_RGB_LED::UAVCAN_RGB_LED(uint8_t led_index)
: UAVCAN_RGB_LED(led_index, LED_OFF,
DroneCAN_RGB_LED::DroneCAN_RGB_LED(uint8_t led_index)
: DroneCAN_RGB_LED(led_index, LED_OFF,
LED_FULL_BRIGHT, LED_MEDIUM, LED_DIM)
{
}
UAVCAN_RGB_LED::UAVCAN_RGB_LED(uint8_t led_index, uint8_t led_off,
DroneCAN_RGB_LED::DroneCAN_RGB_LED(uint8_t led_index, uint8_t led_off,
uint8_t led_full, uint8_t led_medium,
uint8_t led_dim)
: RGBLed(led_off, led_full, led_medium, led_dim)
@ -43,7 +43,7 @@ UAVCAN_RGB_LED::UAVCAN_RGB_LED(uint8_t led_index, uint8_t led_off,
{
}
bool UAVCAN_RGB_LED::init()
bool DroneCAN_RGB_LED::init()
{
const uint8_t can_num_drivers = AP::can().get_num_drivers();
for (uint8_t i = 0; i < can_num_drivers; i++) {
@ -57,7 +57,7 @@ bool UAVCAN_RGB_LED::init()
}
bool UAVCAN_RGB_LED::hw_set_rgb(uint8_t red, uint8_t green, uint8_t blue)
bool DroneCAN_RGB_LED::hw_set_rgb(uint8_t red, uint8_t green, uint8_t blue)
{
bool success = false;
uint8_t can_num_drivers = AP::can().get_num_drivers();

6
libraries/AP_Notify/DroneCAN_RGB_LED.h
View File

@ -2,11 +2,11 @@
#include "RGBLed.h"
class UAVCAN_RGB_LED: public RGBLed {
class DroneCAN_RGB_LED: public RGBLed {
public:
UAVCAN_RGB_LED(uint8_t led_index, uint8_t led_off, uint8_t led_full,
DroneCAN_RGB_LED(uint8_t led_index, uint8_t led_off, uint8_t led_full,
uint8_t led_medium, uint8_t led_dim);
UAVCAN_RGB_LED(uint8_t led_index);
DroneCAN_RGB_LED(uint8_t led_index);
bool init() override;
protected:

2
libraries/AP_Notify/MMLPlayer.cpp
View File

@ -64,7 +64,7 @@ void MMLPlayer::start_note(float duration, float frequency, float volume)
_note_duration_us = duration*1e6;
hal.util->toneAlarm_set_buzzer_tone(frequency, volume, _note_duration_us/1000U);
#if HAL_ENABLE_LIBUAVCAN_DRIVERS
#if HAL_ENABLE_DRONECAN_DRIVERS
// support CAN buzzers too
uint8_t can_num_drivers = AP::can().get_num_drivers();