Major patch to split haptic and audio queues into separate systems.

Patch is testing and working on the sky9xboard and the stock board.  I dont have a gruvin board to test on.

Currently only events that trigger haptic alerts are WARNING1-3 and TRIM MIDDLE.  

Next step is for bertrand to use the hooks to enable a per alert option to choose enable haptic.

Also... translations are added but the menu file does not use the translation yet - as I have not got my head round how this works!
This commit is contained in:
rob@marotori.com
2012-04-13 12:22:04 +00:00
parent f59d7a3836
commit f7b1754257
12 changed files with 106 additions and 183 deletions
+17 -8
View File
@@ -19,7 +19,7 @@
# PCB version
# Values: STD, V4, ARM
PCB = STD
PCB = ARM
# PCB revision
# Values: REVA, REVB
@@ -29,7 +29,7 @@ PCBREV = REVB
# For this option you need to modify your hardware!
# More information at [insertURLhere]
# Values = STD, FRSKY, JETI, NMEA, ARDUPILOT, MAVLINK
EXT = STD
EXT = FRSKY
# Enable heli menu
# Values = YES, NO
@@ -37,7 +37,7 @@ HELI = NO
# Enable templates menu
# Values = YES, NO
TEMPLATES = YES
TEMPLATES = NO
# Enable navigation with Pots / Rotary encoders
# Values = NO
@@ -54,11 +54,11 @@ endif
# AUDIO Mods
# Values = YES, NO
AUDIO = NO
AUDIO = YES
# HAPTIC Mods
# Values = YES, NO
HAPTIC = NO
HAPTIC = YES
# SPLASH on START
SPLASH = YES
@@ -84,13 +84,13 @@ WS_HOW_HIGH = YES
LOGS = YES
# PXX (FrSky PCM) protocol
PXX = NO
PXX = YES
# PPM16
PPM16 = NO
# DSM2 (Spektrum) protocol
DSM2 = NO
DSM2 = YES
# SOMO-14D module (V4 board only)
SOMO = NO
@@ -101,7 +101,7 @@ TRANSLATIONS = EN
# EEPROM_PROGRESS_BAR
# Values = YES, NO
EEPROM_PROGRESS_BAR = NO
EEPROM_PROGRESS_BAR = YES
# Enable extra rotary encoders (V4 board only)
# Values = YES, NO
@@ -280,6 +280,8 @@ ifeq ($(PCB), ARM)
PULSESSRC = pulses_arm.cpp
CPPSRC += audio.cpp
CPPSRC += ersky9x/sound.cpp
CPPSRC += haptic.cpp
CPPSRC += ersky9x/haptic.cpp
endif
ifeq ($(PCB), V4)
@@ -291,6 +293,7 @@ ifeq ($(PCB), V4)
EEPROMSRC = eeprom_avr.cpp
PULSESSRC = pulses_avr.cpp
CPPSRC += audio.cpp
CPPSRC += haptic.cpp
CPPSRC += gruvin9x/gtime.cpp
CPPSRC += gruvin9x/rtc.cpp
CPPSRC += gruvin9x/ff.cpp
@@ -332,6 +335,12 @@ ifeq ($(PCB), STD)
else
CPPSRC += beeper.cpp
endif
ifeq ($(HAPTIC), YES)
CPPDEFS += -DHAPTIC
CPPSRC += haptic.cpp
endif
endif
### Global Build-Option Directives ###