Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-21 15:25:17 +03:00
Code Issues Wiki Activity

Haptic function by Rob should now be finished. SD card Model archive function.

Browse source
This commit is contained in:
bsongis 2012-04-16 17:35:54 +00:00
parent 8c6bf54cf9
commit fe9afeb6a2
24 changed files with 556 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Makefile
View file

@ -230,10 +230,6 @@ ifeq ($(FLIGHT_PHASES), YES)
CPPDEFS += -DFLIGHT_PHASES CPPDEFS += -DFLIGHT_PHASES
endif endif
ifeq ($(HAPTIC), YES)
CPPDEFS += -DHAPTIC
endif
# If ARDUPILOT-Support is enabled # If ARDUPILOT-Support is enabled
ifeq ($(EXT), ARDUPILOT) ifeq ($(EXT), ARDUPILOT)
CPPDEFS += -DARDUPILOT CPPDEFS += -DARDUPILOT
@ -292,7 +288,7 @@ ifeq ($(PCB), ARM)
# ersky9x/ff.c ersky9x/diskio_sam3s.c ersky9x/Media.c ersky9x/ccsbcs.c ersky9x/sdcard.c ersky9x/MEDSdcard.c # ersky9x/ff.c ersky9x/diskio_sam3s.c ersky9x/Media.c ersky9x/ccsbcs.c ersky9x/sdcard.c ersky9x/MEDSdcard.c
EEPROMSRC = eeprom_arm.cpp EEPROMSRC = eeprom_arm.cpp
PULSESSRC = pulses_arm.cpp PULSESSRC = pulses_arm.cpp
CPPSRC += audio.cpp CPPSRC += audio.cpp haptic.cpp
CPPSRC += ersky9x/sound.cpp CPPSRC += ersky9x/sound.cpp
endif endif
@ -304,7 +300,7 @@ ifeq ($(PCB), V4)
BOARDSRC += board_gruvin9x.cpp BOARDSRC += board_gruvin9x.cpp
EEPROMSRC = eeprom_avr.cpp EEPROMSRC = eeprom_avr.cpp
PULSESSRC = pulses_avr.cpp PULSESSRC = pulses_avr.cpp
CPPSRC += audio.cpp CPPSRC += audio.cpp haptic.cpp
CPPSRC += gruvin9x/gtime.cpp CPPSRC += gruvin9x/gtime.cpp
CPPSRC += gruvin9x/rtc.cpp CPPSRC += gruvin9x/rtc.cpp
CPPSRC += gruvin9x/ff.cpp CPPSRC += gruvin9x/ff.cpp
@ -346,6 +342,12 @@ ifeq ($(PCB), STD)
else else
CPPSRC += beeper.cpp CPPSRC += beeper.cpp
endif endif
ifeq ($(HAPTIC), YES)
CPPDEFS += -DHAPTIC
CPPSRC += haptic.cpp
endif
endif endif
### Global Build-Option Directives ### ### Global Build-Option Directives ###

173
src/audio.cpp
View file

