blinkm: merged NuttX and POSIX impelmentations

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
10 years ago · a0d58552a0
3 changed files with 6 additions and 1020 deletions
--- a/src/drivers/blinkm/blinkm_posix.cpp
+++ b/src/drivers/blinkm/blinkm_posix.cpp
@ -275,7 +275,11 @@ const char *const BlinkM::script_names[] = {
				@@ -275,7 +275,11 @@ const char *const BlinkM::script_names[] = {
 extern "C" __EXPORT int blinkm_main(int argc, char *argv[]);

 BlinkM::BlinkM(int bus, int blinkm) :
-	I2C("blinkm", BLINKM0_DEVICE_PATH, bus, blinkm),
+	I2C("blinkm", BLINKM0_DEVICE_PATH, bus, blinkm
+#ifdef __PX4_NUTTX
+		, 100000
+#endif
+		),
 	led_color_1(LED_OFF),
 	led_color_2(LED_OFF),
 	led_color_3(LED_OFF),
--- a/src/drivers/blinkm/blinkm_nuttx.cpp
+++ b/src/drivers/blinkm/blinkm_nuttx.cpp
--- a/src/drivers/blinkm/module.mk
+++ b/src/drivers/blinkm/module.mk
@ -37,10 +37,6 @@
				@@ -37,10 +37,6 @@

 MODULE_COMMAND	= blinkm

-ifeq ($(PX4_TARGET_OS),nuttx)
-SRCS		= blinkm_nuttx.cpp
-else
-SRCS		= blinkm_posix.cpp
-endif
+SRCS		= blinkm.cpp

 MAXOPTIMIZATION	 = -Os