aboutsummaryrefslogtreecommitdiff
path: root/src/modules/commander/commander_helper.cpp
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2013-08-16 18:05:59 +0200
committerJulian Oes <julian@oes.ch>2013-08-16 18:05:59 +0200
commit451adf2aa0d9795f69f5675b00ff3fb245312eb0 (patch)
tree40fbb2b356ecd2dbdbed63a4d25fa26823eaef12 /src/modules/commander/commander_helper.cpp
parentaf3e0d459a018fe37d647d3089b4ea681d9244f4 (diff)
downloadpx4-firmware-451adf2aa0d9795f69f5675b00ff3fb245312eb0.tar.gz
px4-firmware-451adf2aa0d9795f69f5675b00ff3fb245312eb0.tar.bz2
px4-firmware-451adf2aa0d9795f69f5675b00ff3fb245312eb0.zip
Added part of RGBLED stuff to commander
Diffstat (limited to 'src/modules/commander/commander_helper.cpp')
-rw-r--r--src/modules/commander/commander_helper.cpp27
1 files changed, 21 insertions, 6 deletions
diff --git a/src/modules/commander/commander_helper.cpp b/src/modules/commander/commander_helper.cpp
index d9b255f4f..5df5d8d0c 100644
--- a/src/modules/commander/commander_helper.cpp
+++ b/src/modules/commander/commander_helper.cpp
@@ -122,16 +122,18 @@ int tune_arm()
return ioctl(buzzer, TONE_SET_ALARM, 12);
}
-int tune_critical_bat()
+int tune_low_bat()
{
- return ioctl(buzzer, TONE_SET_ALARM, 14);
+ return ioctl(buzzer, TONE_SET_ALARM, 13);
}
-int tune_low_bat()
+int tune_critical_bat()
{
- return ioctl(buzzer, TONE_SET_ALARM, 13);
+ return ioctl(buzzer, TONE_SET_ALARM, 14);
}
+
+
void tune_stop()
{
ioctl(buzzer, TONE_SET_ALARM, 0);
@@ -201,9 +203,22 @@ int led_off(int led)
return ioctl(leds, LED_OFF, led);
}
-int rgbled_set_color(rgbled_color_t color) {
+void rgbled_set_color(rgbled_color_t color) {
+
+ if (rgbleds != -1)
+ ioctl(rgbleds, RGBLED_SET_COLOR, (unsigned long)color);
+}
+
+void rgbled_set_mode(rgbled_mode_t mode) {
+
+ if (rgbleds != -1)
+ ioctl(rgbleds, RGBLED_SET_MODE, (unsigned long)mode);
+}
+
+void rgbled_set_pattern(rgbled_pattern_t *pattern) {
- return ioctl(rgbleds, RGBLED_SET_COLOR, (unsigned long)&color);
+ if (rgbleds != -1)
+ ioctl(rgbleds, RGBLED_SET_PATTERN, (unsigned long)pattern);
}
float battery_remaining_estimate_voltage(float voltage)