diff options
| author | Marco Bauer <marco@wtns.de> | 2013-01-13 18:04:07 +0100 |
|---|---|---|
| committer | Marco Bauer <marco@wtns.de> | 2013-01-13 18:04:07 +0100 |
| commit | 825012b029a09e51828136deed3a24fab95c4780 (patch) | |
| tree | b85b69b46f89feb96164a3c9fd3fb2cff73b8f32 /apps | |
| parent | a2a87d101903fd9f703a58950a758b30f18fd384 (diff) | |
| download | px4-firmware-825012b029a09e51828136deed3a24fab95c4780.tar.gz px4-firmware-825012b029a09e51828136deed3a24fab95c4780.tar.bz2 px4-firmware-825012b029a09e51828136deed3a24fab95c4780.zip | |
switched to initialiser list and member variables
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/drivers/blinkm/blinkm.cpp | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/apps/drivers/blinkm/blinkm.cpp b/apps/drivers/blinkm/blinkm.cpp index 90dfa3eea..b1e20d4f8 100644 --- a/apps/drivers/blinkm/blinkm.cpp +++ b/apps/drivers/blinkm/blinkm.cpp @@ -119,6 +119,7 @@ public: BlinkM(int bus); ~BlinkM(); + virtual int init(); virtual int probe(); virtual int setMode(int mode); @@ -166,15 +167,15 @@ private: work_s _work; - static int led_color_1; - static int led_color_2; - static int led_color_3; - static int led_color_4; - static int led_color_5; - static int led_color_6; - static int led_blink; + int led_color_1; + int led_color_2; + int led_color_3; + int led_color_4; + int led_color_5; + int led_color_6; + int led_blink; - static bool systemstate_run; + bool systemstate_run; void setLEDColor(int ledcolor); static void led_trampoline(void *arg); @@ -233,7 +234,7 @@ const char *BlinkM::script_names[] = { nullptr }; - +/* int BlinkM::led_color_1 = LED_OFF; int BlinkM::led_color_2 = LED_OFF; int BlinkM::led_color_3 = LED_OFF; @@ -243,12 +244,20 @@ int BlinkM::led_color_6 = LED_OFF; int BlinkM::led_blink = LED_NOBLINK; bool BlinkM::systemstate_run = false; - +*/ extern "C" __EXPORT int blinkm_main(int argc, char *argv[]); BlinkM::BlinkM(int bus) : - I2C("blinkm", BLINKM_DEVICE_PATH, bus, 0x09, 100000) + I2C("blinkm", BLINKM_DEVICE_PATH, bus, 0x09, 100000), + led_color_1(LED_OFF), + led_color_2(LED_OFF), + led_color_3(LED_OFF), + led_color_4(LED_OFF), + led_color_5(LED_OFF), + led_color_6(LED_OFF), + led_blink(LED_NOBLINK), + systemstate_run(false) { memset(&_work, 0, sizeof(_work)); } |