From 4a1ae0eaa4bd6e30c863ffccd9b1b11352fefa8b Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 20 Feb 2013 11:17:44 +0000 Subject: [PATCH] Issue 203 fixed (Timer minute beep) Issue 204 fixed (Tx Batt spoken) [X9D] It was impossible to avoid a Format on EEPROM Alert [all] Function v1==x modified to v1~=x (needs to be tested) Developers list updated --- src/FatFs/fattime.c | 4 +- src/ardupilot.cpp | 6 +- src/ardupilot.h | 6 +- src/audio_arm.cpp | 4 +- src/audio_arm.h | 92 ++++++++++-------- src/audio_avr.cpp | 4 +- src/audio_avr.h | 40 ++++---- src/beeper.cpp | 6 +- src/beeper.h | 52 +++++----- src/bmp.cpp | 6 +- src/debug.cpp | 6 +- src/debug.h | 6 +- src/eeprom_arm.cpp | 23 ++--- src/eeprom_arm.h | 26 ++++- src/eeprom_avr.cpp | 10 +- src/eeprom_avr.h | 4 +- src/eeprom_conversions.cpp | 36 +++++++ src/fifo.h | 6 +- src/frsky.cpp | 7 +- src/frsky.h | 6 +- src/general_menus.cpp | 4 +- src/gruvin9x/board_gruvin9x.cpp | 4 +- src/gruvin9x/board_gruvin9x.h | 11 ++- src/gruvin9x/diskio.cpp | 6 +- src/gruvin9x/rtc_driver.cpp | 6 +- src/gruvin9x/somo14d.cpp | 4 +- src/gruvin9x/somo14d.h | 4 +- src/gtests.cpp | 6 +- src/haptic.cpp | 4 +- src/haptic.h | 6 +- src/jeti.cpp | 4 +- src/jeti.h | 4 +- src/keys.cpp | 4 +- src/lcd.cpp | 4 +- src/lcd.h | 4 +- src/logs.cpp | 6 +- src/main_views.cpp | 6 +- src/mavlink.cpp | 4 +- src/menus.cpp | 4 +- src/menus.h | 4 +- src/model_menus.cpp | 132 ++++++++++++++++++++++--- src/monitors_views.cpp | 6 +- src/myeeprom.h | 5 +- src/nmea.cpp | 6 +- src/nmea.h | 6 +- src/open9x.cpp | 53 ++++++---- src/open9x.h | 167 +++++++++++++++----------------- src/pgmtypes.h | 4 +- src/pulses_arm.cpp | 4 +- src/pulses_arm.h | 4 +- src/pulses_avr.cpp | 4 +- src/pulses_avr.h | 4 +- src/rtc.cpp | 6 +- src/rtc.h | 6 +- src/sdcard.h | 4 +- src/simpgmspace.cpp | 4 +- src/simpgmspace.h | 4 +- src/simu.cpp | 4 +- src/sky9x/adc_driver.cpp | 4 +- src/sky9x/audio_driver.cpp | 6 +- src/sky9x/audio_driver.h | 6 +- src/sky9x/bluetooth.cpp | 4 +- src/sky9x/board.h | 6 +- src/sky9x/board_sky9x.cpp | 6 +- src/sky9x/board_sky9x.h | 21 ++-- src/sky9x/buzzer_driver.cpp | 4 +- src/sky9x/coproc_driver.cpp | 4 +- src/sky9x/debug_driver.cpp | 6 +- src/sky9x/diskio.cpp | 6 +- src/sky9x/eeprom_driver.cpp | 6 +- src/sky9x/haptic_driver.cpp | 6 +- src/sky9x/keys_driver.cpp | 13 ++- src/sky9x/lcd_driver.cpp | 6 +- src/sky9x/massstorage.cpp | 6 +- src/sky9x/pulses_driver.cpp | 6 +- src/sky9x/pwr_driver.cpp | 6 +- src/sky9x/rotenc_driver.cpp | 4 +- src/sky9x/rtc_driver.cpp | 6 +- src/sky9x/sdcard_driver.cpp | 6 +- src/stamp.cpp | 4 +- src/statistics_views.cpp | 6 +- src/stock/board_stock.cpp | 6 +- src/stock/board_stock.h | 15 ++- src/stock/lcd_driver.cpp | 6 +- src/stock/voice.cpp | 6 +- src/stock/voice.h | 6 +- src/templates.cpp | 6 +- src/templates.h | 6 +- src/translations.cpp | 6 +- src/translations.h | 4 +- src/translations/cz.h | 22 +++++ src/translations/de.h | 24 +++++ src/translations/en.h | 38 +++++++- src/translations/es.h | 22 +++++ src/translations/fr.h | 22 +++++ src/translations/it.h | 22 +++++ src/translations/se.h | 22 +++++ src/translations/tts_cz.cpp | 13 --- src/translations/tts_de.cpp | 14 +-- src/translations/tts_en.cpp | 6 +- src/translations/tts_es.cpp | 6 +- src/translations/tts_fr.cpp | 14 +-- src/translations/tts_it.cpp | 12 --- src/translations/tts_pt.cpp | 6 +- src/translations/tts_sk.cpp | 6 +- src/x9d/adc_driver.cpp | 6 +- src/x9d/audio_driver.cpp | 6 +- src/x9d/audio_driver.h | 6 +- src/x9d/board_x9d.cpp | 6 +- src/x9d/board_x9d.h | 6 +- src/x9d/debug_driver.cpp | 6 +- src/x9d/delays.cpp | 6 +- src/x9d/diskio.cpp | 6 +- src/x9d/keys_driver.cpp | 14 ++- src/x9d/pulses_driver.cpp | 6 +- src/x9d/pwr_driver.cpp | 6 +- src/x9d/rtc_driver.cpp | 6 +- src/x9d/trainer_driver.cpp | 4 +- 118 files changed, 962 insertions(+), 452 deletions(-) diff --git a/src/FatFs/fattime.c b/src/FatFs/fattime.c index d71094020..f5d74bf13 100644 --- a/src/FatFs/fattime.c +++ b/src/FatFs/fattime.c @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/ardupilot.cpp b/src/ardupilot.cpp index fdff8de60..6b1021724 100644 --- a/src/ardupilot.cpp +++ b/src/ardupilot.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/ardupilot.h b/src/ardupilot.h index d2fe51dea..a0bb838d8 100644 --- a/src/ardupilot.h +++ b/src/ardupilot.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/audio_arm.cpp b/src/audio_arm.cpp index e7a2495a9..874ed9b52 100644 --- a/src/audio_arm.cpp +++ b/src/audio_arm.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/audio_arm.h b/src/audio_arm.h index feca95f5a..29dd2b6c0 100644 --- a/src/audio_arm.h +++ b/src/audio_arm.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -140,38 +142,41 @@ extern AudioQueue audioQueue; void codecsInit(); void audioEvent(uint8_t e, uint8_t f=BEEP_DEFAULT_FREQ); -#define AUDIO_TADA() audioEvent(AU_TADA) -#define AUDIO_KEYPAD_UP() audioEvent(AU_KEYPAD_UP) -#define AUDIO_KEYPAD_DOWN() audioEvent(AU_KEYPAD_DOWN) -#define AUDIO_MENUS() audioEvent(AU_MENUS) -#define AUDIO_WARNING1() audioEvent(AU_WARNING1) -#define AUDIO_WARNING2() audioEvent(AU_WARNING2) -#define AUDIO_TX_BATTERY_LOW() audioEvent(AU_TX_BATTERY_LOW) -#define AUDIO_TX_MAH_HIGH() audioEvent(AU_TX_MAH_HIGH) -#define AUDIO_TX_TEMP_HIGH() audioEvent(AU_TX_TEMP_HIGH) -#define AUDIO_ERROR() audioEvent(AU_ERROR) +#define AUDIO_TADA() audioEvent(AU_TADA) +#define AUDIO_KEYPAD_UP() audioEvent(AU_KEYPAD_UP) +#define AUDIO_KEYPAD_DOWN() audioEvent(AU_KEYPAD_DOWN) +#define AUDIO_MENUS() audioEvent(AU_MENUS) +#define AUDIO_WARNING1() audioEvent(AU_WARNING1) +#define AUDIO_WARNING2() audioEvent(AU_WARNING2) +#define AUDIO_TX_BATTERY_LOW() audioEvent(AU_TX_BATTERY_LOW) +#define AUDIO_TX_MAH_HIGH() audioEvent(AU_TX_MAH_HIGH) +#define AUDIO_TX_TEMP_HIGH() audioEvent(AU_TX_TEMP_HIGH) +#define AUDIO_ERROR() audioEvent(AU_ERROR) + #if defined(VOICE) -#define AUDIO_ERROR_MESSAGE(e) audioEvent(e) + #define AUDIO_ERROR_MESSAGE(e) audioEvent(e) + #define AUDIO_TIMER_MINUTE(t) playDuration(t) #else -#define AUDIO_ERROR_MESSAGE(e) audioEvent(AU_ERROR) + #define AUDIO_ERROR_MESSAGE(e) audioEvent(AU_ERROR) + #define AUDIO_TIMER_MINUTE(t) audioDefevent(AU_WARNING1) #endif -#define AUDIO_TIMER_30() audioEvent(AU_TIMER_30) -#define AUDIO_TIMER_20() audioEvent(AU_TIMER_20) -#define AUDIO_TIMER_10() audioEvent(AU_TIMER_10) -#define AUDIO_TIMER_LT3(x) audioEvent(AU_TIMER_LT3) -#define AUDIO_MINUTE_BEEP() audioEvent(AU_WARNING1) -#define AUDIO_INACTIVITY() audioEvent(AU_INACTIVITY) -#define AUDIO_MIX_WARNING_1() audioEvent(AU_MIX_WARNING_1) -#define AUDIO_MIX_WARNING_2() audioEvent(AU_MIX_WARNING_2) -#define AUDIO_MIX_WARNING_3() audioEvent(AU_MIX_WARNING_3) + +#define AUDIO_TIMER_30() audioEvent(AU_TIMER_30) +#define AUDIO_TIMER_20() audioEvent(AU_TIMER_20) +#define AUDIO_TIMER_10() audioEvent(AU_TIMER_10) +#define AUDIO_TIMER_LT3(x) audioEvent(AU_TIMER_LT3) +#define AUDIO_INACTIVITY() audioEvent(AU_INACTIVITY) +#define AUDIO_MIX_WARNING_1() audioEvent(AU_MIX_WARNING_1) +#define AUDIO_MIX_WARNING_2() audioEvent(AU_MIX_WARNING_2) +#define AUDIO_MIX_WARNING_3() audioEvent(AU_MIX_WARNING_3) #define AUDIO_POT_STICK_MIDDLE() audioEvent(AU_POT_STICK_MIDDLE) -#define AUDIO_VARIO_UP() audioEvent(AU_KEYPAD_UP) -#define AUDIO_VARIO_DOWN() audioEvent(AU_KEYPAD_DOWN) -#define AUDIO_TRIM_MIDDLE(f) audioEvent(AU_TRIM_MIDDLE, f) -#define AUDIO_TRIM_END(f) audioEvent(AU_TRIM_END, f) -#define AUDIO_TRIM(event, f) audioEvent(AU_TRIM_MOVE, f) -#define AUDIO_PLAY(p) audioEvent(p) -#define AUDIO_VARIO(f, t) audioQueue.play(f, t, 0, PLAY_BACKGROUND) +#define AUDIO_VARIO_UP() audioEvent(AU_KEYPAD_UP) +#define AUDIO_VARIO_DOWN() audioEvent(AU_KEYPAD_DOWN) +#define AUDIO_TRIM_MIDDLE(f) audioEvent(AU_TRIM_MIDDLE, f) +#define AUDIO_TRIM_END(f) audioEvent(AU_TRIM_END, f) +#define AUDIO_TRIM(event, f) audioEvent(AU_TRIM_MOVE, f) +#define AUDIO_PLAY(p) audioEvent(p) +#define AUDIO_VARIO(f, t) audioQueue.play(f, t, 0, PLAY_BACKGROUND) #define AUDIO_HEARTBEAT() @@ -186,21 +191,22 @@ void audioEvent(uint8_t e, uint8_t f=BEEP_DEFAULT_FREQ); extern void pushPrompt(uint16_t prompt, uint8_t id=0); -#define PLAY_FUNCTION(x, ...) void x(__VA_ARGS__, uint8_t id) -#define PUSH_PROMPT(p) pushPrompt((p), id) -#define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a), id) -#define PLAY_DURATION(d) playDuration((d), id) -#define IS_PLAYING(id) audioQueue.isPlaying((id)) -#define PLAY_VALUE(v, id) playValue((v), (id)) -#define PLAY_FILE(f, flags, id) audioQueue.playFile((f), (flags), (id)) -#define STOP_PLAY(id) audioQueue.stopPlay((id)) -#define AUDIO_RESET() audioQueue.reset() +#define PLAY_FUNCTION(x, ...) void x(__VA_ARGS__, uint8_t id) +#define PUSH_PROMPT(p) pushPrompt((p), id) +#define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a), id) +#define PLAY_DURATION(d) playDuration((d), id) +#define IS_PLAYING(id) audioQueue.isPlaying((id)) +#define PLAY_VALUE(v, id) playValue((v), (id)) +#define PLAY_FILE(f, flags, id) audioQueue.playFile((f), (flags), (id)) +#define STOP_PLAY(id) audioQueue.stopPlay((id)) +#define AUDIO_RESET() audioQueue.reset() + #if defined(SDCARD) -#define PLAY_PHASE_OFF(phase) do { char filename[AUDIO_FILENAME_MAXLEN+1]; if (isAudioFileAvailable((PHASE_AUDIO_CATEGORY << 24) + (phase << 16) + AUDIO_EVENT_OFF, filename)) audioQueue.playFile(filename); } while (0) -#define PLAY_PHASE_ON(phase) do { char filename[AUDIO_FILENAME_MAXLEN+1]; if (isAudioFileAvailable((PHASE_AUDIO_CATEGORY << 24) + (phase << 16) + AUDIO_EVENT_ON, filename)) audioQueue.playFile(filename); } while (0) + #define PLAY_PHASE_OFF(phase) do { char filename[AUDIO_FILENAME_MAXLEN+1]; if (isAudioFileAvailable((PHASE_AUDIO_CATEGORY << 24) + (phase << 16) + AUDIO_EVENT_OFF, filename)) audioQueue.playFile(filename); } while (0) + #define PLAY_PHASE_ON(phase) do { char filename[AUDIO_FILENAME_MAXLEN+1]; if (isAudioFileAvailable((PHASE_AUDIO_CATEGORY << 24) + (phase << 16) + AUDIO_EVENT_ON, filename)) audioQueue.playFile(filename); } while (0) #else -#define PLAY_PHASE_OFF(phase) -#define PLAY_PHASE_ON(phase) + #define PLAY_PHASE_OFF(phase) + #define PLAY_PHASE_ON(phase) #endif extern void refreshSystemAudioFiles(); diff --git a/src/audio_avr.cpp b/src/audio_avr.cpp index 6e2c3d1a0..d4e3d6d19 100644 --- a/src/audio_avr.cpp +++ b/src/audio_avr.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/audio_avr.h b/src/audio_avr.h index 6deab9ce0..ccea5dcbb 100644 --- a/src/audio_avr.h +++ b/src/audio_avr.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -117,27 +119,29 @@ void audioDefevent(uint8_t e); #define AUDIO_WARNING1() audioDefevent(AU_WARNING1) #define AUDIO_WARNING2() audioDefevent(AU_WARNING2) #define AUDIO_ERROR() audioDefevent(AU_ERROR) + #if defined(VOICE) -#define AUDIO_TADA() pushPrompt(PROMPT_SYSTEM_BASE+AU_TADA) -#define AUDIO_TX_BATTERY_LOW() pushPrompt(PROMPT_SYSTEM_BASE+AU_TX_BATTERY_LOW) -#define AUDIO_INACTIVITY() pushPrompt(PROMPT_SYSTEM_BASE+AU_INACTIVITY) -#define AUDIO_ERROR_MESSAGE(e) pushPrompt(PROMPT_SYSTEM_BASE+(e)) -#define AUDIO_TIMER_30() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_30) -#define AUDIO_TIMER_20() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_20) -#define AUDIO_TIMER_10() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_10) -#define AUDIO_TIMER_LT3(x) pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_LT3) + #define AUDIO_TADA() pushPrompt(PROMPT_SYSTEM_BASE+AU_TADA) + #define AUDIO_TX_BATTERY_LOW() pushPrompt(PROMPT_SYSTEM_BASE+AU_TX_BATTERY_LOW) + #define AUDIO_INACTIVITY() pushPrompt(PROMPT_SYSTEM_BASE+AU_INACTIVITY) + #define AUDIO_ERROR_MESSAGE(e) pushPrompt(PROMPT_SYSTEM_BASE+(e)) + #define AUDIO_TIMER_MINUTE(t) playDuration(t) + #define AUDIO_TIMER_30() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_30) + #define AUDIO_TIMER_20() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_20) + #define AUDIO_TIMER_10() pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_10) + #define AUDIO_TIMER_LT3(x) pushPrompt(PROMPT_SYSTEM_BASE+AU_TIMER_LT3) #else -#define AUDIO_TADA() -#define AUDIO_TX_BATTERY_LOW() audioDefevent(AU_TX_BATTERY_LOW) -#define AUDIO_INACTIVITY() audioDefevent(AU_INACTIVITY) -#define AUDIO_ERROR_MESSAGE(e) audioDefevent(AU_ERROR) -#define AUDIO_TIMER_30() audioDefevent(AU_TIMER_30) -#define AUDIO_TIMER_20() audioDefevent(AU_TIMER_20) -#define AUDIO_TIMER_10() audioDefevent(AU_TIMER_10) -#define AUDIO_TIMER_LT3(x) audioDefevent(AU_TIMER_LT3) + #define AUDIO_TADA() + #define AUDIO_TX_BATTERY_LOW() audioDefevent(AU_TX_BATTERY_LOW) + #define AUDIO_INACTIVITY() audioDefevent(AU_INACTIVITY) + #define AUDIO_ERROR_MESSAGE(e) audioDefevent(AU_ERROR) + #define AUDIO_TIMER_MINUTE(t) audioDefevent(AU_WARNING1) + #define AUDIO_TIMER_30() audioDefevent(AU_TIMER_30) + #define AUDIO_TIMER_20() audioDefevent(AU_TIMER_20) + #define AUDIO_TIMER_10() audioDefevent(AU_TIMER_10) + #define AUDIO_TIMER_LT3(x) audioDefevent(AU_TIMER_LT3) #endif -#define AUDIO_MINUTE_BEEP() audioDefevent(AU_WARNING1) #define AUDIO_MIX_WARNING_1() audioDefevent(AU_MIX_WARNING_1) #define AUDIO_MIX_WARNING_2() audioDefevent(AU_MIX_WARNING_2) #define AUDIO_MIX_WARNING_3() audioDefevent(AU_MIX_WARNING_3) diff --git a/src/beeper.cpp b/src/beeper.cpp index a401c6a87..fa249346e 100644 --- a/src/beeper.cpp +++ b/src/beeper.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/beeper.h b/src/beeper.h index 9a406784e..8c9288a41 100644 --- a/src/beeper.h +++ b/src/beeper.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -60,30 +62,30 @@ inline void _beep(uint8_t b) extern void beep(uint8_t val); #define AUDIO_TADA() -#define AUDIO_KEYPAD_UP() beep(0) -#define AUDIO_KEYPAD_DOWN() beep(0) -#define AUDIO_MENUS() beep(0) -#define AUDIO_WARNING2() beep(2) -#define AUDIO_WARNING1() beep(3) -#define AUDIO_TX_BATTERY_LOW() beep(4) -#define AUDIO_ERROR() beep(4) -#define AUDIO_ERROR_MESSAGE(e) beep(4) -#define AUDIO_TIMER_30() { beepAgain=2; beep(2); } -#define AUDIO_TIMER_20() { beepAgain=1; beep(2); } -#define AUDIO_TIMER_10() beep(2) -#define AUDIO_TIMER_LT3(x) beep(2) -#define AUDIO_MINUTE_BEEP() beep(2) -#define AUDIO_INACTIVITY() beep(3) -#define AUDIO_MIX_WARNING_1() beep(1) -#define AUDIO_MIX_WARNING_2() beep(1) -#define AUDIO_MIX_WARNING_3() beep(1) +#define AUDIO_KEYPAD_UP() beep(0) +#define AUDIO_KEYPAD_DOWN() beep(0) +#define AUDIO_MENUS() beep(0) +#define AUDIO_WARNING2() beep(2) +#define AUDIO_WARNING1() beep(3) +#define AUDIO_TX_BATTERY_LOW() beep(4) +#define AUDIO_ERROR() beep(4) +#define AUDIO_ERROR_MESSAGE(e) beep(4) +#define AUDIO_TIMER_MINUTE() beep(2) +#define AUDIO_TIMER_30() { beepAgain=2; beep(2); } +#define AUDIO_TIMER_20() { beepAgain=1; beep(2); } +#define AUDIO_TIMER_10() beep(2) +#define AUDIO_TIMER_LT3(x) beep(2) +#define AUDIO_INACTIVITY() beep(3) +#define AUDIO_MIX_WARNING_1() beep(1) +#define AUDIO_MIX_WARNING_2() beep(1) +#define AUDIO_MIX_WARNING_3() beep(1) #define AUDIO_POT_STICK_MIDDLE() beep(2) -#define AUDIO_VARIO_UP() _beep(1) -#define AUDIO_VARIO_DOWN() _beep(1) -#define AUDIO_TRIM(event, f) { if (!IS_KEY_FIRST(event)) warble = true; beep(1); } -#define AUDIO_TRIM_MIDDLE(f) beep(2) -#define AUDIO_TRIM_END(f) beep(2) -#define AUDIO_PLAY(p) beep(3) +#define AUDIO_VARIO_UP() _beep(1) +#define AUDIO_VARIO_DOWN() _beep(1) +#define AUDIO_TRIM(event, f) { if (!IS_KEY_FIRST(event)) warble = true; beep(1); } +#define AUDIO_TRIM_MIDDLE(f) beep(2) +#define AUDIO_TRIM_END(f) beep(2) +#define AUDIO_PLAY(p) beep(3) #define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn) #define AUDIO_RESET() diff --git a/src/bmp.cpp b/src/bmp.cpp index b2714d274..d1bddf23a 100644 --- a/src/bmp.cpp +++ b/src/bmp.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/debug.cpp b/src/debug.cpp index c5b5786ba..0e7bdd3df 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/debug.h b/src/debug.h index 85c548186..7152793fd 100644 --- a/src/debug.h +++ b/src/debug.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/eeprom_arm.cpp b/src/eeprom_arm.cpp index 471d73378..3250613f5 100644 --- a/src/eeprom_arm.cpp +++ b/src/eeprom_arm.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -468,20 +470,19 @@ void eeReadAll() ALERT(STR_EEPROMWARN, STR_BADEEPROMDATA, AU_BAD_EEPROM); - if (pwrCheck()==e_power_off) { - // we don't want to store anything + if (pwrCheck() == e_power_off) { + // the radio has been powered off during the ALERT pwrOff(); // turn power off now } - else { - MESSAGE(STR_EEPROMWARN, STR_EEPROMFORMATTING, NULL, AU_EEPROM_FORMATTING); - /* we remove all models */ - for (uint32_t i=0; i - * - * Based on th9x -> http://code.google.com/p/th9x/ + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - 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 diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp index 357015dd9..cf8a82f40 100644 --- a/src/eeprom_avr.cpp +++ b/src/eeprom_avr.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -935,6 +937,12 @@ void eeReadAll() generalDefault(); ALERT(STR_EEPROMWARN, STR_BADEEPROMDATA, AU_BAD_EEPROM); + + if (pwrCheck() == e_power_off) { + // the radio has been powered off during the ALERT + pwrOff(); + } + MESSAGE(STR_EEPROMWARN, STR_EEPROMFORMATTING, NULL, AU_EEPROM_FORMATTING); EeFsFormat(); diff --git a/src/eeprom_avr.h b/src/eeprom_avr.h index 7f24871a2..f53f7ac15 100644 --- a/src/eeprom_avr.h +++ b/src/eeprom_avr.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/eeprom_conversions.cpp b/src/eeprom_conversions.cpp index 524f5f493..44102d0e9 100644 --- a/src/eeprom_conversions.cpp +++ b/src/eeprom_conversions.cpp @@ -1,3 +1,39 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - 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" PACK(typedef struct { diff --git a/src/fifo.h b/src/fifo.h index c9369e8ac..a2160844a 100644 --- a/src/fifo.h +++ b/src/fifo.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/frsky.cpp b/src/frsky.cpp index 6d543f5bd..fb8014df6 100644 --- a/src/frsky.cpp +++ b/src/frsky.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -1090,7 +1092,8 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, case TELEM_CELL-1: putsTelemetryValue(x, y, val, UNIT_VOLTS, att|PREC2); break; - + + case TELEM_TX_VOLTAGE-1: case TELEM_VFAS-1: case TELEM_CELLS_SUM-1: putsTelemetryValue(x, y, val, UNIT_VOLTS, att|PREC1); diff --git a/src/frsky.h b/src/frsky.h index 885411d0f..1dd1b095d 100644 --- a/src/frsky.h +++ b/src/frsky.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/general_menus.cpp b/src/general_menus.cpp index 6dfbdcd89..26f4fe31e 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/gruvin9x/board_gruvin9x.cpp b/src/gruvin9x/board_gruvin9x.cpp index 89980f77d..fd644fb24 100644 --- a/src/gruvin9x/board_gruvin9x.cpp +++ b/src/gruvin9x/board_gruvin9x.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/gruvin9x/board_gruvin9x.h b/src/gruvin9x/board_gruvin9x.h index cd00137c9..0e6bb781b 100644 --- a/src/gruvin9x/board_gruvin9x.h +++ b/src/gruvin9x/board_gruvin9x.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -157,12 +159,14 @@ void sdPoll10ms(); # define INP_H_14DBUSY 6 #endif +// Keys driver #define KEYS_PRESSED() (~PINL) // used only for DBLKEYS code. #define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((1< + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/gruvin9x/rtc_driver.cpp b/src/gruvin9x/rtc_driver.cpp index b5f25e989..7b85d8b1e 100644 --- a/src/gruvin9x/rtc_driver.cpp +++ b/src/gruvin9x/rtc_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/gruvin9x/somo14d.cpp b/src/gruvin9x/somo14d.cpp index bbb8bf324..f9957d204 100644 --- a/src/gruvin9x/somo14d.cpp +++ b/src/gruvin9x/somo14d.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/gruvin9x/somo14d.h b/src/gruvin9x/somo14d.h index 259fcab79..49809eaff 100644 --- a/src/gruvin9x/somo14d.h +++ b/src/gruvin9x/somo14d.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/gtests.cpp b/src/gtests.cpp index abca9a12b..937947011 100644 --- a/src/gtests.cpp +++ b/src/gtests.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/haptic.cpp b/src/haptic.cpp index 129d3c4eb..d3e99d8c2 100644 --- a/src/haptic.cpp +++ b/src/haptic.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/haptic.h b/src/haptic.h index 23c840088..2630cd3ac 100644 --- a/src/haptic.h +++ b/src/haptic.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/jeti.cpp b/src/jeti.cpp index 4a41da1b8..e25aad708 100644 --- a/src/jeti.cpp +++ b/src/jeti.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/jeti.h b/src/jeti.h index 58ac60e58..f73a5bf91 100644 --- a/src/jeti.h +++ b/src/jeti.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/keys.cpp b/src/keys.cpp index 940441213..3995d33fc 100644 --- a/src/keys.cpp +++ b/src/keys.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/lcd.cpp b/src/lcd.cpp index b3fd096fa..1664b30c6 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/lcd.h b/src/lcd.h index 26272474e..68d98b3cc 100644 --- a/src/lcd.h +++ b/src/lcd.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/logs.cpp b/src/logs.cpp index 3269b4dd5..4c59eb58b 100644 --- a/src/logs.cpp +++ b/src/logs.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/main_views.cpp b/src/main_views.cpp index 8453d5cab..f94fc87f6 100644 --- a/src/main_views.cpp +++ b/src/main_views.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/mavlink.cpp b/src/mavlink.cpp index 1a6aa1503..bd75bdb75 100644 --- a/src/mavlink.cpp +++ b/src/mavlink.cpp @@ -1,13 +1,15 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Gerard Valade * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/menus.cpp b/src/menus.cpp index 96861ab78..67618e204 100644 --- a/src/menus.cpp +++ b/src/menus.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/menus.h b/src/menus.h index d2b5bd9bb..9b9a579d9 100644 --- a/src/menus.h +++ b/src/menus.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 538b434da..868739d41 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -1136,6 +1138,108 @@ PhasesType editPhases(uint8_t x, uint8_t y, uint8_t event, PhasesType value, uin return value; } +#if LCD_W >= 212 + +enum PhasesItems { + ITEM_PHASES_NAME, + ITEM_PHASES_SWITCH, + ITEM_PHASES_TRIMS, + ITEM_PHASES_FADE_IN, + ITEM_PHASES_FADE_OUT, + ITEM_PHASES_COUNT, + ITEM_PHASES_LAST = ITEM_PHASES_COUNT-1 +}; + +void menuModelPhasesAll(uint8_t event) +{ + MENU(STR_MENUFLIGHTPHASES, menuTabModel, e_PhasesAll, 1+MAX_PHASES+1, {0, ITEM_PHASES_LAST-2, ITEM_PHASES_LAST, ITEM_PHASES_LAST, ITEM_PHASES_LAST, ITEM_PHASES_LAST, ITEM_PHASES_LAST, ITEM_PHASES_LAST, ITEM_PHASES_LAST, ITEM_PHASES_LAST, 0}); + + int8_t sub = m_posVert - 1; + + switch (event) { + CASE_EVT_ROTARY_BREAK + case EVT_KEY_FIRST(KEY_ENTER): + if (sub == MAX_PHASES) { + s_editMode = 0; + trimsCheckTimer = 200; // 2 seconds + } + // no break +#if !defined(PCBX9D) + case EVT_KEY_FIRST(KEY_RIGHT): +#endif + if (sub >= 0 && sub < MAX_PHASES) { + s_currIdx = sub; + pushMenu(menuModelPhaseOne); + } + break; + } + + uint8_t att; + for (uint8_t i=0; i(LCD_LINES-1)*FH+1) continue; +#else + uint8_t y = 1 + (i+1)*FH; +#endif + att = (i==sub ? INVERS : 0); + PhaseData *p = phaseaddress(i); +#if ROTARY_ENCODERS > 2 + putsFlightPhase(0, y, i+1, att|CONDENSED|(getFlightPhase()==i ? BOLD : 0)); +#else + putsFlightPhase(0, y, i+1, att|(getFlightPhase()==i ? BOLD : 0)); +#endif +#if defined(ROTARY_ENCODERS) +#if ROTARY_ENCODERS > 2 +#define NAME_OFS (-4-12) +#define SWITCH_OFS (-FW/2-2-13) +#define TRIMS_OFS (-FW/2-4-15) +#define ROTARY_ENC_OFS (0) +#else +#define NAME_OFS (-4) +#define SWITCH_OFS (-FW/2-2) +#define TRIMS_OFS (-FW/2-4) +#define ROTARY_ENC_OFS (2) +#endif +#else +#define NAME_OFS 0 +#define SWITCH_OFS (FW/2) +#define TRIMS_OFS (FW/2) +#endif + lcd_putsnAtt(4*FW+NAME_OFS, y, p->name, sizeof(p->name), ZCHAR); + if (i == 0) { + lcd_puts((5+LEN_FP_NAME)*FW+SWITCH_OFS, y, STR_DEFAULT); + } + else { + putsSwitches((5+LEN_FP_NAME)*FW+SWITCH_OFS, y, p->swtch, 0); + for (uint8_t t=0; tfadeIn || p->fadeOut) { + lcd_outdezAtt(24*FW, y, (10/SLOW_STEP)*p->fadeIn, PREC1|LEFT); + lcd_putc(lcdLastPos, y, '/'); + lcd_outdezAtt(lcdLastPos+FW, y, (10/SLOW_STEP)*p->fadeOut, PREC1|LEFT); + } + } + + if (s_pgOfs != MAX_PHASES-(LCD_LINES-2)) return; + + lcd_putsLeft((LCD_LINES-1)*FH+1, STR_CHECKTRIMS); + putsFlightPhase(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, s_perout_flight_phase+1); + if (sub==MAX_PHASES && !trimsCheckTimer) { + lcd_status_line(); + } +} + +#else + enum menuModelPhaseItems { ITEM_MODEL_PHASE_NAME, ITEM_MODEL_PHASE_SWITCH, @@ -1143,7 +1247,7 @@ enum menuModelPhaseItems { IF_ROTARY_ENCODERS(ITEM_MODEL_PHASE_ROTARY_ENCODERS) ITEM_MODEL_PHASE_FADE_IN, ITEM_MODEL_PHASE_FADE_OUT, -#if defined(GVARS) && !defined(CPUM64) && LCD_W < 260 +#if defined(GVARS) && !defined(CPUM64) ITEM_MODEL_PHASE_GVARS_LABEL, ITEM_MODEL_PHASE_GV1, ITEM_MODEL_PHASE_GV2, @@ -1159,7 +1263,7 @@ void menuModelPhaseOne(uint8_t event) PhaseData *phase = phaseaddress(s_currIdx); putsFlightPhase(13*FW, 0, s_currIdx+1, (getFlightPhase()==s_currIdx ? BOLD : 0)); -#if defined(GVARS) && !defined(CPUM64) && LCD_W < 260 +#if defined(GVARS) && !defined(CPUM64) static const pm_uint8_t mstate_tab_phase1[] PROGMEM = {0, 0, 0, (uint8_t)-1, 2, 2, 2, 2, 2}; static const pm_uint8_t mstate_tab_others[] PROGMEM = {0, 0, 3, IF_ROTARY_ENCODERS(NUM_ROTARY_ENCODERS-1) 0, 0, (uint8_t)-1, 2, 2, 2, 2, 2}; @@ -1176,7 +1280,7 @@ void menuModelPhaseOne(uint8_t event) int8_t sub = m_posVert; int8_t editMode = s_editMode; -#if defined(GVARS) && !defined(CPUM64) && LCD_W < 260 +#if defined(GVARS) && !defined(CPUM64) if (s_currIdx == 0 && sub>=ITEM_MODEL_PHASE_SWITCH) sub += ITEM_MODEL_PHASE_FADE_IN-ITEM_MODEL_PHASE_SWITCH; for (uint8_t k=0; kfadeOut = EDIT_DELAY(0, y, event, attr, STR_FADEOUT, phase->fadeOut); break; -#if defined(GVARS) && !defined(CPUM64) && LCD_W < 260 +#if defined(GVARS) && !defined(CPUM64) case ITEM_MODEL_PHASE_GVARS_LABEL: lcd_putsLeft(y, STR_GLOBAL_VARS); break; @@ -1367,16 +1471,10 @@ void menuModelPhasesAll(uint8_t event) } #endif } -#if LCD_W >= 212 - if (p->fadeIn || p->fadeOut) { - lcd_outdezAtt(24*FW, y, (10/SLOW_STEP)*p->fadeIn, PREC1|LEFT); - lcd_putc(lcdLastPos, y, '/'); - lcd_outdezAtt(lcdLastPos+FW, y, (10/SLOW_STEP)*p->fadeOut, PREC1|LEFT); - } -#else + if (p->fadeIn || p->fadeOut) lcd_putc(LCD_W-FW-MENUS_SCROLLBAR_WIDTH, y, (p->fadeIn && p->fadeOut) ? '*' : (p->fadeIn ? 'I' : 'O')); -#endif + } #if defined(CPUARM) @@ -1390,7 +1488,9 @@ void menuModelPhasesAll(uint8_t event) } } -#endif +#endif // defined(PCBX9D) + +#endif // defined(FLIGHT_PHASES) #ifdef HELI @@ -1922,8 +2022,8 @@ void menuModelExpoOne(uint8_t event) int16_t x512 = calibratedStick[ed->chn]; int16_t y512 = expoFn(x512); - lcd_outdezAtt(LCD_W-8, 6*FH, x512*25/256, 0); - lcd_outdezAtt(LCD_W-8-6*FW, 1*FH, y512*25/256, 0); + lcd_outdezAtt(LCD_W-8, 6*FH, calcRESXto100(x512), 0); + lcd_outdezAtt(LCD_W-8-6*FW, 1*FH, calcRESXto100(y512), 0); x512 = X0+x512/(RESXu/WCHART); y512 = (LCD_H-1) - (uint16_t)((y512+RESX)/2) * (LCD_H-1) / RESX; diff --git a/src/monitors_views.cpp b/src/monitors_views.cpp index 7ec1a2a76..564a8b40b 100644 --- a/src/monitors_views.cpp +++ b/src/monitors_views.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/myeeprom.h b/src/myeeprom.h index 3cc9af3f1..32d018511 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -465,6 +467,7 @@ PACK(typedef struct t_FrSkyChannelData { enum TelemetrySource { TELEM_NONE, + TELEM_TX_VOLTAGE, TELEM_TM1, TELEM_TM2, TELEM_RSSI_TX, diff --git a/src/nmea.cpp b/src/nmea.cpp index 3277d9d99..534d0c153 100644 --- a/src/nmea.cpp +++ b/src/nmea.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/nmea.h b/src/nmea.h index db332ab76..8e05968ca 100644 --- a/src/nmea.h +++ b/src/nmea.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/open9x.cpp b/src/open9x.cpp index b303cf270..8f328519c 100644 --- a/src/open9x.cpp +++ b/src/open9x.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -594,6 +596,11 @@ int16_t calc100toRESX(int8_t x) return ((x*41)>>2) - x/64; } +int8_t calcRESXto100(int16_t x) +{ + return (x*25) << 8; +} + int16_t calc1000toRESX(int16_t x) // improve calc time by Pat MacKenzie { // return x + x/32 - x/128 + x/512; @@ -673,11 +680,11 @@ int16_t getValue(uint8_t i) else if (ifunc) { case CS_VEQUAL: - result = (x==y); + result = (abs(x-y) < STICK_TOLERANCE); break; case CS_VPOS: result = (x>y); @@ -1944,6 +1952,9 @@ PLAY_FUNCTION(playValue, uint8_t idx) // TODO add the MIXSRC_TELEM_TM1 and so on. switch (idx) { + case MIXSRC_LAST_CH+TELEM_TX_VOLTAGE-1: + PLAY_NUMBER(val, 1+UNIT_VOLTS, PREC1); + break; case MIXSRC_LAST_CH+TELEM_TM1-1: case MIXSRC_LAST_CH+TELEM_TM2-1: PLAY_DURATION(val); @@ -2027,7 +2038,7 @@ PLAY_FUNCTION(playValue, uint8_t idx) { uint8_t unit = 1; if (idx < MIXSRC_LAST_CH+TELEM_TM1-1) - val = (val * 25) / 256; + val = calcRESXto100(val); if (idx >= MIXSRC_LAST_CH+TELEM_ALT-1 && idx <= MIXSRC_LAST_CH+TELEM_GPSALT-1) unit = idx - (MIXSRC_LAST_CH+TELEM_ALT-1); else if (idx >= MIXSRC_LAST_CH+TELEM_MAX_T1-1 && idx <= MIXSRC_LAST_CH+TELEM_MAX_DIST-1) @@ -2733,6 +2744,14 @@ void doMixerCalculations() perOut(e_perout_mode_normal, tick10ms); } + if (tick10ms) { +#if defined(CPUARM) + requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF; +#endif + + evalFunctions(); + } + //========== LIMITS =============== for (uint8_t i=0; i 1024*100 @@ -2915,8 +2934,8 @@ void doMixerCalculations() if(s_timerVal[0]<= 3) AUDIO_TIMER_LT3(s_timerVal[0]); } - if (g_eeGeneral.minuteBeep && (((g_model.timers[0].start ? g_model.timers[0].start-s_timerVal[0] : s_timerVal[0])%60)==0)) { // short beep every minute - AUDIO_MINUTE_BEEP(); + if (g_eeGeneral.minuteBeep && (s_timerVal[0] % 60)==0) { // short beep every minute + AUDIO_TIMER_MINUTE(s_timerVal[0]); } } else if(s_timerState[0] == TMR_BEEPING) { @@ -2951,12 +2970,6 @@ void doMixerCalculations() } } -#if defined(CPUARM) - requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF; -#endif - - evalFunctions(); - #if defined(DSM2) if (s_rangecheck_mode) AUDIO_PLAY(AU_FRSKY_CHEEP); #endif @@ -3819,7 +3832,7 @@ int main(void) #endif lcd_clear() ; lcdRefresh() ; - pwrOff(); // Only turn power off if necessary + pwrOff(); // Only turn power off if necessary wdt_disable(); while(1); // never return from main() - there is no code to return back, if any delays occurs in physical power it does dead loop. #endif diff --git a/src/open9x.h b/src/open9x.h index d36d89214..559fb8cd0 100644 --- a/src/open9x.h +++ b/src/open9x.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -460,8 +462,6 @@ extern uint8_t stickMode; extern uint8_t channel_order(uint8_t x); - - class Key { #define FILTERBITS 4 @@ -583,35 +583,35 @@ enum CswFunctions { #endif #if defined(PCBX9D) -#define IS_ROTARY_LEFT(evt) (evt==EVT_KEY_FIRST(KEY_MOVE_DOWN) || evt==EVT_KEY_REPT(KEY_MOVE_DOWN)) -#define IS_ROTARY_RIGHT(evt) (evt==EVT_KEY_FIRST(KEY_MOVE_UP) || evt==EVT_KEY_REPT(KEY_MOVE_UP)) -#define IS_ROTARY_BREAK(evt) (evt==EVT_KEY_BREAK(KEY_ENTER)) -#define IS_ROTARY_LONG(evt) (evt==EVT_KEY_LONG(KEY_ENTER)) -#define IS_ROTARY_EVENT(evt) (0) -#define CASE_EVT_ROTARY_BREAK /*case EVT_KEY_BREAK(KEY_ENTER):*/ -#define CASE_EVT_ROTARY_LONG /*case EVT_KEY_LONG(KEY_ENTER):*/ -#define CASE_EVT_ROTARY_LEFT case EVT_KEY_FIRST(KEY_MOVE_DOWN): case EVT_KEY_REPT(KEY_MOVE_DOWN): -#define CASE_EVT_ROTARY_RIGHT case EVT_KEY_FIRST(KEY_MOVE_UP): case EVT_KEY_REPT(KEY_MOVE_UP): + #define IS_ROTARY_LEFT(evt) (evt==EVT_KEY_FIRST(KEY_MOVE_DOWN) || evt==EVT_KEY_REPT(KEY_MOVE_DOWN)) + #define IS_ROTARY_RIGHT(evt) (evt==EVT_KEY_FIRST(KEY_MOVE_UP) || evt==EVT_KEY_REPT(KEY_MOVE_UP)) + #define IS_ROTARY_BREAK(evt) (evt==EVT_KEY_BREAK(KEY_ENTER)) + #define IS_ROTARY_LONG(evt) (evt==EVT_KEY_LONG(KEY_ENTER)) + #define IS_ROTARY_EVENT(evt) (0) + #define CASE_EVT_ROTARY_BREAK /*case EVT_KEY_BREAK(KEY_ENTER):*/ + #define CASE_EVT_ROTARY_LONG /*case EVT_KEY_LONG(KEY_ENTER):*/ + #define CASE_EVT_ROTARY_LEFT case EVT_KEY_FIRST(KEY_MOVE_DOWN): case EVT_KEY_REPT(KEY_MOVE_DOWN): + #define CASE_EVT_ROTARY_RIGHT case EVT_KEY_FIRST(KEY_MOVE_UP): case EVT_KEY_REPT(KEY_MOVE_UP): #elif defined(ROTARY_ENCODER_NAVIGATION) -#define IS_ROTARY_LEFT(evt) (evt == EVT_ROTARY_LEFT) -#define IS_ROTARY_RIGHT(evt) (evt == EVT_ROTARY_RIGHT) -#define IS_ROTARY_BREAK(evt) (evt == EVT_ROTARY_BREAK) -#define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG) -#define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e) -#define CASE_EVT_ROTARY_BREAK case EVT_ROTARY_BREAK: -#define CASE_EVT_ROTARY_LONG case EVT_ROTARY_LONG: -#define CASE_EVT_ROTARY_LEFT case EVT_ROTARY_LEFT: -#define CASE_EVT_ROTARY_RIGHT case EVT_ROTARY_RIGHT: + #define IS_ROTARY_LEFT(evt) (evt == EVT_ROTARY_LEFT) + #define IS_ROTARY_RIGHT(evt) (evt == EVT_ROTARY_RIGHT) + #define IS_ROTARY_BREAK(evt) (evt == EVT_ROTARY_BREAK) + #define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG) + #define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e) + #define CASE_EVT_ROTARY_BREAK case EVT_ROTARY_BREAK: + #define CASE_EVT_ROTARY_LONG case EVT_ROTARY_LONG: + #define CASE_EVT_ROTARY_LEFT case EVT_ROTARY_LEFT: + #define CASE_EVT_ROTARY_RIGHT case EVT_ROTARY_RIGHT: #else -#define IS_ROTARY_LEFT(evt) (0) -#define IS_ROTARY_RIGHT(evt) (0) -#define IS_ROTARY_BREAK(evt) (0) -#define IS_ROTARY_LONG(evt) (0) -#define IS_ROTARY_EVENT(evt) (0) -#define CASE_EVT_ROTARY_BREAK -#define CASE_EVT_ROTARY_LONG -#define CASE_EVT_ROTARY_LEFT -#define CASE_EVT_ROTARY_RIGHT + #define IS_ROTARY_LEFT(evt) (0) + #define IS_ROTARY_RIGHT(evt) (0) + #define IS_ROTARY_BREAK(evt) (0) + #define IS_ROTARY_LONG(evt) (0) + #define IS_ROTARY_EVENT(evt) (0) + #define CASE_EVT_ROTARY_BREAK + #define CASE_EVT_ROTARY_LONG + #define CASE_EVT_ROTARY_LEFT + #define CASE_EVT_ROTARY_RIGHT #endif #if defined(PCBX9D) @@ -650,11 +650,13 @@ extern char idx2char(int8_t idx); void clearKeyEvents(); void pauseEvents(uint8_t enuk); void killEvents(uint8_t enuk); + #if defined(CPUARM) -uint8_t getEvent(bool trim); + uint8_t getEvent(bool trim); #else -uint8_t getEvent(); + uint8_t getEvent(); #endif + void putEvent(uint8_t evt); uint8_t keyDown(); @@ -666,29 +668,19 @@ enum PowerState { e_power_off }; -#if defined(CPUARM) -uint32_t switchState(EnumKeys enuk); -#else bool switchState(EnumKeys enuk); -#if defined(PCBGRUVIN9X) -uint8_t pwrCheck(); -#else -#define pwrCheck() (e_power_on) -#endif -#endif - void readKeysAndTrims(); uint16_t evalChkSum(); #if defined(VOICE) -#define MESSAGE_SOUND_ARG , uint8_t sound -#define MESSAGE(title, msg, info, sound) message(title, msg, info, sound) -#define ALERT(title, msg, sound) alert(title, msg, sound) + #define MESSAGE_SOUND_ARG , uint8_t sound + #define MESSAGE(title, msg, info, sound) message(title, msg, info, sound) + #define ALERT(title, msg, sound) alert(title, msg, sound) #else -#define MESSAGE_SOUND_ARG -#define MESSAGE(title, msg, info, sound) message(title, msg, info) -#define ALERT(title, msg, sound) alert(title, msg) + #define MESSAGE_SOUND_ARG + #define MESSAGE(title, msg, info, sound) message(title, msg, info) + #define ALERT(title, msg, sound) alert(title, msg) #endif extern void message(const pm_char *title, const pm_char *s, const char *last MESSAGE_SOUND_ARG); @@ -708,9 +700,9 @@ enum PerOutMode { extern uint8_t s_perout_flight_phase; #if defined(CPUARM) -#define bitfield_channels_t uint32_t + #define bitfield_channels_t uint32_t #else -#define bitfield_channels_t uint16_t + #define bitfield_channels_t uint16_t #endif void perOut(uint8_t mode, uint8_t tick10ms); @@ -724,9 +716,9 @@ extern swstate_t switches_states; int8_t getMovedSwitch(); #ifdef FLIGHT_PHASES -extern uint8_t getFlightPhase(); + extern uint8_t getFlightPhase(); #else -#define getFlightPhase() 0 + #define getFlightPhase() 0 #endif extern uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx); @@ -735,14 +727,14 @@ extern int16_t getTrimValue(uint8_t phase, uint8_t idx); extern void setTrimValue(uint8_t phase, uint8_t idx, int16_t trim); #if defined(ROTARY_ENCODERS) -int16_t getRotaryEncoder(uint8_t idx); -void incRotaryEncoder(uint8_t idx, int8_t inc); + int16_t getRotaryEncoder(uint8_t idx); + void incRotaryEncoder(uint8_t idx, int8_t inc); #endif #if defined(PCBGRUVIN9X) -#define ROTARY_ENCODER_GRANULARITY 1 + #define ROTARY_ENCODER_GRANULARITY 1 #else -#define ROTARY_ENCODER_GRANULARITY 2 + #define ROTARY_ENCODER_GRANULARITY 2 #endif #if defined(GVARS) @@ -791,34 +783,34 @@ extern uint16_t maxMixerDuration; extern uint16_t lastMixerDuration; #if defined(THRTRACE) -#define MAXTRACE (LCD_W - 8) -extern uint8_t s_traceBuf[MAXTRACE]; -extern uint8_t s_traceWr; -extern int8_t s_traceCnt; + #define MAXTRACE (LCD_W - 8) + extern uint8_t s_traceBuf[MAXTRACE]; + extern uint8_t s_traceWr; + extern int8_t s_traceCnt; #endif #if defined(PCBX9D) -static inline uint16_t getTmr2MHz() { return 0; } + static inline uint16_t getTmr2MHz() { return 0; } #elif defined(PCBSKY9X) -static inline uint16_t getTmr2MHz() { return TC1->TC_CHANNEL[0].TC_CV; } + static inline uint16_t getTmr2MHz() { return TC1->TC_CHANNEL[0].TC_CV; } #else -uint16_t getTmr16KHz(); + uint16_t getTmr16KHz(); #endif #if defined(CPUARM) -uint16_t stack_free(uint8_t tid); + uint16_t stack_free(uint8_t tid); #else -uint16_t stack_free(); + uint16_t stack_free(); #endif #if defined(CPUM64) -void memclear(void *ptr, uint8_t size); + void memclear(void *ptr, uint8_t size); #else -#define memclear(p, s) memset(p, 0, s) + #define memclear(p, s) memset(p, 0, s) #endif #if defined(SPLASH) -void doSplash(); + void doSplash(); #endif void checkLowEEPROM(); @@ -830,7 +822,7 @@ void checkAll(); #define ADC_VREF_TYPE 0x40 // AVCC with external capacitor at AREF pin #if !defined(SIMU) -void getADC(); + void getADC(); #endif #define STORE_MODELVARS eeDirty(EE_MODEL) @@ -861,29 +853,29 @@ enum Analogs { }; #if defined(PCBSTD) && defined(VOICE) && !defined(SIMU) -#define BACKLIGHT_ON() (Voice.Backlight = 1) -#define BACKLIGHT_OFF() (Voice.Backlight = 0) + #define BACKLIGHT_ON() (Voice.Backlight = 1) + #define BACKLIGHT_OFF() (Voice.Backlight = 0) #else -#define BACKLIGHT_ON() __BACKLIGHT_ON -#define BACKLIGHT_OFF() __BACKLIGHT_OFF + #define BACKLIGHT_ON() __BACKLIGHT_ON + #define BACKLIGHT_OFF() __BACKLIGHT_OFF #endif #define BUZZER_ON PORTE |= (1 << OUT_E_BUZZER) #define BUZZER_OFF PORTE &= ~(1 << OUT_E_BUZZER) #if defined(HAPTIC) -#if defined(PCBSKY9X) -#define HAPTIC_OFF hapticOff() -#elif defined(PCBGRUVIN9X) -#define HAPTIC_ON PORTD &= ~(1 << OUT_D_HAPTIC) -#define HAPTIC_OFF PORTD |= (1 << OUT_D_HAPTIC) + #if defined(PCBSKY9X) + #define HAPTIC_OFF hapticOff() + #elif defined(PCBGRUVIN9X) + #define HAPTIC_ON PORTD &= ~(1 << OUT_D_HAPTIC) + #define HAPTIC_OFF PORTD |= (1 << OUT_D_HAPTIC) + #else + #define HAPTIC_ON PORTG |= (1 << OUT_G_HAPTIC) + #define HAPTIC_OFF PORTG &= ~(1 << OUT_G_HAPTIC) + #endif #else -#define HAPTIC_ON PORTG |= (1 << OUT_G_HAPTIC) -#define HAPTIC_OFF PORTG &= ~(1 << OUT_G_HAPTIC) -#endif -#else -#define HAPTIC_ON -#define HAPTIC_OFF + #define HAPTIC_ON + #define HAPTIC_OFF #endif #define BITMASK(bit) (1<<(bit)) @@ -963,9 +955,10 @@ inline int16_t calcRESXto100(register int32_t x) } #else -extern int16_t calc100toRESX(int8_t x); -extern int16_t calc1000toRESX(int16_t x); -extern int16_t calcRESXto1000(int16_t x); +int16_t calc100toRESX(int8_t x); +int8_t calcRESXto100(int16_t x); +int16_t calc1000toRESX(int16_t x); +int16_t calcRESXto1000(int16_t x); #endif #define TMR_VAROFS 5 diff --git a/src/pgmtypes.h b/src/pgmtypes.h index b1622667b..4819c6bdc 100644 --- a/src/pgmtypes.h +++ b/src/pgmtypes.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/pulses_arm.cpp b/src/pulses_arm.cpp index 99976224c..1fbec9464 100644 --- a/src/pulses_arm.cpp +++ b/src/pulses_arm.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/pulses_arm.h b/src/pulses_arm.h index fb2b16bc6..99ac566d5 100644 --- a/src/pulses_arm.h +++ b/src/pulses_arm.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/pulses_avr.cpp b/src/pulses_avr.cpp index e1f40f852..542ed198a 100644 --- a/src/pulses_avr.cpp +++ b/src/pulses_avr.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/pulses_avr.h b/src/pulses_avr.h index 42536576d..ddbd16b92 100644 --- a/src/pulses_avr.h +++ b/src/pulses_avr.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/rtc.cpp b/src/rtc.cpp index eb9dd4188..cff5496ec 100644 --- a/src/rtc.cpp +++ b/src/rtc.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/rtc.h b/src/rtc.h index 401f95b8f..a42abe2b6 100644 --- a/src/rtc.h +++ b/src/rtc.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sdcard.h b/src/sdcard.h index fe78feaf8..a10bc50ef 100644 --- a/src/sdcard.h +++ b/src/sdcard.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp index 015ae9261..7790e7280 100644 --- a/src/simpgmspace.cpp +++ b/src/simpgmspace.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/simpgmspace.h b/src/simpgmspace.h index 1de71b235..2dabc7a7a 100644 --- a/src/simpgmspace.h +++ b/src/simpgmspace.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/simu.cpp b/src/simu.cpp index c03dc8524..9a4bd9b91 100644 --- a/src/simu.cpp +++ b/src/simu.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/adc_driver.cpp b/src/sky9x/adc_driver.cpp index e629d5017..92f0ffdcb 100644 --- a/src/sky9x/adc_driver.cpp +++ b/src/sky9x/adc_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/audio_driver.cpp b/src/sky9x/audio_driver.cpp index 8136e8cc7..451678a83 100644 --- a/src/sky9x/audio_driver.cpp +++ b/src/sky9x/audio_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/audio_driver.h b/src/sky9x/audio_driver.h index 06ad1b23c..5782ee4be 100644 --- a/src/sky9x/audio_driver.h +++ b/src/sky9x/audio_driver.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/bluetooth.cpp b/src/sky9x/bluetooth.cpp index 005f625d8..8cde679b5 100644 --- a/src/sky9x/bluetooth.cpp +++ b/src/sky9x/bluetooth.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/board.h b/src/sky9x/board.h index 05f293fdf..2d738524b 100644 --- a/src/sky9x/board.h +++ b/src/sky9x/board.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/board_sky9x.cpp b/src/sky9x/board_sky9x.cpp index bc27f7d63..f0827c9b3 100644 --- a/src/sky9x/board_sky9x.cpp +++ b/src/sky9x/board_sky9x.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/board_sky9x.h b/src/sky9x/board_sky9x.h index 3a569e6f9..cc6821ec7 100644 --- a/src/sky9x/board_sky9x.h +++ b/src/sky9x/board_sky9x.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -129,13 +131,6 @@ uint8_t getTemperature(); #define strcpy_P strcpy #define strcat_P strcat -extern uint32_t readKeys(); -#define KEYS_PRESSED() (~readKeys()) -#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (0x20 + 0x40)) == (0x20 + 0x40)) -#define DBLKEYS_PRESSED_UP_DWN(i) ((in & (0x10 + 0x08)) == (0x10 + 0x08)) -#define DBLKEYS_PRESSED_RGT_UP(i) ((in & (0x20 + 0x10)) == (0x20 + 0x10)) -#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (0x40 + 0x08)) == (0x40 + 0x08)) - #if !defined(REVA) extern uint16_t Current_analogue; extern uint16_t Current_max; @@ -156,6 +151,14 @@ extern uint16_t sessionTimer; void setSticksGain(uint8_t gains); +// Keys driver +extern uint32_t readKeys(); +#define KEYS_PRESSED() (~readKeys()) +#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & (0x20 + 0x40)) == (0x20 + 0x40)) +#define DBLKEYS_PRESSED_UP_DWN(i) ((in & (0x10 + 0x08)) == (0x10 + 0x08)) +#define DBLKEYS_PRESSED_RGT_UP(i) ((in & (0x20 + 0x10)) == (0x20 + 0x10)) +#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & (0x40 + 0x08)) == (0x40 + 0x08)) + // Pulses driver void init_main_ppm(uint32_t period, uint32_t out_enable); void disable_main_ppm(); diff --git a/src/sky9x/buzzer_driver.cpp b/src/sky9x/buzzer_driver.cpp index f23bffd7e..e0d3b3114 100644 --- a/src/sky9x/buzzer_driver.cpp +++ b/src/sky9x/buzzer_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/coproc_driver.cpp b/src/sky9x/coproc_driver.cpp index ad83aedf3..bb0f1dd97 100644 --- a/src/sky9x/coproc_driver.cpp +++ b/src/sky9x/coproc_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/debug_driver.cpp b/src/sky9x/debug_driver.cpp index bb93bdcb7..dc51fcec9 100644 --- a/src/sky9x/debug_driver.cpp +++ b/src/sky9x/debug_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/diskio.cpp b/src/sky9x/diskio.cpp index 110dbd285..a844b5b0c 100644 --- a/src/sky9x/diskio.cpp +++ b/src/sky9x/diskio.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/eeprom_driver.cpp b/src/sky9x/eeprom_driver.cpp index f2ac4090a..cfbcf271d 100644 --- a/src/sky9x/eeprom_driver.cpp +++ b/src/sky9x/eeprom_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/haptic_driver.cpp b/src/sky9x/haptic_driver.cpp index a291b631b..b94f6072d 100644 --- a/src/sky9x/haptic_driver.cpp +++ b/src/sky9x/haptic_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/keys_driver.cpp b/src/sky9x/keys_driver.cpp index 3e89be1c8..57bc7cdbc 100644 --- a/src/sky9x/keys_driver.cpp +++ b/src/sky9x/keys_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -139,7 +141,7 @@ void readKeysAndTrims() } } -uint32_t switchState(EnumKeys enuk) +bool switchState(EnumKeys enuk) { register uint32_t a; register uint32_t c; @@ -218,8 +220,5 @@ uint32_t switchState(EnumKeys enuk) break; } - if (xxx) { - return 1; - } - return 0; + return xxx; } diff --git a/src/sky9x/lcd_driver.cpp b/src/sky9x/lcd_driver.cpp index a8572a213..eb5fd3faf 100644 --- a/src/sky9x/lcd_driver.cpp +++ b/src/sky9x/lcd_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/massstorage.cpp b/src/sky9x/massstorage.cpp index 339af5f88..4af70376b 100644 --- a/src/sky9x/massstorage.cpp +++ b/src/sky9x/massstorage.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/pulses_driver.cpp b/src/sky9x/pulses_driver.cpp index 0c059cc23..c8e4d5b1c 100644 --- a/src/sky9x/pulses_driver.cpp +++ b/src/sky9x/pulses_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/pwr_driver.cpp b/src/sky9x/pwr_driver.cpp index 4013e5d93..ca772a621 100644 --- a/src/sky9x/pwr_driver.cpp +++ b/src/sky9x/pwr_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/rotenc_driver.cpp b/src/sky9x/rotenc_driver.cpp index a49b7346d..c46f5ee5e 100644 --- a/src/sky9x/rotenc_driver.cpp +++ b/src/sky9x/rotenc_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/rtc_driver.cpp b/src/sky9x/rtc_driver.cpp index 1489b5614..720d834f5 100644 --- a/src/sky9x/rtc_driver.cpp +++ b/src/sky9x/rtc_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/sky9x/sdcard_driver.cpp b/src/sky9x/sdcard_driver.cpp index 988c2619c..51a27c84d 100644 --- a/src/sky9x/sdcard_driver.cpp +++ b/src/sky9x/sdcard_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/stamp.cpp b/src/stamp.cpp index edb6774b4..137ee153c 100644 --- a/src/stamp.cpp +++ b/src/stamp.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/statistics_views.cpp b/src/statistics_views.cpp index b1cc9f484..0c4ede277 100644 --- a/src/statistics_views.cpp +++ b/src/statistics_views.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/stock/board_stock.cpp b/src/stock/board_stock.cpp index 750c0a98c..029894148 100644 --- a/src/stock/board_stock.cpp +++ b/src/stock/board_stock.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/stock/board_stock.h b/src/stock/board_stock.h index fe097fc26..b76fba451 100644 --- a/src/stock/board_stock.h +++ b/src/stock/board_stock.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -78,11 +80,17 @@ #define PAUSE_PPMIN_INTERRUPT() ETIMSK &= ~(1< + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/stock/voice.cpp b/src/stock/voice.cpp index a08af10db..c9a20a002 100644 --- a/src/stock/voice.cpp +++ b/src/stock/voice.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/stock/voice.h b/src/stock/voice.h index 765a0f4b4..0a64008a0 100644 --- a/src/stock/voice.h +++ b/src/stock/voice.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/templates.cpp b/src/templates.cpp index 0b0eca7eb..485216fba 100644 --- a/src/templates.cpp +++ b/src/templates.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/templates.h b/src/templates.h index 6985ccdc7..a24ef7779 100644 --- a/src/templates.h +++ b/src/templates.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/translations.cpp b/src/translations.cpp index 8aecad56e..bec5a1036 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/translations.h b/src/translations.h index 4b449c378..64a605657 100644 --- a/src/translations.h +++ b/src/translations.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/translations/cz.h b/src/translations/cz.h index 3119e314f..87d80e192 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -1,3 +1,25 @@ +/* + * Authors (alphabetical order) + * - Bertrand Songis + * - Martin Hotar + * + * 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. + * + */ + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "VYP""ZAP" diff --git a/src/translations/de.h b/src/translations/de.h index 028986b15..a1f21ecef 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -1,3 +1,27 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - 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. + * + */ + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "AUS""AN\0" diff --git a/src/translations/en.h b/src/translations/en.h index ba7cc3eca..d60dc4bb1 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -1,3 +1,39 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - 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. + * + */ + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "OFF""ON\0" @@ -182,7 +218,7 @@ #define TR_FUNCSOUNDS "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick " #define LEN_VTELEMCHNS "\004" -#define TR_VTELEMCHNS "---\0""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Time" #ifdef IMPERIAL_UNITS #define LENGTH_UNIT "ft\0" diff --git a/src/translations/es.h b/src/translations/es.h index 05d2cfb4d..6081f665c 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -1,3 +1,25 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Bertrand Songis + * + * 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. + * + */ + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "OFF""ON\0" diff --git a/src/translations/fr.h b/src/translations/fr.h index 365b4a88e..08b4c6e24 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -1,3 +1,25 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Bertrand Songis + * + * 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. + * + */ + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "OFF""ON\0" diff --git a/src/translations/it.h b/src/translations/it.h index f6482475c..8ccf8aa7d 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -1,3 +1,25 @@ +/* + * Authors (alphabetical order) + * - Bertrand Songis + * - Romolo Manfredini + * + * 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. + * + */ + #define LEN_OFFON "\003" #define TR_OFFON "OFF""ON\0" diff --git a/src/translations/se.h b/src/translations/se.h index 0a586a855..35ae6d1bb 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -1,3 +1,25 @@ +/* + * Authors (alphabetical order) + * - Bertrand Songis + * - Kjell Kernen + * + * 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. + * + */ + // NON ZERO TERMINATED STRINGS #define LEN_OFFON "\003" #define TR_OFFON "AV ""P\203 " diff --git a/src/translations/tts_cz.cpp b/src/translations/tts_cz.cpp index 8a78ed059..91bc60d79 100644 --- a/src/translations/tts_cz.cpp +++ b/src/translations/tts_cz.cpp @@ -1,20 +1,7 @@ /* * Authors (alphabetical order) - * - Andre Bernet * - Bertrand Songis - * - Bryan J. Rentoul (Gruvin) - * - Cameron Weeks - * - Erez Raviv - * - Jean-Pierre Parisy - * - Karl Szmutny * - Martin Hotar - * - Michael Blandford - * - Michal Hlavinka - * - Pat Mackenzie - * - Philip Moss - * - Rob Thomson - * - Romolo Manfredini - * - Thomas Husterer * * open9x is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, diff --git a/src/translations/tts_de.cpp b/src/translations/tts_de.cpp index 98fa72c44..391c42eab 100644 --- a/src/translations/tts_de.cpp +++ b/src/translations/tts_de.cpp @@ -1,18 +1,8 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis - * - Bryan J. Rentoul (Gruvin) - * - Cameron Weeks - * - Erez Raviv - * - Jean-Pierre Parisy - * - Karl Szmutny - * - Michael Blandford - * - Michal Hlavinka - * - Pat Mackenzie - * - Philip Moss - * - Rob Thomson - * - Romolo Manfredini * - Thomas Husterer * * open9x is based on code named diff --git a/src/translations/tts_en.cpp b/src/translations/tts_en.cpp index 544cbd789..ebd27a036 100644 --- a/src/translations/tts_en.cpp +++ b/src/translations/tts_en.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/translations/tts_es.cpp b/src/translations/tts_es.cpp index e171e5be7..e44fbbeff 100644 --- a/src/translations/tts_es.cpp +++ b/src/translations/tts_es.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/translations/tts_fr.cpp b/src/translations/tts_fr.cpp index e37a0fe6d..8817f41f8 100644 --- a/src/translations/tts_fr.cpp +++ b/src/translations/tts_fr.cpp @@ -1,19 +1,7 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet * - Bertrand Songis - * - Bryan J. Rentoul (Gruvin) - * - Cameron Weeks - * - Erez Raviv - * - Jean-Pierre Parisy - * - Karl Szmutny - * - Michael Blandford - * - Michal Hlavinka - * - Pat Mackenzie - * - Philip Moss - * - Rob Thomson - * - Romolo Manfredini - * - Thomas Husterer * * open9x is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, diff --git a/src/translations/tts_it.cpp b/src/translations/tts_it.cpp index d3fec1e90..dd953d577 100644 --- a/src/translations/tts_it.cpp +++ b/src/translations/tts_it.cpp @@ -1,19 +1,7 @@ /* * Authors (alphabetical order) - * - Andre Bernet * - Bertrand Songis - * - Bryan J. Rentoul (Gruvin) - * - Cameron Weeks - * - Erez Raviv - * - Jean-Pierre Parisy - * - Karl Szmutny - * - Michael Blandford - * - Michal Hlavinka - * - Pat Mackenzie - * - Philip Moss - * - Rob Thomson * - Romolo Manfredini - * - Thomas Husterer * * open9x is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, diff --git a/src/translations/tts_pt.cpp b/src/translations/tts_pt.cpp index ad743ae59..7985328b1 100644 --- a/src/translations/tts_pt.cpp +++ b/src/translations/tts_pt.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/translations/tts_sk.cpp b/src/translations/tts_sk.cpp index 8a3d2c955..62b506229 100644 --- a/src/translations/tts_sk.cpp +++ b/src/translations/tts_sk.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Martin Hotar * - Michael Blandford * - Michal Hlavinka diff --git a/src/x9d/adc_driver.cpp b/src/x9d/adc_driver.cpp index d88624439..3f940c4ec 100644 --- a/src/x9d/adc_driver.cpp +++ b/src/x9d/adc_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/audio_driver.cpp b/src/x9d/audio_driver.cpp index 0ebf1540a..f64608514 100644 --- a/src/x9d/audio_driver.cpp +++ b/src/x9d/audio_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/audio_driver.h b/src/x9d/audio_driver.h index c1bf81433..8e27a7619 100644 --- a/src/x9d/audio_driver.h +++ b/src/x9d/audio_driver.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/board_x9d.cpp b/src/x9d/board_x9d.cpp index cd2af9843..a7047c7ff 100644 --- a/src/x9d/board_x9d.cpp +++ b/src/x9d/board_x9d.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/board_x9d.h b/src/x9d/board_x9d.h index fd357876d..c51bcf091 100644 --- a/src/x9d/board_x9d.h +++ b/src/x9d/board_x9d.h @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/debug_driver.cpp b/src/x9d/debug_driver.cpp index da2ca367e..ef5ae69c5 100644 --- a/src/x9d/debug_driver.cpp +++ b/src/x9d/debug_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/delays.cpp b/src/x9d/delays.cpp index 6734436e1..9c66ae662 100644 --- a/src/x9d/delays.cpp +++ b/src/x9d/delays.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/diskio.cpp b/src/x9d/diskio.cpp index 905fa01ed..662816925 100644 --- a/src/x9d/diskio.cpp +++ b/src/x9d/diskio.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/keys_driver.cpp b/src/x9d/keys_driver.cpp index c8a0b3787..eb22866c9 100644 --- a/src/x9d/keys_driver.cpp +++ b/src/x9d/keys_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie @@ -115,7 +117,7 @@ void readKeysAndTrims() } } -uint32_t switchState(EnumKeys enuk) +bool switchState(EnumKeys enuk) { register uint32_t a = GPIOA->IDR; register uint32_t b = GPIOB->IDR; @@ -204,11 +206,7 @@ uint32_t switchState(EnumKeys enuk) break; } - if (xxx) { - return 1; - } - - return 0; + return xxx; } #if !defined(SIMU) diff --git a/src/x9d/pulses_driver.cpp b/src/x9d/pulses_driver.cpp index aed447cbd..b36babdc3 100644 --- a/src/x9d/pulses_driver.cpp +++ b/src/x9d/pulses_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/pwr_driver.cpp b/src/x9d/pwr_driver.cpp index 8f28f703a..09400c4d0 100644 --- a/src/x9d/pwr_driver.cpp +++ b/src/x9d/pwr_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/rtc_driver.cpp b/src/x9d/rtc_driver.cpp index 0adb89df2..c192de9e9 100644 --- a/src/x9d/rtc_driver.cpp +++ b/src/x9d/rtc_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) - * - Andre Bernet + * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie diff --git a/src/x9d/trainer_driver.cpp b/src/x9d/trainer_driver.cpp index 57c8b17b3..c4df12c73 100644 --- a/src/x9d/trainer_driver.cpp +++ b/src/x9d/trainer_driver.cpp @@ -1,12 +1,14 @@ /* * Authors (alphabetical order) * - Andre Bernet + * - Andreas Weitl * - Bertrand Songis * - Bryan J. Rentoul (Gruvin) * - Cameron Weeks * - Erez Raviv + * - Gabriel Birkus * - Jean-Pierre Parisy - * - Karl Szmutny + * - Karl Szmutny * - Michael Blandford * - Michal Hlavinka * - Pat Mackenzie