@ -40,20 +40,8 @@ audioQueue::audioQueue()
t_queueRidx = 0; t_queueRidx = 0;
t_queueWidx = 0; t_queueWidx = 0;
#ifdef HAPTIC
hapticTick = 0;
hapticSpinUpTime = 0;
#endif
} }
#if 0
bool audioQueue::freeslots(uint8_t slots)
{
return AUDIO_QUEUE_LENGTH - ((t_queueWidx + AUDIO_QUEUE_LENGTH - t_queueRidx) % AUDIO_QUEUE_LENGTH) >= slots;
}
#endif
// heartbeat is responsibile for issueing the audio tones and general square waves // heartbeat is responsibile for issueing the audio tones and general square waves
// it is essentially the life of the class. // it is essentially the life of the class.
// it is called every 10ms // it is called every 10ms
@ -70,27 +58,8 @@ void audioQueue::heartbeat()
toneFreqIncr * 61 / 2)) { toneFreqIncr * 61 / 2)) {
toneTimeLeft = 0; //time gets counted down toneTimeLeft = 0; //time gets counted down
} }
#if defined(HAPTIC)
if (toneHaptic) {
hapticOn((g_eeGeneral.hapticStrength * 2) * 10);
hapticSpinUpTime = HAPTIC_SPINUP; //min time haptic runs for. Might be worth a config option in system prefs to allow user to set to suit motor?
}
#endif
} }
else { else {
#if defined(HAPTIC)
if(hapticSpinUpTime > 0){
hapticSpinUpTime--;
} else {
hapticOff();
}
#endif
if (tonePause) { if (tonePause) {
if (queueTone(0, tonePause * 10, 0)) { if (queueTone(0, tonePause * 10, 0)) {
tonePause = 0; //time gets counted down tonePause = 0; //time gets counted down
@ -102,8 +71,6 @@ void audioQueue::heartbeat()
toneTimeLeft = queueToneLength[t_queueRidx]; toneTimeLeft = queueToneLength[t_queueRidx];
toneFreqIncr = queueToneFreqIncr[t_queueRidx]; toneFreqIncr = queueToneFreqIncr[t_queueRidx];
tonePause = queueTonePause[t_queueRidx]; tonePause = queueTonePause[t_queueRidx];
toneHaptic = queueToneHaptic[t_queueRidx];
hapticTick = 0;
if (!queueToneRepeat[t_queueRidx]--) { if (!queueToneRepeat[t_queueRidx]--) {
t_queueRidx = (t_queueRidx + 1) % AUDIO_QUEUE_LENGTH; t_queueRidx = (t_queueRidx + 1) % AUDIO_QUEUE_LENGTH;
} }
@ -120,23 +87,10 @@ void audioQueue::heartbeat()
#endif #endif
toneTimeLeft--; //time gets counted down toneTimeLeft--; //time gets counted down
toneFreq += toneFreqIncr; toneFreq += toneFreqIncr;
#if defined(HAPTIC)
if (toneHaptic){
if (hapticTick-- > 0) {
HAPTIC_ON; // haptic output 'high'
}
else {
HAPTIC_OFF; // haptic output 'low'
hapticTick = g_eeGeneral.hapticStrength;
}
}
#endif
} }
else { else {
SPEAKER_OFF; SPEAKER_OFF;
HAPTIC_OFF;
if (tonePause > 0) { if (tonePause > 0) {
tonePause--; tonePause--;
} }
@ -145,9 +99,7 @@ void audioQueue::heartbeat()
toneTimeLeft = queueToneLength[t_queueRidx]; toneTimeLeft = queueToneLength[t_queueRidx];
toneFreqIncr = queueToneFreqIncr[t_queueRidx]; toneFreqIncr = queueToneFreqIncr[t_queueRidx];
tonePause = queueTonePause[t_queueRidx]; tonePause = queueTonePause[t_queueRidx];
#if defined(HAPTIC)
toneHaptic = queueToneHaptic[t_queueRidx];
#endif
if (!queueToneRepeat[t_queueRidx]--) { if (!queueToneRepeat[t_queueRidx]--) {
t_queueRidx = (t_queueRidx + 1) % AUDIO_QUEUE_LENGTH; t_queueRidx = (t_queueRidx + 1) % AUDIO_QUEUE_LENGTH;
} }
@ -169,38 +121,30 @@ inline uint8_t audioQueue::getToneLength(uint8_t tLen)
} }
bool s_beeper; bool s_beeper;
#if defined(HAPTIC)
bool s_haptic;
#endif
void audioQueue::playNow(uint8_t tFreq, uint8_t tLen, uint8_t tPause, void audioQueue::playNow(uint8_t tFreq, uint8_t tLen, uint8_t tPause,
uint8_t tRepeat, uint8_t tHaptic, int8_t tFreqIncr) uint8_t tRepeat, int8_t tFreqIncr)
{ {
toneFreq = ((s_beeper && tFreq) ? tFreq + g_eeGeneral.speakerPitch + BEEP_OFFSET : 0); // add pitch compensator toneFreq = ((s_beeper && tFreq) ? tFreq + g_eeGeneral.speakerPitch + BEEP_OFFSET : 0); // add pitch compensator
toneTimeLeft = getToneLength(tLen); toneTimeLeft = getToneLength(tLen);
tonePause = tPause; tonePause = tPause;
#if defined(HAPTIC)
toneHaptic = s_haptic ? tHaptic : 0;
#endif
toneFreqIncr = tFreqIncr; toneFreqIncr = tFreqIncr;
t_queueWidx = t_queueRidx; t_queueWidx = t_queueRidx;
if (tRepeat) { if (tRepeat) {
playASAP(tFreq, tLen, tPause, tRepeat-1, tHaptic, tFreqIncr); playASAP(tFreq, tLen, tPause, tRepeat-1, tFreqIncr);
} }
} }
void audioQueue::playASAP(uint8_t tFreq, uint8_t tLen, uint8_t tPause, void audioQueue::playASAP(uint8_t tFreq, uint8_t tLen, uint8_t tPause,
uint8_t tRepeat, uint8_t tHaptic, int8_t tFreqIncr) uint8_t tRepeat, int8_t tFreqIncr)
{ {
uint8_t next_queueWidx = (t_queueWidx + 1) % AUDIO_QUEUE_LENGTH; uint8_t next_queueWidx = (t_queueWidx + 1) % AUDIO_QUEUE_LENGTH;
if (next_queueWidx != t_queueRidx) { if (next_queueWidx != t_queueRidx) {
queueToneFreq[t_queueWidx] = ((s_beeper && tFreq) ? tFreq + g_eeGeneral.speakerPitch + BEEP_OFFSET : 0); // add pitch compensator queueToneFreq[t_queueWidx] = ((s_beeper && tFreq) ? tFreq + g_eeGeneral.speakerPitch + BEEP_OFFSET : 0); // add pitch compensator
queueToneLength[t_queueWidx] = getToneLength(tLen); queueToneLength[t_queueWidx] = getToneLength(tLen);
queueTonePause[t_queueWidx] = tPause; queueTonePause[t_queueWidx] = tPause;
#if defined(HAPTIC)
queueToneHaptic[t_queueWidx] = s_haptic ? tHaptic : 0;
#endif
queueToneRepeat[t_queueWidx] = tRepeat; queueToneRepeat[t_queueWidx] = tRepeat;
queueToneFreqIncr[t_queueWidx] = tFreqIncr; queueToneFreqIncr[t_queueWidx] = tFreqIncr;
t_queueWidx = next_queueWidx; t_queueWidx = next_queueWidx;
@ -210,9 +154,6 @@ void audioQueue::playASAP(uint8_t tFreq, uint8_t tLen, uint8_t tPause,
void audioQueue::event(uint8_t e, uint8_t f) void audioQueue::event(uint8_t e, uint8_t f)
{ {
s_beeper = (g_eeGeneral.beeperMode>0 || (g_eeGeneral.beeperMode==0 && e>=AU_WARNING1) || (g_eeGeneral.beeperMode>=-1 && e<=AU_ERROR)); s_beeper = (g_eeGeneral.beeperMode>0 || (g_eeGeneral.beeperMode==0 && e>=AU_WARNING1) || (g_eeGeneral.beeperMode>=-1 && e<=AU_ERROR));
#if defined(HAPTIC)
s_haptic = (g_eeGeneral.hapticMode>0 || (g_eeGeneral.hapticMode==0 && e>=AU_WARNING1) || (g_eeGeneral.hapticMode>=-1 && e<=AU_ERROR));
#endif
if (g_eeGeneral.flashBeep && (e <= AU_ERROR || e >= AU_WARNING1)) g_LightOffCounter = FLASH_DURATION; // we got an event do we need to flash the display ? if (g_eeGeneral.flashBeep && (e <= AU_ERROR || e >= AU_WARNING1)) g_LightOffCounter = FLASH_DURATION; // we got an event do we need to flash the display ?
if (e < AU_FRSKY_FIRST || empty()) { if (e < AU_FRSKY_FIRST || empty()) {
switch (e) { switch (e) {
@ -223,25 +164,25 @@ void audioQueue::event(uint8_t e, uint8_t f)
// low battery in tx // low battery in tx
case AU_TX_BATTERY_LOW: case AU_TX_BATTERY_LOW:
if (empty()) { if (empty()) {
playASAP(60, 20, 3, 2, 0, 1); playASAP(60, 20, 3, 2, 1);
playASAP(80, 20, 3, 2, 1, -1); playASAP(80, 20, 3, 2, -1);
} }
break; break;
// error // error
case AU_ERROR: case AU_ERROR:
playNow(BEEP_DEFAULT_FREQ, 40, 1, 0, 1); playNow(BEEP_DEFAULT_FREQ, 40, 1, 0);
break; break;
// keypad up (seems to be used when going left/right through system menu options. 0-100 scales etc) // keypad up (seems to be used when going left/right through system menu options. 0-100 scales etc)
case AU_KEYPAD_UP: case AU_KEYPAD_UP:
playNow(BEEP_KEY_UP_FREQ, 10, 1, 0, 1); playNow(BEEP_KEY_UP_FREQ, 10, 1, 0);
break; break;
// keypad down (seems to be used when going left/right through system menu options. 0-100 scales etc) // keypad down (seems to be used when going left/right through system menu options. 0-100 scales etc)
case AU_KEYPAD_DOWN: case AU_KEYPAD_DOWN:
playNow(BEEP_KEY_DOWN_FREQ, 10, 1, 0, 1); playNow(BEEP_KEY_DOWN_FREQ, 10, 1, 0);
break; break;
// menu display (also used by a few generic beeps) // menu display (also used by a few generic beeps)
case AU_MENUS: case AU_MENUS:
playNow(BEEP_DEFAULT_FREQ, 10, 2, 0, 1); playNow(BEEP_DEFAULT_FREQ, 10, 2, 0);
break; break;
// trim move // trim move
case AU_TRIM_MOVE: case AU_TRIM_MOVE:
@ -249,19 +190,19 @@ void audioQueue::event(uint8_t e, uint8_t f)
break; break;
// trim center // trim center
case AU_TRIM_MIDDLE: case AU_TRIM_MIDDLE:
playNow(BEEP_DEFAULT_FREQ, 10, 2, 0, 1); playNow(BEEP_DEFAULT_FREQ, 10, 2, 0);
break; break;
// warning one // warning one
case AU_WARNING1: case AU_WARNING1:
playNow(BEEP_DEFAULT_FREQ, 10, 1, 0, 1); playNow(BEEP_DEFAULT_FREQ, 10, 1, 0);
break; break;
// warning two // warning two
case AU_WARNING2: case AU_WARNING2:
playNow(BEEP_DEFAULT_FREQ, 20, 1, 0, 1); playNow(BEEP_DEFAULT_FREQ, 20, 1, 0);
break; break;
// warning three // warning three
case AU_WARNING3: case AU_WARNING3:
playNow(BEEP_DEFAULT_FREQ, 30, 1, 0, 1); playNow(BEEP_DEFAULT_FREQ, 30, 1, 0);
break; break;
// startup tune // startup tune
case AU_TADA: case AU_TADA:
@ -271,63 +212,63 @@ void audioQueue::event(uint8_t e, uint8_t f)
break; break;
// pot/stick center // pot/stick center
case AU_POT_STICK_MIDDLE: case AU_POT_STICK_MIDDLE:
playNow(BEEP_DEFAULT_FREQ + 50, 10, 1, 0, 0); playNow(BEEP_DEFAULT_FREQ + 50, 10, 1, 0);
break; break;
// mix warning 1 // mix warning 1
case AU_MIX_WARNING_1: case AU_MIX_WARNING_1:
playNow(BEEP_DEFAULT_FREQ + 50, 6, 0, 0, 1); playNow(BEEP_DEFAULT_FREQ + 50, 6, 0, 0);
break; break;
// mix warning 2 // mix warning 2
case AU_MIX_WARNING_2: case AU_MIX_WARNING_2:
playNow(BEEP_DEFAULT_FREQ + 52, 6, 0, 0, 1); playNow(BEEP_DEFAULT_FREQ + 52, 6, 0, 0);
break; break;
// mix warning 3 // mix warning 3
case AU_MIX_WARNING_3: case AU_MIX_WARNING_3:
playNow(BEEP_DEFAULT_FREQ + 54, 6, 0, 0, 1); playNow(BEEP_DEFAULT_FREQ + 54, 6, 0, 0);
break; break;
// time 30 seconds left // time 30 seconds left
case AU_TIMER_30: case AU_TIMER_30:
playNow(BEEP_DEFAULT_FREQ + 50, 15, 3, 3, 1); playNow(BEEP_DEFAULT_FREQ + 50, 15, 3, 3);
break; break;
// time 20 seconds left // time 20 seconds left
case AU_TIMER_20: case AU_TIMER_20:
playNow(BEEP_DEFAULT_FREQ + 50, 15, 3, 2, 1); playNow(BEEP_DEFAULT_FREQ + 50, 15, 3, 2);
break; break;
// time 10 seconds left // time 10 seconds left
case AU_TIMER_10: case AU_TIMER_10:
playNow(BEEP_DEFAULT_FREQ + 50, 15, 3, 1, 1); playNow(BEEP_DEFAULT_FREQ + 50, 15, 3, 1);
break; break;
// time <3 seconds left // time <3 seconds left
case AU_TIMER_LT3: case AU_TIMER_LT3:
playNow(BEEP_DEFAULT_FREQ, 20, 25, 1, 1); playNow(BEEP_DEFAULT_FREQ, 20, 25, 1);
break; break;
case AU_FRSKY_WARN1: case AU_FRSKY_WARN1:
playASAP(BEEP_DEFAULT_FREQ+20,15,5,2,1); playASAP(BEEP_DEFAULT_FREQ+20,15,5,2);
break; break;
case AU_FRSKY_WARN2: case AU_FRSKY_WARN2:
playASAP(BEEP_DEFAULT_FREQ+30,15,5,2,1); playASAP(BEEP_DEFAULT_FREQ+30,15,5,2);
break; break;
case AU_FRSKY_CHEEP: case AU_FRSKY_CHEEP:
playASAP(BEEP_DEFAULT_FREQ+30,10,2,2,1,2); playASAP(BEEP_DEFAULT_FREQ+30,10,2,2,2);
break; break;
case AU_FRSKY_RING: case AU_FRSKY_RING:
playASAP(BEEP_DEFAULT_FREQ+25,5,2,10,1); playASAP(BEEP_DEFAULT_FREQ+25,5,2,10);
playASAP(BEEP_DEFAULT_FREQ+25,5,10,1,1); playASAP(BEEP_DEFAULT_FREQ+25,5,10,1);
playASAP(BEEP_DEFAULT_FREQ+25,5,2,10,1); playASAP(BEEP_DEFAULT_FREQ+25,5,2,10);
break; break;
case AU_FRSKY_SCIFI: case AU_FRSKY_SCIFI:
playASAP(80,10,3,2,0,-1); playASAP(80,10,3,2,-1);
playASAP(60,10,3,2,0,1); playASAP(60,10,3,2,1);
playASAP(70,10,1,0,2); playASAP(70,10,1,0);
break; break;
case AU_FRSKY_ROBOT: case AU_FRSKY_ROBOT:
playASAP(70,5,1,1,1); playASAP(70,5,1,1);
playASAP(50,15,2,1,1); playASAP(50,15,2,1);
playASAP(80,15,2,1,1); playASAP(80,15,2,1);
break; break;
case AU_FRSKY_CHIRP: case AU_FRSKY_CHIRP:
playASAP(BEEP_DEFAULT_FREQ+40,5,1,2,1); playASAP(BEEP_DEFAULT_FREQ+40,5,1,2);
playASAP(BEEP_DEFAULT_FREQ+54,5,1,3,1); playASAP(BEEP_DEFAULT_FREQ+54,5,1,3);
break; break;
case AU_FRSKY_TADA: case AU_FRSKY_TADA:
playASAP(50,5,5); playASAP(50,5,5);
@ -335,40 +276,25 @@ void audioQueue::event(uint8_t e, uint8_t f)
playASAP(110,3,4,2); playASAP(110,3,4,2);
break; break;
case AU_FRSKY_CRICKET: case AU_FRSKY_CRICKET:
playASAP(80,5,10,3,1); playASAP(80,5,10,3);
playASAP(80,5,20,1,1); playASAP(80,5,20,1);
playASAP(80,5,10,3,1); playASAP(80,5,10,3);
break; break;
case AU_FRSKY_SIREN: case AU_FRSKY_SIREN:
playASAP(10,20,5,2,1,1); playASAP(10,20,5,2,1);
break; break;
case AU_FRSKY_ALARMC: case AU_FRSKY_ALARMC:
playASAP(50,4,10,2,1); playASAP(50,4,10,2);
playASAP(70,8,20,1,1); playASAP(70,8,20,1);
playASAP(50,8,10,2,1); playASAP(50,8,10,2);
playASAP(70,4,20,1,1); playASAP(70,4,20,1);
break; break;
case AU_FRSKY_RATATA: case AU_FRSKY_RATATA:
playASAP(BEEP_DEFAULT_FREQ+50,5,10,10,1); playASAP(BEEP_DEFAULT_FREQ+50,5,10,10);
break; break;
case AU_FRSKY_TICK: case AU_FRSKY_TICK:
playASAP(BEEP_DEFAULT_FREQ+50,5,50,2,1); playASAP(BEEP_DEFAULT_FREQ+50,5,50,2);
break; break;
#ifdef HAPTIC
case AU_FRSKY_HAPTIC1:
playASAP(0,30,10,0,1);
playASAP(0,10,50,0,1);
break;
case AU_FRSKY_HAPTIC2:
playASAP(0,30,10,0,1);
playASAP(0,10,10,0,1);
playASAP(0,10,30,0,1);
break;
case AU_FRSKY_HAPTIC3:
playASAP(0,30,10,0,1);
playASAP(0,10,10,2,1);
break;
#endif
default: default:
break; break;
} }
@ -378,4 +304,7 @@ void audioQueue::event(uint8_t e, uint8_t f)
void audioDefevent(uint8_t e) void audioDefevent(uint8_t e)
{ {
audio.event(e, BEEP_DEFAULT_FREQ); audio.event(e, BEEP_DEFAULT_FREQ);
#ifdef HAPTIC
hapticAudioEvent(e);
#endif
} }

28
src/audio.h
View file

@ -34,13 +34,6 @@
#ifndef audio_h #ifndef audio_h
#define audio_h #define audio_h
//#define ISER9X //enable this define for er9x. comment out for open9x
#if defined(ISER9X)
#define HAPTIC
#define PCBSTD
#endif
#if defined(PCBARM) #if defined(PCBARM)
#include "ersky9x/sound.h" #include "ersky9x/sound.h"
#endif #endif
@ -66,10 +59,10 @@ enum AUDIO_SOUNDS {
AU_KEYPAD_DOWN, AU_KEYPAD_DOWN,
AU_MENUS, AU_MENUS,
AU_TRIM_MOVE, AU_TRIM_MOVE,
AU_TRIM_MIDDLE,
AU_WARNING1, AU_WARNING1,
AU_WARNING2, AU_WARNING2,
AU_WARNING3, AU_WARNING3,
AU_TRIM_MIDDLE,
AU_TADA, AU_TADA,
AU_POT_STICK_MIDDLE, AU_POT_STICK_MIDDLE,
AU_MIX_WARNING_1, AU_MIX_WARNING_1,
@ -93,11 +86,6 @@ enum AUDIO_SOUNDS {
AU_FRSKY_ALARMC, AU_FRSKY_ALARMC,
AU_FRSKY_RATATA, AU_FRSKY_RATATA,
AU_FRSKY_TICK, AU_FRSKY_TICK,
#ifdef HAPTIC
AU_FRSKY_HAPTIC1,
AU_FRSKY_HAPTIC2,
AU_FRSKY_HAPTIC3,
#endif
AU_FRSKY_LAST, AU_FRSKY_LAST,
}; };
@ -109,9 +97,9 @@ class audioQueue
// only difference between these two functions is that one does the // only difference between these two functions is that one does the
// interupt queue (Now) and the other queues for playing ASAP. // interupt queue (Now) and the other queues for playing ASAP.
void playNow(uint8_t tFreq, uint8_t tLen, uint8_t tPause, uint8_t tRepeat=0, uint8_t tHaptic=0, int8_t tFreqIncr=0); void playNow(uint8_t tFreq, uint8_t tLen, uint8_t tPause, uint8_t tRepeat=0, int8_t tFreqIncr=0);
void playASAP(uint8_t tFreq, uint8_t tLen, uint8_t tPause, uint8_t tRepeat=0, uint8_t tHaptic=0, int8_t tFreqIncr=0); void playASAP(uint8_t tFreq, uint8_t tLen, uint8_t tPause, uint8_t tRepeat=0, int8_t tFreqIncr=0);
inline bool busy() { return (toneTimeLeft > 0); } inline bool busy() { return (toneTimeLeft > 0); }
@ -184,13 +172,6 @@ class audioQueue
uint8_t queueTonePause[AUDIO_QUEUE_LENGTH]; uint8_t queueTonePause[AUDIO_QUEUE_LENGTH];
uint8_t queueToneRepeat[AUDIO_QUEUE_LENGTH]; uint8_t queueToneRepeat[AUDIO_QUEUE_LENGTH];
#ifdef HAPTIC
uint8_t toneHaptic;
uint8_t hapticTick;
uint8_t queueToneHaptic[AUDIO_QUEUE_LENGTH];
uint8_t hapticSpinUpTime;
#endif
#if defined(PCBSTD) #if defined(PCBSTD)
uint8_t toneCounter; uint8_t toneCounter;
#endif #endif
@ -201,8 +182,6 @@ extern audioQueue audio;
void audioDefevent(uint8_t e); void audioDefevent(uint8_t e);
#define HAPTIC_SPINUP (10);
#define AUDIO_KEYPAD_UP() audioDefevent(AU_KEYPAD_UP) #define AUDIO_KEYPAD_UP() audioDefevent(AU_KEYPAD_UP)
#define AUDIO_KEYPAD_DOWN() audioDefevent(AU_KEYPAD_DOWN) #define AUDIO_KEYPAD_DOWN() audioDefevent(AU_KEYPAD_DOWN)
#define AUDIO_MENUS() audioDefevent(AU_MENUS) #define AUDIO_MENUS() audioDefevent(AU_MENUS)
@ -225,6 +204,7 @@ void audioDefevent(uint8_t e);
#define AUDIO_POT_STICK_MIDDLE() audioDefevent(AU_POT_STICK_MIDDLE) #define AUDIO_POT_STICK_MIDDLE() audioDefevent(AU_POT_STICK_MIDDLE)
#define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP) #define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP)
#define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN) #define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN)
#define AUDIO_TRIM_MIDDLE() audioDefevent(AU_TRIM_MIDDLE)
#if defined(PCBSTD) #if defined(PCBSTD)
#define AUDIO_DRIVER() audio.driver() #define AUDIO_DRIVER() audio.driver()

6
src/beeper.cpp
View file

@ -39,9 +39,6 @@ uint8_t beepAgainOrig = 0;
uint8_t beepOn = false; uint8_t beepOn = false;
bool warble = false; bool warble = false;
bool warbleC; bool warbleC;
#if defined(HAPTIC)
uint8_t hapticTick = 0;
#endif
// The various "beep" tone lengths // The various "beep" tone lengths
static const pm_uint8_t beepTab[] PROGMEM = { static const pm_uint8_t beepTab[] PROGMEM = {
@ -60,4 +57,7 @@ void beep(uint8_t val)
if (g_eeGeneral.beeperMode>0 || (g_eeGeneral.beeperMode==0 && val!=0) || (g_eeGeneral.beeperMode==-1 && val>=3)) { if (g_eeGeneral.beeperMode>0 || (g_eeGeneral.beeperMode==0 && val!=0) || (g_eeGeneral.beeperMode==-1 && val>=3)) {
_beep(pgm_read_byte(beepTab+5*(2+g_eeGeneral.beeperLength)+val)); _beep(pgm_read_byte(beepTab+5*(2+g_eeGeneral.beeperLength)+val));
} }
#ifdef HAPTIC
hapticBeepEvent(val);
#endif
} }

14
src/beeper.h
View file

@ -40,9 +40,6 @@ extern uint8_t beepAgainOrig;
extern uint8_t beepOn; extern uint8_t beepOn;
extern bool warble; extern bool warble;
extern bool warbleC; extern bool warbleC;
#if defined(HAPTIC)
extern uint8_t hapticTick;
#endif
#if defined(PCBARM) #if defined(PCBARM)
#include "ersky9x/sound.h" #include "ersky9x/sound.h"
@ -76,6 +73,7 @@ extern void beep(uint8_t val);
#define AUDIO_POT_STICK_MIDDLE() beep(2) #define AUDIO_POT_STICK_MIDDLE() beep(2)
#define AUDIO_VARIO_UP() _beep(1) #define AUDIO_VARIO_UP() _beep(1)
#define AUDIO_VARIO_DOWN() _beep(1) #define AUDIO_VARIO_DOWN() _beep(1)
#define AUDIO_TRIM_MIDDLE() beep(2)
#define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn) #define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn)
@ -109,19 +107,9 @@ FORCEINLINE void AUDIO_HEARTBEAT()
BUZZER_OFF; BUZZER_OFF;
else else
BUZZER_ON; BUZZER_ON;
#if defined(HAPTIC)
if (hapticTick-- > 0) {
HAPTIC_ON; // haptic output 'high'
}
else {
HAPTIC_OFF; // haptic output 'low'
hapticTick = g_eeGeneral.hapticStrength;
}
#endif
} }
else { else {
BUZZER_OFF; BUZZER_OFF;
HAPTIC_OFF;
} }
} }
#endif #endif

2
src/eeprom_arm.cpp
View file

@ -495,7 +495,7 @@ void eeLoadModel(uint8_t id)
resetProto(); resetProto();
resetAll(); resetAll();
#ifdef LOGS #ifdef SDCARD
initLogs(); initLogs();
#endif #endif
} }

30
src/eeprom_avr.cpp
View file

@ -526,6 +526,34 @@ bool RlcFile::copy(uint8_t i_fileDst, uint8_t i_fileSrc)
return true; return true;
} }
#ifdef SDCARD
const pm_char * eeArchiveModel(uint8_t i_fileSrc)
{
char buf[15];
FIL archiveFile;
eeLoadModelName(i_fileSrc, buf);
FRESULT result = f_open(&archiveFile, buf, FA_OPEN_ALWAYS | FA_WRITE);
if (result != FR_OK) {
return SDCARD_ERROR(result);
}
EFile theFile2;
theFile2.openRd(i_fileSrc);
uint8_t len;
while ((len=theFile2.read((uint8_t *)buf, 15)))
{
for (uint8_t i=0; i<len; i++)
f_putc(buf[i], &g_oLogFile);
}
f_close(&g_oLogFile);
return NULL;
}
#endif
void RlcFile::writeRlc(uint8_t i_fileId, uint8_t typ, uint8_t*buf, uint16_t i_len, uint8_t sync_write) void RlcFile::writeRlc(uint8_t i_fileId, uint8_t typ, uint8_t*buf, uint16_t i_len, uint8_t sync_write)
{ {
create(i_fileId, typ, sync_write); create(i_fileId, typ, sync_write);
@ -718,7 +746,7 @@ void eeLoadModel(uint8_t id)
resetProto(); resetProto();
resetAll(); resetAll();
#ifdef LOGS #ifdef SDCARD
initLogs(); initLogs();
#endif #endif
} }

4
src/eeprom_avr.h
View file

@ -214,5 +214,9 @@ uint16_t evalChkSum();
#define eeCopyModel(dst, src) theFile.copy(FILE_MODEL(dst), FILE_MODEL(src)) #define eeCopyModel(dst, src) theFile.copy(FILE_MODEL(dst), FILE_MODEL(src))
#define eeSwapModels(id1, id2) EFile::swap(FILE_MODEL(id1), FILE_MODEL(id2)) #define eeSwapModels(id1, id2) EFile::swap(FILE_MODEL(id1), FILE_MODEL(id2))
#ifdef SDCARD
const pm_char * eeArchiveModel(uint8_t i_fileSrc);
#endif
#endif #endif
/*eof*/ /*eof*/

140
src/general_menus.cpp
View file

@ -71,6 +71,15 @@ const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = {
menuProcDiagCalib menuProcDiagCalib
}; };
#define GENERAL_PARAM_OFS 17*FW
uint8_t onoffMenuItem( uint8_t value, uint8_t y, const prog_char *s, uint8_t condition, uint8_t event )
{
lcd_putsLeft(y, s);
menu_lcd_onoff( GENERAL_PARAM_OFS, y, value, condition ) ;
if (condition) CHECK_INCDEC_GENVAR(event, value, 0, 1);
return value ;
}
enum menuProcSetupItems { enum menuProcSetupItems {
ITEM_SETUP_BASE=18, ITEM_SETUP_BASE=18,
#ifdef PCBARM #ifdef PCBARM
@ -84,6 +93,7 @@ enum menuProcSetupItems {
#ifdef HAPTIC #ifdef HAPTIC
ITEM_SETUP_HAPTIC_MODE, ITEM_SETUP_HAPTIC_MODE,
ITEM_SETUP_HAPTIC_STRENGTH, ITEM_SETUP_HAPTIC_STRENGTH,
ITEM_SETUP_HAPTIC_LENGTH,
#endif #endif
#ifdef SPLASH #ifdef SPLASH
ITEM_SETUP_SPLASH, ITEM_SETUP_SPLASH,
@ -98,16 +108,13 @@ enum menuProcSetupItems {
void menuProcSetup(uint8_t event) void menuProcSetup(uint8_t event)
{ {
#undef PARAM_OFS
#define PARAM_OFS 17*FW
#ifdef AUDIO #ifdef AUDIO
#define AUDIO_ZEROS 0, #define AUDIO_ZEROS 0,
#else #else
#define AUDIO_ZEROS #define AUDIO_ZEROS
#endif #endif
#ifdef HAPTIC #ifdef HAPTIC
#define HAPTIC_ZEROS 0, 0, #define HAPTIC_ZEROS 0, 0, 0,
#else #else
#define HAPTIC_ZEROS #define HAPTIC_ZEROS
#endif #endif
@ -135,7 +142,7 @@ void menuProcSetup(uint8_t event)
uint8_t subN = 1; uint8_t subN = 1;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_BEEPERMODE); lcd_putsLeft( y, STR_BEEPERMODE);
lcd_putsiAtt(PARAM_OFS - 2*FW, y, STR_VBEEPMODE, 2+g_eeGeneral.beeperMode, (sub==subN ? INVERS:0)); lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPMODE, 2+g_eeGeneral.beeperMode, (sub==subN ? INVERS:0));
if(sub==subN) { if(sub==subN) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.beeperMode, -2, 1); CHECK_INCDEC_GENVAR(event, g_eeGeneral.beeperMode, -2, 1);
#if defined(FRSKY) #if defined(FRSKY)
@ -149,7 +156,7 @@ void menuProcSetup(uint8_t event)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
uint8_t current_volume = g_eeGeneral.speakerVolume; uint8_t current_volume = g_eeGeneral.speakerVolume;
lcd_putsLeft(y, PSTR("Speaker Volume")); // TODO translations lcd_putsLeft(y, PSTR("Speaker Volume")); // TODO translations
lcd_outdezAtt(PARAM_OFS, y, current_volume, (sub==subN ? INVERS : 0)|LEFT); lcd_outdezAtt(GENERAL_PARAM_OFS, y, current_volume, (sub==subN ? INVERS : 0)|LEFT);
if(sub==subN) { if(sub==subN) {
CHECK_INCDEC_GENVAR(event, current_volume, 0, NUM_VOL_LEVELS-1); CHECK_INCDEC_GENVAR(event, current_volume, 0, NUM_VOL_LEVELS-1);
if (current_volume != g_eeGeneral.speakerVolume) { if (current_volume != g_eeGeneral.speakerVolume) {
@ -162,7 +169,7 @@ void menuProcSetup(uint8_t event)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_BEEPERLEN); lcd_putsLeft( y, STR_BEEPERLEN);
lcd_putsiAtt(PARAM_OFS - 2*FW, y, STR_VBEEPLEN, 2+g_eeGeneral.beeperLength, (sub==subN ? INVERS:0)); lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPLEN, 2+g_eeGeneral.beeperLength, (sub==subN ? INVERS:0));
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.beeperLength, -2, 2); if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.beeperLength, -2, 2);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
@ -170,7 +177,7 @@ void menuProcSetup(uint8_t event)
#ifdef AUDIO #ifdef AUDIO
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_SPKRPITCH); lcd_putsLeft( y, STR_SPKRPITCH);
lcd_outdezAtt(PARAM_OFS, y, g_eeGeneral.speakerPitch,(sub==subN ? INVERS : 0)|LEFT); lcd_outdezAtt(GENERAL_PARAM_OFS, y, g_eeGeneral.speakerPitch,(sub==subN ? INVERS : 0)|LEFT);
if (sub==subN) { if (sub==subN) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 100); CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 100);
} }
@ -181,33 +188,38 @@ void menuProcSetup(uint8_t event)
#ifdef HAPTIC #ifdef HAPTIC
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_HAPTICMODE); lcd_putsLeft( y, STR_HAPTICMODE);
lcd_putsiAtt(PARAM_OFS - 2*FW, y, STR_VBEEPMODE, 2+g_eeGeneral.hapticMode, (sub==subN ? INVERS:0)); lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPMODE, 2+g_eeGeneral.hapticMode, (sub==subN ? INVERS:0));
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticMode, -2, 1); if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticMode, -2, 1);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_HAPTICSTRENGTH); lcd_putsLeft( y, STR_HAPTICSTRENGTH);
lcd_outdezAtt(PARAM_OFS, y, g_eeGeneral.hapticStrength, (sub==subN ? INVERS : 0)|LEFT); lcd_outdezAtt(GENERAL_PARAM_OFS, y, g_eeGeneral.hapticStrength, (sub==subN ? INVERS : 0)|LEFT);
if (sub==subN) { if (sub==subN) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticStrength, 0, 5); CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticStrength, 0, 5);
} }
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_HAPTICLENGTH);
lcd_putsiAtt(GENERAL_PARAM_OFS - 2*FW, y, STR_VBEEPLEN, 2+g_eeGeneral.hapticLength, (sub==subN ? INVERS:0));
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.hapticLength, -2, 2);
if((y+=FH)>7*FH) return;
}subN++;
#endif #endif
// TODO port onoffMenuItem here to save flash
#if defined(PCBARM) #if defined(PCBARM)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft(y, PSTR("Optrex Display")); g_eeGeneral.optrexDisplay = onoffMenuItem( g_eeGeneral.optrexDisplay, y, PSTR("Optrex Display"), sub==subN, event ) ;
menu_lcd_onoff(PARAM_OFS, y, g_eeGeneral.optrexDisplay, sub==subN) ;
if (sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.optrexDisplay, 0, 1);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft(y, PSTR("Brightness")); // TODO translations in the whole file ... lcd_putsLeft(y, PSTR("Brightness")); // TODO translations in the whole file ...
lcd_outdezAtt(PARAM_OFS, y, 100-g_eeGeneral.backlightBright, (sub==subN ? INVERS : 0)|LEFT) ; lcd_outdezAtt(GENERAL_PARAM_OFS, y, 100-g_eeGeneral.backlightBright, (sub==subN ? INVERS : 0)|LEFT) ;
if(sub==subN) { if(sub==subN) {
uint8_t b ; uint8_t b ;
b = 100 - g_eeGeneral.backlightBright; b = 100 - g_eeGeneral.backlightBright;
@ -221,7 +233,7 @@ void menuProcSetup(uint8_t event)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_CONTRAST); lcd_putsLeft( y, STR_CONTRAST);
lcd_outdezAtt(PARAM_OFS,y,g_eeGeneral.contrast,(sub==subN ? INVERS : 0)|LEFT); lcd_outdezAtt(GENERAL_PARAM_OFS,y,g_eeGeneral.contrast,(sub==subN ? INVERS : 0)|LEFT);
if(sub==subN) { if(sub==subN) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, 10, 45); CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, 10, 45);
lcdSetRefVolt(g_eeGeneral.contrast); lcdSetRefVolt(g_eeGeneral.contrast);
@ -231,14 +243,14 @@ void menuProcSetup(uint8_t event)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y,STR_BATTERYWARNING); lcd_putsLeft( y,STR_BATTERYWARNING);
putsVolts(PARAM_OFS, y, g_eeGeneral.vBatWarn, (sub==subN ? INVERS : 0)|LEFT); putsVolts(GENERAL_PARAM_OFS, y, g_eeGeneral.vBatWarn, (sub==subN ? INVERS : 0)|LEFT);
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatWarn, 40, 120); //4-12V if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatWarn, 40, 120); //4-12V
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y,STR_INACTIVITYALARM); lcd_putsLeft( y,STR_INACTIVITYALARM);
lcd_outdezAtt(PARAM_OFS, y, g_eeGeneral.inactivityTimer, (sub==subN ? INVERS : 0)|LEFT); lcd_outdezAtt(GENERAL_PARAM_OFS, y, g_eeGeneral.inactivityTimer, (sub==subN ? INVERS : 0)|LEFT);
lcd_putc(lcd_lastPos, y, 'm'); lcd_putc(lcd_lastPos, y, 'm');
if(sub==subN) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes if(sub==subN) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
@ -246,42 +258,34 @@ void menuProcSetup(uint8_t event)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y,STR_FILTERADC); lcd_putsLeft( y,STR_FILTERADC);
lcd_putsiAtt(PARAM_OFS, y, STR_ADCFILTER, g_eeGeneral.filterInput, (sub==subN ? INVERS:0)); lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_ADCFILTER, g_eeGeneral.filterInput, (sub==subN ? INVERS:0));
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.filterInput, 0, 2); if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.filterInput, 0, 2);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y,STR_THROTTLEREVERSE); g_eeGeneral.throttleReversed = onoffMenuItem( g_eeGeneral.throttleReversed, y, STR_THROTTLEREVERSE, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, g_eeGeneral.throttleReversed, sub==subN ) ;
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.throttleReversed, 0, 1);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_MINUTEBEEP); g_eeGeneral.minuteBeep = onoffMenuItem( g_eeGeneral.minuteBeep, y, STR_MINUTEBEEP, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, g_eeGeneral.minuteBeep, sub==subN ) ;
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.minuteBeep, 0, 1);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_BEEPCOUNTDOWN); g_eeGeneral.preBeep = onoffMenuItem( g_eeGeneral.preBeep, y, STR_BEEPCOUNTDOWN, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, g_eeGeneral.preBeep, sub==subN ) ;
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.preBeep, 0, 1);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_FLASHONBEEP); g_eeGeneral.flashBeep = onoffMenuItem( g_eeGeneral.flashBeep, y, STR_FLASHONBEEP, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, g_eeGeneral.flashBeep, sub==subN ) ; if((y+=FH)>7*FH) return;
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.flashBeep, 0, 1);
if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_LIGHTSWITCH); lcd_putsLeft( y, STR_LIGHTSWITCH);
putsSwitches(PARAM_OFS,y,g_eeGeneral.lightSw,sub==subN ? INVERS : 0); putsSwitches(GENERAL_PARAM_OFS,y,g_eeGeneral.lightSw,sub==subN ? INVERS : 0);
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightSw, SWITCH_OFF, SWITCH_ON); if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightSw, SWITCH_OFF, SWITCH_ON);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
@ -289,11 +293,11 @@ void menuProcSetup(uint8_t event)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_LIGHTOFFAFTER); lcd_putsLeft( y, STR_LIGHTOFFAFTER);
if(g_eeGeneral.lightAutoOff) { if(g_eeGeneral.lightAutoOff) {
lcd_outdezAtt(PARAM_OFS, y, g_eeGeneral.lightAutoOff*5,LEFT|(sub==subN ? INVERS : 0)); lcd_outdezAtt(GENERAL_PARAM_OFS, y, g_eeGeneral.lightAutoOff*5,LEFT|(sub==subN ? INVERS : 0));
lcd_putc(lcd_lastPos, y, 's'); lcd_putc(lcd_lastPos, y, 's');
} }
else { else {
lcd_putsiAtt(PARAM_OFS, y, STR_OFFON, 0,(sub==subN ? INVERS:0)); lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_OFFON, 0,(sub==subN ? INVERS:0));
} }
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5); if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
@ -301,77 +305,47 @@ void menuProcSetup(uint8_t event)
#ifdef SPLASH #ifdef SPLASH
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
uint8_t b = 1-g_eeGeneral.disableSplashScreen; uint8_t b = 1-g_eeGeneral.disableSplashScreen;
lcd_putsLeft( y,STR_SPLASHSCREEN); g_eeGeneral.disableSplashScreen = 1 - onoffMenuItem( b, y, STR_SPLASHSCREEN, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, b, sub==subN ) ; if((y+=FH)>7*FH) return;
if(sub==subN)
{
CHECK_INCDEC_GENVAR(event, b, 0, 1);
g_eeGeneral.disableSplashScreen = 1-b;
}
if((y+=FH)>7*FH) return;
}subN++; }subN++;
#endif #endif
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
uint8_t b = 1-g_eeGeneral.disableThrottleWarning; uint8_t b = 1-g_eeGeneral.disableThrottleWarning;
lcd_putsLeft( y,STR_THROTTLEWARNING); g_eeGeneral.disableThrottleWarning = 1-onoffMenuItem( b, y, STR_THROTTLEWARNING, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, b, sub==subN ) ; if((y+=FH)>7*FH) return;
if(sub==subN)
{
CHECK_INCDEC_GENVAR(event, b, 0, 1);
g_eeGeneral.disableThrottleWarning = 1-b;
}
if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_SWITCHWARNING); lcd_putsLeft( y, STR_SWITCHWARNING);
lcd_putsiAtt(PARAM_OFS, y, STR_WARNSW, 1+g_eeGeneral.switchWarning, (sub==subN ? INVERS:0)); lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_WARNSW, 1+g_eeGeneral.switchWarning, (sub==subN ? INVERS:0));
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchWarning, -1, 1); if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchWarning, -1, 1);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
uint8_t b = 1-g_eeGeneral.disableMemoryWarning; uint8_t b = 1-g_eeGeneral.disableMemoryWarning;
lcd_putsLeft( y, STR_MEMORYWARNING); g_eeGeneral.disableMemoryWarning = 1 - onoffMenuItem( b, y, STR_MEMORYWARNING, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, b, sub==subN ) ; if((y+=FH)>7*FH) return;
if(sub==subN)
{
CHECK_INCDEC_GENVAR(event, b, 0, 1);
g_eeGeneral.disableMemoryWarning = 1-b;
}
if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
uint8_t b = 1-g_eeGeneral.disableAlarmWarning; uint8_t b = 1-g_eeGeneral.disableAlarmWarning;
lcd_putsLeft( y,STR_ALARMWARNING); g_eeGeneral.disableAlarmWarning = 1 - onoffMenuItem( b, y, STR_ALARMWARNING, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, b, sub==subN ) ; if((y+=FH)>7*FH) return;
if(sub==subN)
{
CHECK_INCDEC_GENVAR(event, b, 0, 1);
g_eeGeneral.disableAlarmWarning = 1-b;
}
if((y+=FH)>7*FH) return;
}subN++; }subN++;
#ifdef FRSKY #ifdef FRSKY
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
uint8_t b = g_eeGeneral.enableTelemetryAlarm; uint8_t b = g_eeGeneral.enableTelemetryAlarm;
lcd_putsLeft( y,STR_NODATAALARM); g_eeGeneral.disableAlarmWarning = onoffMenuItem( b, y, STR_NODATAALARM, sub==subN, event ) ;
menu_lcd_onoff( PARAM_OFS, y, b, sub==subN ) ; if((y+=FH)>7*FH) return;
if(sub==subN)
{
CHECK_INCDEC_GENVAR(event, b, 0, 1);
g_eeGeneral.enableTelemetryAlarm = b;
}
if((y+=FH)>7*FH) return;
}subN++; }subN++;
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft(y, STR_TIMEZONE); lcd_putsLeft(y, STR_TIMEZONE);
lcd_outdezAtt(PARAM_OFS, y, g_eeGeneral.timezone, LEFT|(sub==subN ? INVERS : 0)); lcd_outdezAtt(GENERAL_PARAM_OFS, y, g_eeGeneral.timezone, LEFT|(sub==subN ? INVERS : 0));
if (sub==subN) if (sub==subN)
CHECK_INCDEC_GENVAR(event, g_eeGeneral.timezone, -12, 12); CHECK_INCDEC_GENVAR(event, g_eeGeneral.timezone, -12, 12);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
@ -379,7 +353,7 @@ void menuProcSetup(uint8_t event)
if(s_pgOfs<subN) { if(s_pgOfs<subN) {
lcd_putsLeft( y, STR_GPSCOORD); lcd_putsLeft( y, STR_GPSCOORD);
lcd_putsiAtt(PARAM_OFS, y, STR_GPSFORMAT, g_eeGeneral.gpsFormat, (sub==subN ? INVERS:0)); lcd_putsiAtt(GENERAL_PARAM_OFS, y, STR_GPSFORMAT, g_eeGeneral.gpsFormat, (sub==subN ? INVERS:0));
if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.gpsFormat, 0, 1); if(sub==subN) CHECK_INCDEC_GENVAR(event, g_eeGeneral.gpsFormat, 0, 1);
if((y+=FH)>7*FH) return; if((y+=FH)>7*FH) return;
}subN++; }subN++;

