Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Periph: update to new NeoPixel API

This commit is contained in:
Peter Hall 2020-03-10 22:45:09 +00:00 committed by Andrew Tridgell
parent a4d21eead7
commit 6172d3a71d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/AP_Periph/AP_Periph.cpp
View File

@ -93,7 +93,7 @@ void AP_Periph_FW::init()
#ifdef HAL_PERIPH_NEOPIXEL_COUNT #ifdef HAL_PERIPH_NEOPIXEL_COUNT
hal.rcout->init(); hal.rcout->init();
hal.rcout->set_neopixel_num_LEDs(HAL_PERIPH_NEOPIXEL_CHAN, HAL_PERIPH_NEOPIXEL_COUNT); hal.rcout->set_serial_led_num_LEDs(HAL_PERIPH_NEOPIXEL_CHAN, AP_HAL::RCOutput::MODE_NEOPIXEL);
#endif #endif
#ifdef HAL_PERIPH_ENABLE_ADSB #ifdef HAL_PERIPH_ENABLE_ADSB
@ -124,8 +124,8 @@ static void update_rainbow()
uint32_t now = AP_HAL::millis(); uint32_t now = AP_HAL::millis();
if (now-start_ms > 1500) { if (now-start_ms > 1500) {
rainbow_done = true; rainbow_done = true;
hal.rcout->set_neopixel_rgb_data(HAL_PERIPH_NEOPIXEL_CHAN, -1, 0, 0, 0); hal.rcout->set_serial_led_rgb_data(HAL_PERIPH_NEOPIXEL_CHAN, -1, 0, 0, 0);
hal.rcout->neopixel_send(); hal.rcout->serial_led_send(HAL_PERIPH_NEOPIXEL_CHAN);
return; return;
} }
static uint32_t last_update_ms; static uint32_t last_update_ms;
@ -153,13 +153,13 @@ static void update_rainbow()
float brightness = 0.3; float brightness = 0.3;
for (uint8_t n=0; n<8; n++) { for (uint8_t n=0; n<8; n++) {
uint8_t i = (step + n) % nsteps; uint8_t i = (step + n) % nsteps;
hal.rcout->set_neopixel_rgb_data(HAL_PERIPH_NEOPIXEL_CHAN, n, hal.rcout->set_serial_led_rgb_data(HAL_PERIPH_NEOPIXEL_CHAN, n,
rgb_rainbow[i].red*brightness, rgb_rainbow[i].red*brightness,
rgb_rainbow[i].green*brightness, rgb_rainbow[i].green*brightness,
rgb_rainbow[i].blue*brightness); rgb_rainbow[i].blue*brightness);
} }
step++; step++;
hal.rcout->neopixel_send(); hal.rcout->serial_led_send(HAL_PERIPH_NEOPIXEL_CHAN);
} }
#endif #endif
@ -187,7 +187,7 @@ void AP_Periph_FW::update()
show_stack_usage(); show_stack_usage();
#endif #endif
#ifdef HAL_PERIPH_NEOPIXEL_COUNT #ifdef HAL_PERIPH_NEOPIXEL_COUNT
hal.rcout->set_neopixel_num_LEDs(HAL_PERIPH_NEOPIXEL_CHAN, HAL_PERIPH_NEOPIXEL_COUNT); hal.rcout->set_serial_led_num_LEDs(HAL_PERIPH_NEOPIXEL_CHAN, HAL_PERIPH_NEOPIXEL_COUNT, AP_HAL::RCOutput::MODE_NEOPIXEL);
#endif #endif
} }
can_update(); can_update();

4
Tools/AP_Periph/can.cpp
View File

@ -476,8 +476,8 @@ static void handle_safety_state(CanardInstance* ins, CanardRxTransfer* transfer)
static void set_rgb_led(uint8_t red, uint8_t green, uint8_t blue) static void set_rgb_led(uint8_t red, uint8_t green, uint8_t blue)
{ {
#ifdef HAL_PERIPH_NEOPIXEL_COUNT #ifdef HAL_PERIPH_NEOPIXEL_COUNT
hal.rcout->set_neopixel_rgb_data(HAL_PERIPH_NEOPIXEL_CHAN, -1, red, green, blue); hal.rcout->set_serial_led_rgb_data(HAL_PERIPH_NEOPIXEL_CHAN, -1, red, green, blue);
hal.rcout->neopixel_send(); hal.rcout->serial_led_send(HAL_PERIPH_NEOPIXEL_CHAN);
#endif // HAL_PERIPH_NEOPIXEL_COUNT #endif // HAL_PERIPH_NEOPIXEL_COUNT
#ifdef HAL_PERIPH_ENABLE_NCP5623_LED #ifdef HAL_PERIPH_ENABLE_NCP5623_LED
{ {