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

AP_HAL_ChibiOS: add support for NeoPixelRGB

This commit is contained in:
Andy Piper 2023-09-28 21:49:05 +01:00 committed by Andrew Tridgell
parent 4c911dce68
commit 9ff3d21c20
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_HAL_ChibiOS/RCOutput.cpp
View File

@ -794,6 +794,7 @@ void RCOutput::push_local(void)
if (group.current_mode == MODE_PWM_ONESHOT || if (group.current_mode == MODE_PWM_ONESHOT ||
group.current_mode == MODE_PWM_ONESHOT125 || group.current_mode == MODE_PWM_ONESHOT125 ||
group.current_mode == MODE_NEOPIXEL || group.current_mode == MODE_NEOPIXEL ||
group.current_mode == MODE_NEOPIXELRGB ||
group.current_mode == MODE_PROFILED || group.current_mode == MODE_PROFILED ||
is_dshot_protocol(group.current_mode)) { is_dshot_protocol(group.current_mode)) {
// only control widest pulse for oneshot and dshot // only control widest pulse for oneshot and dshot
@ -1056,6 +1057,7 @@ void RCOutput::set_group_mode(pwm_group &group)
break; break;
case MODE_NEOPIXEL: case MODE_NEOPIXEL:
case MODE_NEOPIXELRGB:
case MODE_PROFILED: case MODE_PROFILED:
#if HAL_SERIALLED_ENABLED #if HAL_SERIALLED_ENABLED
{ {
@ -2413,6 +2415,7 @@ uint32_t RCOutput::protocol_bitrate(const enum output_mode mode)
case MODE_PWM_DSHOT1200: case MODE_PWM_DSHOT1200:
return 1200000; return 1200000;
case MODE_NEOPIXEL: case MODE_NEOPIXEL:
case MODE_NEOPIXELRGB:
return 800000; return 800000;
case MODE_PROFILED: case MODE_PROFILED:
return 1500000; // experiment winding this up 3000000 max from data sheet return 1500000; // experiment winding this up 3000000 max from data sheet
@ -2452,9 +2455,11 @@ bool RCOutput::set_serial_led_num_LEDs(const uint16_t chan, uint8_t num_leds, ou
} }
switch (mode) { switch (mode) {
case MODE_NEOPIXEL: {
case MODE_NEOPIXEL:
case MODE_NEOPIXELRGB: {
grp->serial_nleds = MAX(num_leds, grp->serial_nleds); grp->serial_nleds = MAX(num_leds, grp->serial_nleds);
grp->led_mode = MODE_NEOPIXEL; grp->led_mode = mode;
return true; return true;
} }
case MODE_PROFILED: { case MODE_PROFILED: {
@ -2505,6 +2510,9 @@ void RCOutput::fill_DMA_buffer_serial_led(pwm_group& group)
case MODE_NEOPIXEL: case MODE_NEOPIXEL:
_set_neopixel_rgb_data(&group, j, i, led.red, led.green, led.blue); _set_neopixel_rgb_data(&group, j, i, led.red, led.green, led.blue);
break; break;
case MODE_NEOPIXELRGB:
_set_neopixel_rgb_data(&group, j, i, led.green, led.red, led.blue);
break;
case MODE_PROFILED: { case MODE_PROFILED: {
if (i < group.serial_nleds - 2) { if (i < group.serial_nleds - 2) {
_set_profiled_rgb_data(&group, j, i, led.red, led.green, led.blue); _set_profiled_rgb_data(&group, j, i, led.red, led.green, led.blue);
@ -2677,6 +2685,7 @@ void RCOutput::serial_led_set_single_rgb_data(pwm_group& group, uint8_t idx, uin
switch (group.current_mode) { switch (group.current_mode) {
case MODE_PROFILED: case MODE_PROFILED:
case MODE_NEOPIXEL: case MODE_NEOPIXEL:
case MODE_NEOPIXELRGB:
group.serial_led_data[idx][led].red = red; group.serial_led_data[idx][led].red = red;
group.serial_led_data[idx][led].green = green; group.serial_led_data[idx][led].green = green;
group.serial_led_data[idx][led].blue = blue; group.serial_led_data[idx][led].blue = blue;