13
src/gruvin9x/logs.cpp
View file

@ -107,10 +107,7 @@ void initLogs()
else else
{ {
g_logState = -result; g_logState = -result;
if (result == FR_NOT_READY) g_logError = SDCARD_ERROR(result);
g_logError = PSTR("NO SDCARD");
else
g_logError = PSTR("SDCARD ERROR");
return; return;
} }
} }
@ -118,6 +115,14 @@ void initLogs()
// g_logFilename should now be set appropriately. // g_logFilename should now be set appropriately.
} }
const pm_char *SDCARD_ERROR(FRESULT result)
{
if (result == FR_NOT_READY)
return STR_NO_SDCARD;
else
return STR_SDCARD_ERROR;
}
void writeLogs() void writeLogs()
{ {
FRESULT result; FRESULT result;

2
src/gruvin9x/logs.h
View file

@ -44,5 +44,7 @@ extern FIL g_oLogFile;
extern void initLogs(); extern void initLogs();
extern void writeLogs(); extern void writeLogs();
const pm_char *SDCARD_ERROR(FRESULT result);
#endif #endif

150
src/haptic.cpp Normal file
View file

@ -0,0 +1,150 @@
/*
* Authors (alphabetical order)
* - Bertrand Songis <bsongis@gmail.com>
* - Bryan J. Rentoul (Gruvin) <gruvin@gmail.com>
* - Cameron Weeks <th9xer@gmail.com>
* - Erez Raviv
* - Jean-Pierre Parisy
* - Karl Szmutny <shadow@privy.de>
* - Michael Blandford
* - Michal Hlavinka
* - Pat Mackenzie
* - Philip Moss
* - Rob Thomson
* - Romolo Manfredini <romolo.manfredini@gmail.com>
* - Thomas Husterer
*
* open9x is based on code named
* gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/,
* er9x by Erez Raviv: http://code.google.com/p/er9x/,
* and the original (and ongoing) project by
* Thomas Husterer, th9x: http://code.google.com/p/th9x/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#include "open9x.h"
hapticQueue::hapticQueue()
{
buzzTimeLeft = 0;
buzzPause = 0;
t_queueRidx = 0;
t_queueWidx = 0;
hapticTick = 0;
}
void hapticQueue::heartbeat()
{
#if defined(SIMU)
return;
#endif
#if defined(PCBARM)
if (buzzTimeLeft > 0) {
buzzTimeLeft--; //time gets counted down
hapticOn((g_eeGeneral.hapticStrength * 2) * 10);
}
else {
hapticOff();
if (buzzPause > 0) {
buzzPause--;
}
else if (t_queueRidx != t_queueWidx) {
buzzTimeLeft = queueHapticLength[t_queueRidx];
buzzPause = queueHapticPause[t_queueRidx];
if (!queueHapticRepeat[t_queueRidx]--) {
t_queueRidx = (t_queueRidx + 1) % HAPTIC_QUEUE_LENGTH;
}
}
}
#else
if (buzzTimeLeft > 0) {
buzzTimeLeft--; // time gets counted down
if (hapticTick-- > 0) {
HAPTIC_ON; // haptic output 'high'
}
else {
HAPTIC_OFF; // haptic output 'high'
hapticTick = g_eeGeneral.hapticStrength;
}
}
else {
HAPTIC_OFF; // haptic output 'high'
if (buzzPause > 0) {
buzzPause--;
}
else if (t_queueRidx != t_queueWidx) {
buzzTimeLeft = queueHapticLength[t_queueRidx];
buzzPause = queueHapticPause[t_queueRidx];
if (!queueHapticRepeat[t_queueRidx]--) {
t_queueRidx = (t_queueRidx + 1) % HAPTIC_QUEUE_LENGTH;
}
}
}
#endif
}
inline uint8_t hapticQueue::getHapticLength(uint8_t tLen)
{
return ((g_eeGeneral.hapticLength * 2) + tLen) * 2;
}
void hapticQueue::playNow(uint8_t tLen, uint8_t tPause, uint8_t tRepeat)
{
buzzTimeLeft = getHapticLength(tLen);
buzzPause = tPause;
t_queueWidx = t_queueRidx;
if (tRepeat) {
playASAP(tLen, tPause, tRepeat-1);
}
}
void hapticQueue::playASAP(uint8_t tLen, uint8_t tPause, uint8_t tRepeat)
{
uint8_t next_queueWidx = (t_queueWidx + 1) % HAPTIC_QUEUE_LENGTH;
if (next_queueWidx != t_queueRidx) {
queueHapticLength[t_queueWidx] = getHapticLength(tLen);
queueHapticPause[t_queueWidx] = tPause;
queueHapticRepeat[t_queueWidx] = tRepeat-1;
t_queueWidx = next_queueWidx;
}
}
void hapticQueue::event(uint8_t e)
{
switch (e) {
case 0: // very little buzz for keys / trims
playNow(5, 0, 0);
break;
case 1: // one buzz
playASAP(10,2,1);
break;
case 2: // two buzz
playASAP(10,2,2);
break;
case 3: // three buzz
playASAP(10,2,3);
break;
default:
break;
}
}
void hapticDefevent(uint8_t e)
{
haptic.event(e);
}

114
src/haptic.h Normal file
View file

@ -0,0 +1,114 @@
/*
* Authors (alphabetical order)
* - Bertrand Songis <bsongis@gmail.com>
* - Bryan J. Rentoul (Gruvin) <gruvin@gmail.com>
* - Cameron Weeks <th9xer@gmail.com>
* - Erez Raviv
* - Jean-Pierre Parisy
* - Karl Szmutny <shadow@privy.de>
* - Michael Blandford
* - Michal Hlavinka
* - Pat Mackenzie
* - Philip Moss
* - Rob Thomson
* - Romolo Manfredini <romolo.manfredini@gmail.com>
* - Thomas Husterer
*
* open9x is based on code named
* gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/,
* er9x by Erez Raviv: http://code.google.com/p/er9x/,
* and the original (and ongoing) project by
* Thomas Husterer, th9x: http://code.google.com/p/th9x/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef haptic_h
#define haptic_h
#define HAPTIC_QUEUE_LENGTH 3
class hapticQueue
{
public:
hapticQueue();
// only difference between these two functions is that one does the
// interupt queue (Now) and the other queues for playing ASAP.
void playNow(uint8_t tLen, uint8_t tPause, uint8_t tRepeat=0);
void playASAP(uint8_t tLen, uint8_t tPause, uint8_t tRepeat=0);
inline bool busy() { return (buzzTimeLeft > 0); }
void event(uint8_t e);
// heartbeat is responsibile for issueing the haptic buzzs and general square waves
// it is essentially the life of the class.
void heartbeat();
// bool freeslots(uint8_t slots);
inline bool empty() {
return (t_queueRidx == t_queueWidx);
}
protected:
inline uint8_t getHapticLength(uint8_t tLen);
private:
uint8_t t_queueRidx;
uint8_t t_queueWidx;
uint8_t buzzTimeLeft;
uint8_t buzzPause;
uint8_t hapticTick;
// queue arrays
uint8_t queueHapticLength[HAPTIC_QUEUE_LENGTH];
uint8_t queueHapticPause[HAPTIC_QUEUE_LENGTH];
uint8_t queueHapticRepeat[HAPTIC_QUEUE_LENGTH];
};
//wrapper function - dirty but results in a space saving!!!
extern hapticQueue haptic;
void hapticDefevent(uint8_t e);
#define IS_HAPTIC_BUSY() haptic.busy()
#define HAPTIC_HEARTBEAT() haptic.heartbeat()
#ifdef AUDIO
inline void hapticAudioEvent(uint8_t e)
{
if (g_eeGeneral.hapticMode>=-1 && e<=AU_ERROR)
hapticDefevent(1);
else if (g_eeGeneral.hapticMode==0 && e>=AU_WARNING1)
hapticDefevent(1);
else if (g_eeGeneral.hapticMode>0)
hapticDefevent(0);
}
#else
inline void hapticBeepEvent(uint8_t e)
{
if (g_eeGeneral.hapticMode>=-1 && e>=3)
hapticDefevent(1);
else if (g_eeGeneral.hapticMode==0 && e>0)
hapticDefevent(1);
else if (g_eeGeneral.hapticMode>0)
hapticDefevent(0);
}
#endif
#endif // haptic_h

60
src/model_menus.cpp
View file

@ -122,6 +122,11 @@ inline int8_t eeFindEmptyModel(uint8_t id, bool down)
return i; return i;
} }
#ifdef SDCARD
// TODO to be elsewhere if common to many menus
const pm_char * s_sdcard_error = NULL;
#endif
void menuProcModelSelect(uint8_t event) void menuProcModelSelect(uint8_t event)
{ {
TITLE(STR_MENUMODELSEL); TITLE(STR_MENUMODELSEL);
@ -138,7 +143,7 @@ void menuProcModelSelect(uint8_t event)
} }
#if defined(SDCARD) #if defined(SDCARD)
uint8_t _event = (s_warning || s_menu_count) ? 0 : event; uint8_t _event = (s_warning || s_sdcard_error || s_menu_count) ? 0 : event;
#else #else
uint8_t _event = s_warning ? 0 : event; uint8_t _event = s_warning ? 0 : event;
#endif #endif
@ -356,6 +361,12 @@ void menuProcModelSelect(uint8_t event)
} }
#if defined(SDCARD) #if defined(SDCARD)
if (s_sdcard_error) {
s_warning = s_sdcard_error;
displayWarning(event);
s_warning = NULL;
}
if (s_menu_count) { if (s_menu_count) {
const pm_char * result = displayMenu(event); const pm_char * result = displayMenu(event);
if (result) { if (result) {
@ -369,7 +380,7 @@ void menuProcModelSelect(uint8_t event)
} }
} }
else if (result == STR_ARCHIVE_MODEL) { else if (result == STR_ARCHIVE_MODEL) {
// TODO s_sdcard_error = eeArchiveModel(sub);
} }
else if (result == STR_RESTORE_MODEL) { else if (result == STR_RESTORE_MODEL) {
// TODO // TODO
@ -1651,14 +1662,22 @@ void menuProcMixAll(uint8_t event)
void menuProcLimits(uint8_t event) void menuProcLimits(uint8_t event)
{ {
MENU(STR_MENULIMITS, menuTabModel, e_Limits, 1+NUM_CHNOUT+1, {0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0}); #ifdef LIMITS_US
#define LIMITS_ITEMS_COUNT 4
#else
#define LIMITS_ITEMS_COUNT 3
#endif
MENU(STR_MENULIMITS, menuTabModel, e_Limits, 1+NUM_CHNOUT+1, {0, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, LIMITS_ITEMS_COUNT, 0});
int8_t sub = m_posVert - 1; int8_t sub = m_posVert - 1;
#ifdef LIMITS_US
if (sub >= 0) { if (sub >= 0) {
lcd_outdezAtt(12*FW, 0, PPM_CENTER+g_model.servoCenter[sub]+g_chans512[sub]/2, 0); lcd_outdezAtt(12*FW, 0, PPM_CENTER+g_model.servoCenter[sub]+g_chans512[sub]/2, 0);
lcd_puts(12*FW, 0, STR_US); lcd_puts(12*FW, 0, STR_US);
} }
#endif
for (uint8_t i=0; i<7; i++) { for (uint8_t i=0; i<7; i++) {
uint8_t y = (i+1)*FH; uint8_t y = (i+1)*FH;
@ -1677,21 +1696,32 @@ void menuProcLimits(uint8_t event)
} }
LimitData *ld = limitaddress(k) ; LimitData *ld = limitaddress(k) ;
#ifndef LIMITS_US
int16_t v = (ld->revert) ? -ld->offset : ld->offset;
char swVal = '-'; // '-', '<', '>'
if((g_chans512[k] - v) > 50) swVal = (ld->revert ? 127 : 126); // Switch to raw inputs? - remove trim!
if((g_chans512[k] - v) < -50) swVal = (ld->revert ? 126 : 127);
putsChn(0, y, k+1, 0);
lcd_putcAtt(12*FW+5, y, swVal, 0);
#endif
int8_t limit = (g_model.extendedLimits ? 125 : 100); int8_t limit = (g_model.extendedLimits ? 125 : 100);
putsChn(0, y, k+1, 0); putsChn(0, y, k+1, 0);
for (uint8_t j=0; j<5; j++) { for (uint8_t j=0; j<=LIMITS_ITEMS_COUNT; j++) {
uint8_t attr = ((sub==k && m_posHorz==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0); uint8_t attr = ((sub==k && m_posHorz==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
uint8_t active = (attr && (s_editMode>0 || p1valdiff)) ; uint8_t active = (attr && (s_editMode>0 || p1valdiff)) ;
switch(j) switch(j)
{ {
case 0: case 0:
#ifdef LIMITS_US #ifdef LIMITS_US
lcd_outdezAtt( 8*FW, y, ((ld->offset)*128) / 25, attr|PREC1); lcd_outdezAtt( 8*FW, y, ((ld->offset)*128) / 25, attr|PREC1);
#else #else
lcd_outdezAtt( 8*FW, y, ld->offset, attr|PREC1); lcd_outdezAtt( 8*FW, y, ld->offset, attr|PREC1);
#endif #endif
if (active) { if (active) {
ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL|NO_INCDEC_MARKS); ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL|NO_INCDEC_MARKS);
} }
@ -1706,7 +1736,7 @@ void menuProcLimits(uint8_t event)
#ifdef LIMITS_US #ifdef LIMITS_US
lcd_outdezAtt(12*FW+1, y, (((int16_t)ld->min-100)*128) / 25, attr | INFLIGHT(ld->min)); lcd_outdezAtt(12*FW+1, y, (((int16_t)ld->min-100)*128) / 25, attr | INFLIGHT(ld->min));
#else #else
lcd_outdezAtt(12*FW+1, y, (int8_t)(ld->min-100), attr | INFLIGHT(ld->min)); lcd_outdezAtt(12*FW, y, (int8_t)(ld->min-100), attr | INFLIGHT(ld->min));
#endif #endif
if (active) { if (active) {
CHECK_INFLIGHT_INCDEC_MODELVAR(event, ld->min, -limit, 25, +100, STR_MINLIMIT); CHECK_INFLIGHT_INCDEC_MODELVAR(event, ld->min, -limit, 25, +100, STR_MINLIMIT);
@ -1716,24 +1746,30 @@ void menuProcLimits(uint8_t event)
#ifdef LIMITS_US #ifdef LIMITS_US
lcd_outdezAtt(16*FW, y, (((int16_t)ld->max+100)*128) / 25, attr | INFLIGHT(ld->max)); lcd_outdezAtt(16*FW, y, (((int16_t)ld->max+100)*128) / 25, attr | INFLIGHT(ld->max));
#else #else
lcd_outdezAtt(16*FW, y, (int8_t)(ld->max+100), attr | INFLIGHT(ld->max)); lcd_outdezAtt(17*FW, y, (int8_t)(ld->max+100), attr | INFLIGHT(ld->max));
#endif #endif
if (active) { if (active) {
CHECK_INFLIGHT_INCDEC_MODELVAR(event, ld->max, -25, limit, -100, STR_MAXLIMIT); CHECK_INFLIGHT_INCDEC_MODELVAR(event, ld->max, -25, limit, -100, STR_MAXLIMIT);
} }
break; break;
case 3: case 3:
#ifdef LIMITS_US
lcd_putcAtt(17*FW-2, y, ld->revert ? 127 : 126, attr); lcd_putcAtt(17*FW-2, y, ld->revert ? 127 : 126, attr);
#else
lcd_putsiAtt(18*FW, y, STR_MMMINV, ld->revert, attr);
#endif
if (active) { if (active) {
CHECK_INCDEC_MODELVAR(event, ld->revert, 0, 1); CHECK_INCDEC_MODELVAR(event, ld->revert, 0, 1);
} }
break; break;
#ifdef LIMITS_US
case 4: case 4:
lcd_outdezAtt(21*FW+2, y, PPM_CENTER+g_model.servoCenter[k], attr); lcd_outdezAtt(21*FW+2, y, PPM_CENTER+g_model.servoCenter[k], attr);
if (active) { if (active) {
CHECK_INCDEC_MODELVAR(event, g_model.servoCenter[k], -125, +125); CHECK_INCDEC_MODELVAR(event, g_model.servoCenter[k], -125, +125);
} }
break; break;
#endif
} }
} }
} }
@ -1923,6 +1959,12 @@ void menuProcFunctionSwitches(uint8_t event)
break; break;
#endif #endif
} }
#if defined(HAPTIC)
else if (sd->func == FUNC_HAPTIC) {
val_max = 3;
lcd_outdezAtt(21*FW, y, val_displayed, attr);
}
#endif
#if defined(SOMO) #if defined(SOMO)
else if (sd->func == FUNC_PLAY_SOMO) { else if (sd->func == FUNC_PLAY_SOMO) {
lcd_outdezAtt(21*FW, y, val_displayed, attr); lcd_outdezAtt(21*FW, y, val_displayed, attr);

7
src/myeeprom.h
View file

@ -251,15 +251,18 @@ enum Functions {
FUNC_TRAINER_THR, FUNC_TRAINER_THR,
FUNC_TRAINER_AIL, FUNC_TRAINER_AIL,
FUNC_INSTANT_TRIM, FUNC_INSTANT_TRIM,
FUNC_RESET,
FUNC_PLAY_SOUND, FUNC_PLAY_SOUND,
#ifdef HAPTIC
FUNC_HAPTIC,
#endif
#ifdef SOMO #ifdef SOMO
FUNC_PLAY_SOMO, FUNC_PLAY_SOMO,
#endif #endif
FUNC_RESET,
#if defined(FRSKY_HUB) || defined(WS_HOW_HIGH) #if defined(FRSKY_HUB) || defined(WS_HOW_HIGH)
FUNC_VARIO, FUNC_VARIO,
#endif #endif
#ifdef LOGS #ifdef SDCARD
FUNC_LOGS, FUNC_LOGS,
#endif #endif
#ifdef DEBUG #ifdef DEBUG

2
src/o9xstrings.cpp
View file

@ -305,6 +305,8 @@ const pm_char STR_LOAD_MODEL[] PROGMEM = TR_LOAD_MODEL;
const pm_char STR_ARCHIVE_MODEL[] PROGMEM = TR_ARCHIVE_MODEL; const pm_char STR_ARCHIVE_MODEL[] PROGMEM = TR_ARCHIVE_MODEL;
const pm_char STR_DELETE_MODEL[] PROGMEM = TR_DELETE_MODEL; const pm_char STR_DELETE_MODEL[] PROGMEM = TR_DELETE_MODEL;
const pm_char STR_RESTORE_MODEL[] PROGMEM = TR_RESTORE_MODEL; const pm_char STR_RESTORE_MODEL[] PROGMEM = TR_RESTORE_MODEL;
const pm_char STR_SDCARD_ERROR[] PROGMEM = TR_SDCARD_ERROR;
const pm_char STR_NO_SDCARD[] PROGMEM = TR_NO_SDCARD;
#endif #endif
const pm_uchar font[] PROGMEM = { const pm_uchar font[] PROGMEM = {

2
src/o9xstrings.h
View file

@ -366,6 +366,8 @@ extern const pm_char STR_LOAD_MODEL[];
extern const pm_char STR_ARCHIVE_MODEL[]; extern const pm_char STR_ARCHIVE_MODEL[];
extern const pm_char STR_DELETE_MODEL[]; extern const pm_char STR_DELETE_MODEL[];
extern const pm_char STR_RESTORE_MODEL[]; extern const pm_char STR_RESTORE_MODEL[];
extern const pm_char STR_SDCARD_ERROR[];
extern const pm_char STR_NO_SDCARD[];
#endif #endif
extern const pm_uchar font[]; extern const pm_uchar font[];

21
src/open9x.cpp
View file

@ -60,10 +60,13 @@ uint16_t g_time_per10;
#endif #endif
#ifdef AUDIO #ifdef AUDIO
//new audio object
audioQueue audio; audioQueue audio;
#endif #endif
#ifdef HAPTIC
hapticQueue haptic;
#endif
uint8_t heartbeat; uint8_t heartbeat;
uint8_t stickMode; uint8_t stickMode;
@ -905,7 +908,7 @@ uint8_t checkTrim(uint8_t event)
if (beepTrim) { if (beepTrim) {
killEvents(event); killEvents(event);
AUDIO_WARNING2(); AUDIO_TRIM_MIDDLE();
} }
else { else {
#if defined (AUDIO) #if defined (AUDIO)
@ -1382,6 +1385,13 @@ void evalFunctions()
beep(3); beep(3);
#endif #endif
} }
#if defined(HAPTIC)
if (sd->func == FUNC_HAPTIC) {
hapticDefevent(sd->param);
}
#endif
active_functions |= mask; active_functions |= mask;
} }
else { else {
@ -1937,7 +1947,7 @@ void perMain()
if((inacCounter&0x3F)==10) AUDIO_INACTIVITY(); if((inacCounter&0x3F)==10) AUDIO_INACTIVITY();
} }
#if defined (LOGS) #if defined(SDCARD)
writeLogs(); writeLogs();
#endif #endif
@ -2039,6 +2049,7 @@ void perMain()
#if defined(PCBARM) #if defined(PCBARM)
AUDIO_HEARTBEAT(); // the queue processing AUDIO_HEARTBEAT(); // the queue processing
HAPTIC_HEARTBEAT();
#endif #endif
} }
@ -2109,6 +2120,10 @@ ISR(TIMER0_COMP_vect, ISR_NOBLOCK) //10ms timer
AUDIO_HEARTBEAT(); AUDIO_HEARTBEAT();
#ifdef HAPTIC
HAPTIC_HEARTBEAT();
#endif
#ifdef DEBUG #ifdef DEBUG
// Record start time from TCNT1 to record excution time // Record start time from TCNT1 to record excution time
cli(); cli();

6
src/open9x.h
View file

@ -818,7 +818,11 @@ extern uint16_t jeti_keys;
#include "beeper.h" #include "beeper.h"
#endif #endif
#ifdef LOGS #if defined(HAPTIC)
#include "haptic.h"
#endif
#if defined(SDCARD)
#include "logs.h" #include "logs.h"
#endif #endif

4
src/pulses_arm.cpp
View file

@ -140,7 +140,7 @@ void setupPulsesPPM() // Don't enable interrupts through here
pwmptr = PWM; pwmptr = PWM;
// Now set up pulses // Now set up pulses
#define PPM_CENTER 1500*2
int16_t PPM_range = g_model.extendedLimits ? 640 * 2 : 512 * 2; //range of 0.7..1.7msec int16_t PPM_range = g_model.extendedLimits ? 640 * 2 : 512 * 2; //range of 0.7..1.7msec
//Total frame length = 22.5msec //Total frame length = 22.5msec
@ -155,7 +155,7 @@ void setupPulsesPPM() // Don't enable interrupts through here
uint16_t rest = 22500u * 2; //Minimum Framelen=22.5 ms uint16_t rest = 22500u * 2; //Minimum Framelen=22.5 ms
rest += (int16_t(g_model.ppmFrameLength)) * 1000; rest += (int16_t(g_model.ppmFrameLength)) * 1000;
for (uint32_t i = 0; i < p; i++) { //NUM_CHNOUT for (uint32_t i = 0; i < p; i++) { //NUM_CHNOUT
int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + PPM_CENTER; int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*PPM_CENTER;
rest -= (v); rest -= (v);
*ptr++ = v; /* as Pat MacKenzie suggests */ *ptr++ = v; /* as Pat MacKenzie suggests */
} }

