dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fixed some stupid compile errors

This commit is contained in:
Lorenz Meier 2013-10-14 23:10:12 +02:00
parent c6b58491bb
commit fbe595a591
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/drivers/rgbled/rgbled.cpp
View File

@ -103,6 +103,7 @@ private:
bool _running; bool _running;
int _led_interval; int _led_interval;
bool _should_run;
int _counter; int _counter;
void set_color(rgbled_color_t ledcolor); void set_color(rgbled_color_t ledcolor);
@ -136,6 +137,7 @@ RGBLED::RGBLED(int bus, int rgbled) :
_brightness(1.0f), _brightness(1.0f),
_running(false), _running(false),
_led_interval(0), _led_interval(0),
_should_run(false),
_counter(0) _counter(0)
{ {
memset(&_work, 0, sizeof(_work)); memset(&_work, 0, sizeof(_work));
@ -414,10 +416,10 @@ RGBLED::set_mode(rgbled_mode_t mode)
{ {
if (mode != _mode) { if (mode != _mode) {
_mode = mode; _mode = mode;
bool should_run = false;
switch (mode) { switch (mode) {
case RGBLED_MODE_OFF: case RGBLED_MODE_OFF:
_should_run = false;
send_led_enable(false); send_led_enable(false);
break; break;
@ -428,7 +430,7 @@ RGBLED::set_mode(rgbled_mode_t mode)
break; break;
case RGBLED_MODE_BLINK_SLOW: case RGBLED_MODE_BLINK_SLOW:
should_run = true; _should_run = true;
_counter = 0; _counter = 0;
_led_interval = 2000; _led_interval = 2000;
_brightness = 1.0f; _brightness = 1.0f;
@ -436,7 +438,7 @@ RGBLED::set_mode(rgbled_mode_t mode)
break; break;
case RGBLED_MODE_BLINK_NORMAL: case RGBLED_MODE_BLINK_NORMAL:
should_run = true; _should_run = true;
_counter = 0; _counter = 0;
_led_interval = 500; _led_interval = 500;
_brightness = 1.0f; _brightness = 1.0f;
@ -444,7 +446,7 @@ RGBLED::set_mode(rgbled_mode_t mode)
break; break;
case RGBLED_MODE_BLINK_FAST: case RGBLED_MODE_BLINK_FAST:
should_run = true; _should_run = true;
_counter = 0; _counter = 0;
_led_interval = 100; _led_interval = 100;
_brightness = 1.0f; _brightness = 1.0f;
@ -452,14 +454,14 @@ RGBLED::set_mode(rgbled_mode_t mode)
break; break;
case RGBLED_MODE_BREATHE: case RGBLED_MODE_BREATHE:
should_run = true; _should_run = true;
_counter = 0; _counter = 0;
_led_interval = 25; _led_interval = 25;
send_led_enable(true); send_led_enable(true);
break; break;
case RGBLED_MODE_PATTERN: case RGBLED_MODE_PATTERN:
should_run = true; _should_run = true;
_counter = 0; _counter = 0;
_brightness = 1.0f; _brightness = 1.0f;
send_led_enable(true); send_led_enable(true);
@ -471,7 +473,7 @@ RGBLED::set_mode(rgbled_mode_t mode)
} }
/* if it should run now, start the workq */ /* if it should run now, start the workq */
if (should_run && !_running) { if (_should_run && !_running) {
_running = true; _running = true;
work_queue(LPWORK, &_work, (worker_t)&RGBLED::led_trampoline, this, 1); work_queue(LPWORK, &_work, (worker_t)&RGBLED::led_trampoline, this, 1);
} }