8
src/pulses_avr.cpp
View file

@ -210,7 +210,11 @@ FORCEINLINE void setupPulsesPPM()
uint16_t rest = 22500u*2-q; //Minimum Framelen=22.5 ms uint16_t rest = 22500u*2-q; //Minimum Framelen=22.5 ms
rest += (int16_t(g_model.ppmFrameLength))*1000; rest += (int16_t(g_model.ppmFrameLength))*1000;
for (uint8_t i=0; i<p; i++) { for (uint8_t i=0; i<p; i++) {
#ifdef LIMITS_US
int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*(PPM_CENTER+g_model.servoCenter[i]); int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*(PPM_CENTER+g_model.servoCenter[i]);
#else
int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*PPM_CENTER;
#endif
rest -= v; rest -= v;
*ptr++ = v - q; /* as Pat MacKenzie suggests, reviewed and modified by Cam */ *ptr++ = v - q; /* as Pat MacKenzie suggests, reviewed and modified by Cam */
*ptr++ = q; *ptr++ = q;
@ -817,7 +821,11 @@ void setupPulsesPPM16()
uint16_t rest=22500u*2-q; //Minimum Framelen=22.5 ms uint16_t rest=22500u*2-q; //Minimum Framelen=22.5 ms
rest += (int16_t(g_model.ppmFrameLength))*1000; rest += (int16_t(g_model.ppmFrameLength))*1000;
for (uint8_t i=p-8; i<p; i++) { //NUM_CHNOUT for (uint8_t i=p-8; i<p; i++) { //NUM_CHNOUT
#ifdef LIMITS_US
int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*(PPM_CENTER+g_model.servoCenter[i]); int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*(PPM_CENTER+g_model.servoCenter[i]);
#else
int16_t v = limit((int16_t)-PPM_range, g_chans512[i], (int16_t)PPM_range) + 2*PPM_CENTER;
#endif
rest -= v; rest -= v;
*ptr++ = q; *ptr++ = q;
*ptr++ = v - q; /* as Pat MacKenzie suggests, reviewed and modified by Cam */ *ptr++ = v - q; /* as Pat MacKenzie suggests, reviewed and modified by Cam */

13
src/translations/en.h
View file

@ -81,7 +81,7 @@
#else #else
#define TR_VARIO #define TR_VARIO
#endif #endif
#ifdef LOGS #ifdef SDCARD
#define TR_SDCLOGGS "SDCARD Logs " #define TR_SDCLOGGS "SDCARD Logs "
#else #else
#define TR_SDCLOGGS #define TR_SDCLOGGS
@ -101,13 +101,18 @@
#else #else
#define TR_TEST #define TR_TEST
#endif #endif
#define TR_VFSWFUNC "Security \0 ""Trainer \0 ""Instant Trim " TR_SOUND TR_SOMO "Reset\0 " TR_VARIO TR_SDCLOGGS TR_TEST #ifdef HAPTIC
#define TR_HAPTIC "Haptic\0 "
#else
#define TR_HAPTIC
#endif
#define TR_VFSWFUNC "Security \0 ""Trainer \0 ""Instant Trim " "Reset\0 " TR_SOUND TR_HAPTIC TR_SOMO TR_VARIO TR_SDCLOGGS TR_TEST
#define LEN_VFSWRESET "\006" #define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "Timer1""Timer2""All ""Telem." #define TR_VFSWRESET "Timer1""Timer2""All ""Telem."
#define LEN_FUNCSOUNDS "\006" #define LEN_FUNCSOUNDS "\006"
#define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick ""Haptc1""Haptc2""Haptc3" #define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick "
#define LEN_VTELEMCHNS "\004" #define LEN_VTELEMCHNS "\004"
#define TR_VTELEMCHNS "---\0""Tmr1""Tmr2""A1\0 ""A2\0 ""Tx\0 ""Rx\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""Cell""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Acc\0""Time" #define TR_VTELEMCHNS "---\0""Tmr1""Tmr2""A1\0 ""A2\0 ""Tx\0 ""Rx\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""Cell""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Acc\0""Time"
@ -346,3 +351,5 @@
#define TR_ARCHIVE_MODEL "Archive Model" #define TR_ARCHIVE_MODEL "Archive Model"
#define TR_DELETE_MODEL "Delete Model" // TODO merged into DELETEMODEL? #define TR_DELETE_MODEL "Delete Model" // TODO merged into DELETEMODEL?
#define TR_RESTORE_MODEL "Restore Model" #define TR_RESTORE_MODEL "Restore Model"
#define TR_SDCARD_ERROR "SDCARD Error"
#define TR_NO_SDCARD "No SDCARD"

13
src/translations/fr.h
View file

@ -81,7 +81,7 @@
#else #else
#define TR_VARIO #define TR_VARIO
#endif #endif
#ifdef LOGS #ifdef SDCARD
#define TR_SDCLOGGS "SDCARD Logs " #define TR_SDCLOGGS "SDCARD Logs "
#else #else
#define TR_SDCLOGGS #define TR_SDCLOGGS
@ -101,13 +101,18 @@
#else #else
#define TR_TEST #define TR_TEST
#endif #endif
#define TR_VFSWFUNC "Securite \0 ""Ecolage \0 ""Trim instant " TR_SOUND TR_SOMO "Reset\0 " TR_VARIO TR_SDCLOGGS TR_TEST #ifdef HAPTIC
#define TR_HAPTIC "Haptic\0 "
#else
#define TR_HAPTIC
#endif
#define TR_VFSWFUNC "Securite \0 ""Ecolage \0 ""Trim instant " "Reset\0 " TR_SOUND TR_HAPTIC TR_SOMO TR_VARIO TR_SDCLOGGS TR_TEST
#define LEN_VFSWRESET "\006" #define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "Timer1""Timer2""All ""Telem." #define TR_VFSWRESET "Timer1""Timer2""All ""Telem."
#define LEN_FUNCSOUNDS "\006" #define LEN_FUNCSOUNDS "\006"
#define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick ""Haptc1""Haptc2""Haptc3" #define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick "
#define LEN_VTELEMCHNS "\004" #define LEN_VTELEMCHNS "\004"
#define TR_VTELEMCHNS "---\0""Tmr1""Tmr2""A1\0 ""A2\0 ""Tx\0 ""Rx\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""Cell""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Acc\0""Time" #define TR_VTELEMCHNS "---\0""Tmr1""Tmr2""A1\0 ""A2\0 ""Tx\0 ""Rx\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""Cell""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Acc\0""Time"
@ -347,3 +352,5 @@
#define TR_ARCHIVE_MODEL "Archiver Modele" #define TR_ARCHIVE_MODEL "Archiver Modele"
#define TR_DELETE_MODEL "Supprimer Modele" #define TR_DELETE_MODEL "Supprimer Modele"
#define TR_RESTORE_MODEL "Restorer Modele" #define TR_RESTORE_MODEL "Restorer Modele"
#define TR_SDCARD_ERROR "SDCARD Error"
#define TR_NO_SDCARD "No SDCARD"

13
src/translations/se.h
View file

@ -81,7 +81,7 @@
#else #else
#define TR_VARIO #define TR_VARIO
#endif #endif
#ifdef LOGS #ifdef SDCARD
#define TR_SDCLOGGS "SDCARD Logs " #define TR_SDCLOGGS "SDCARD Logs "
#else #else
#define TR_SDCLOGGS #define TR_SDCLOGGS
@ -96,18 +96,23 @@
#else #else
#define TR_SOUND "Pip \0 " #define TR_SOUND "Pip \0 "
#endif #endif
#ifdef HAPTIC
#define TR_HAPTIC "Haptic\0 "
#else
#define TR_HAPTIC
#endif
#ifdef DEBUG #ifdef DEBUG
#define TR_TEST "Test\0 " #define TR_TEST "Test\0 "
#else #else
#define TR_TEST #define TR_TEST
#endif #endif
#define TR_VFSWFUNC "S\201kerhet \0 ""Trainer \0 ""Instant Trim " TR_SOUND TR_SOMO "Reset\0 " TR_VARIO TR_SDCLOGGS TR_TEST #define TR_VFSWFUNC "S\201kerhet \0 ""Trainer \0 ""Instant Trim " "Reset\0 " TR_SOUND TR_HAPTIC TR_SOMO TR_VARIO TR_SDCLOGGS TR_TEST
#define LEN_VFSWRESET "\006" #define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "Timer1""Timer2""All ""Telem." #define TR_VFSWRESET "Timer1""Timer2""All ""Telem."
#define LEN_FUNCSOUNDS "\006" #define LEN_FUNCSOUNDS "\006"
#define TR_FUNCSOUNDS "Varn1 ""Varn2 ""F\200r ""Ring ""SciFi ""Robot ""Pip ""Tada ""Syrsa ""Siren ""Alarm ""Ratata""Tick ""Vibr1 ""Vibr2 ""Vibr3 " #define TR_FUNCSOUNDS "Varn1 ""Varn2 ""F\200r ""Ring ""SciFi ""Robot ""Pip ""Tada ""Syrsa ""Siren ""Alarm ""Ratata""Tick "
#define LEN_VTELEMCHNS "\004" #define LEN_VTELEMCHNS "\004"
#define TR_VTELEMCHNS "---\0""Tmr1""Tmr2""A1\0 ""A2\0 ""Tx\0 ""Rx\0 ""Alt\0""Rpm\0""Tank""T1\0 ""T2\0 ""Spd\0""Dist""Cell""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Acc\0""Tid\0" #define TR_VTELEMCHNS "---\0""Tmr1""Tmr2""A1\0 ""A2\0 ""Tx\0 ""Rx\0 ""Alt\0""Rpm\0""Tank""T1\0 ""T2\0 ""Spd\0""Dist""Cell""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Acc\0""Tid\0"
@ -346,3 +351,5 @@
#define TR_ARCHIVE_MODEL "Archive Model" #define TR_ARCHIVE_MODEL "Archive Model"
#define TR_DELETE_MODEL "Delete Model" #define TR_DELETE_MODEL "Delete Model"
#define TR_RESTORE_MODEL "Restore Model" #define TR_RESTORE_MODEL "Restore Model"
#define TR_SDCARD_ERROR "SDCARD Error"
#define TR_NO_SDCARD "No SDCARD"