Commit Graph
100 Commits
Author SHA1 Message Date
Andre Bernet 4d66fd8061 PPMx were missing in Inputs source list 2014-02-28 15:07:34 +01:00
Andre Bernet 3ab86c90a6 Sky9x support for 16CH input on trainer port (untested) 2014-02-28 13:51:18 +01:00
Andre Bernet c2912eb5e1 French translation fix 2014-02-28 13:18:03 +01:00
Andre Bernet 56cb40dd38 Taranis trainer driver support for 16CH input 2014-02-28 13:07:45 +01:00
Andre Bernet 89970776a6 Merge pull request #737 from opentx/bsongis/spare_values_in_telemetry_and_functions
Bsongis/spare values in telemetry and functions
2014-02-28 12:45:07 +01:00
Andre Bernet 2d678b781e Units in all languages 2014-02-28 11:18:38 +01:00
Andre Bernet c6b64a9305 Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Issue524_SPORT_GPS 2014-02-28 11:06:52 +01:00
Andre Bernet 88cba206ff Hide dTE 2014-02-28 10:37:35 +01:00
Andre Bernet 0a30595bb1 Merge pull request #759 from opentx/mhotar/LS_delta_character
Mhotar/LS delta character
2014-02-28 09:40:44 +01:00
Andre Bernet bec9f650ee Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Issue524_SPORT_GPS
Conflicts:
	radio/src/translations.h
2014-02-27 22:45:12 +01:00
Andre Bernet 423d1a4437 French translations 2014-02-27 22:22:34 +01:00
Andre Bernet 3c8fd3a51d Delta character now requires en.h to go through translate.py 2014-02-27 21:19:33 +01:00
Andre Bernet 572a9ed3ba Merge branch 'next' of https://github.com/opentx/opentx into bsongis/spare_values_in_telemetry_and_functions 2014-02-27 20:09:31 +01:00
Andre Bernet 32aa5e9bc4 Merge pull request #745 from opentx/bsongis/Issue650_precise_logical_switches_delays_durations
Issue #650 fixed - 0.1s precision in durations/delays for logical
2014-02-26 11:26:52 +01:00
Andre Bernet 32bcb8b5d6 Merge pull request #738 from opentx/bsongis/vario_improvements
Bsongis/vario improvements
2014-02-26 10:18:41 +01:00
Andre Bernet c5edba2188 Merge pull request #744 from opentx/bsongis/Issue741_a_equals_x_in_logical_switches
Issue #741 fixed - a==x added in logical switches functions
2014-02-25 21:07:07 +01:00
Andre Bernet 7c3c7a1572 Merge pull request #742 from opentx/bsongis/indication_of_active_fm_in_gv_menu
Bsongis/indication of active fm in gv menu
2014-02-25 20:43:13 +01:00
Andre Bernet c1f44e1748 Merge branch 'next' of https://github.com/opentx/opentx into bsongis/indication_of_active_fm_in_gv_menu 2014-02-25 20:34:53 +01:00
Andre Bernet 4d2f8d2918 Duration/delay display wasn't adapted on Taranis 2014-02-25 19:49:21 +01:00
Andre Bernet d7483c9dc3 Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Issue650_precise_logical_switches_delays_durations 2014-02-25 19:29:21 +01:00
Andre Bernet 94afb88f8b Merge branch 'next' of https://github.com/opentx/opentx into bsongis/vario_improvements
Conflicts:
	radio/src/audio_arm.cpp
2014-02-25 19:02:36 +01:00
Andre Bernet 95d7951b17 Merge pull request #725 from opentx/bsongis/Issue713_more_custom_functions
Bsongis/issue713 more custom functions
2014-02-25 19:00:01 +01:00
Andre Bernet 82146f7b7d Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Issue713_more_custom_functions 2014-02-25 18:17:15 +01:00
Andre Bernet 903cb8bd83 Throttle warning fixed
Top bar time colon now blinks "correctly", some people seemed to be confused by it...
2014-02-22 08:47:22 +01:00
Andre Bernet 47259fb40a Fix throttle warning
No need to write a space for blinking colon as all positions are hardcoded
2014-02-21 23:35:55 +01:00
Andre Bernet 92a5429ce0 Longer inhibition time for automatic switch prompts at power up 2014-02-21 23:22:06 +01:00
Andre Bernet 3f14d6a066 Top bar time colon now blinks "correctly", some people seemed to be confused by it... 2014-02-21 22:55:04 +01:00
Andre Bernet 5659dcb78f Fix cell logs 2014-02-20 12:46:29 +01:00
Andre Bernet 44ea1ae8eb Cells decoding wasn't updated for SPORT 2014-02-20 12:35:34 +01:00
Andre Bernet d2dd9fa6f8 Ignore list 2014-02-13 16:05:23 +01:00
Andre Bernet a76484a7eb Merge branch 'next' into bsongis/Lua_interpreter_171 2014-02-11 18:21:18 +01:00
Andre Bernet 973475d01e Telemetry comparison value conversions weren't being run 2014-02-11 18:17:31 +01:00
Andre Bernet 9caa0f1e3b AND switch wasn't converted 2014-02-11 17:24:03 +01:00
Andre Bernet bb4fc32b00 Fix conversion of timer source and CFs 2014-02-10 20:16:18 +01:00
Andre Bernet 9ac30369e0 Solve merge conflict 2014-02-10 15:27:53 +01:00
Andre Bernet f635a1e762 Solve merge conflict 2014-02-10 15:25:18 +01:00
Andre Bernet a43caca219 Translations 2014-02-10 15:17:24 +01:00
Andre Bernet 041bf5aa04 Try to get rid of character mess 2014-02-10 15:14:35 +01:00
Andre Bernet 2a83cffc53 Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxeeprom.cpp
	radio/src/opentx.cpp
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
2014-02-10 14:47:32 +01:00
Andre Bernet b39dd034c6 Switch warnings before 21 March 2013 imported OK 2014-02-10 13:08:56 +01:00
Andre Bernet 160cf07110 Switch states now imported correctly after 21 March 2013, need to check the case of before that 2014-02-10 12:34:52 +01:00
Andre Bernet da5359af87 Missing rename 2014-02-10 11:58:24 +01:00
Andre Bernet 2f6c8cb200 Rename AFTER release xxx 2014-02-10 11:45:08 +01:00
Andre Bernet dc660d4ade Switch/pot warnings were duplicated in companion structure for Taranis
nPotsToWarn relocated out of MODELDATA_EXTRA
Only bug left is ID2 on stock appearing as RUD in the states
2014-02-09 23:45:31 +01:00
Andre Bernet 30d13baeab Don't update pot warnings when not applicable 2014-02-09 20:19:15 +01:00
Andre Bernet f79ae6c39b Falisafe settings fixed, now include decimal (slider removed) and scaled properly taking 1000/1024 ratio to match display on the radio 2014-02-08 13:14:20 +01:00
Andre Bernet 2f437ccad5 French translations 2014-02-08 01:06:07 +01:00
Andre Bernet 5f75e5851e Rename "Stay" to "Edge" 2014-02-08 01:05:54 +01:00
Andre Bernet 1ce67a62c2 Sync translations 2014-02-08 00:50:03 +01:00
Andre Bernet ca9d53dbdd CS->LS 2014-02-08 00:30:35 +01:00
Andre Bernet 17823786e4 Merge branch 'bsongis/Issue592_sticky_switches' into next
Conflicts:
	radio/src/gui/menu_model.cpp
2014-02-07 23:39:28 +01:00
Andre Bernet 2364752a98 Trims included in simulator stick labels 2014-02-07 11:21:40 +01:00
Andre Bernet 10dc3503c2 Pot warning UI in companion 2014-02-03 21:32:19 +01:00
Andre Bernet 62ad79538f Fix constant string, remove warning 2014-02-03 17:42:38 +01:00
Andre Bernet 28e9d0ee94 Fix UTF8 mess 2014-02-03 17:18:22 +01:00
Andre Bernet 59ad4f79fc Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/pl.h.txt
	radio/src/translations/se.h.txt
2014-02-03 17:15:08 +01:00
Andre Bernet efacc05868 Switch warnings for ID0 on 9x now display the position it should have, like on Taranis. Makes more sense than having the current position. 2014-02-03 17:07:45 +01:00
Andre Bernet 7c81920431 Debug wasn't padded 2014-02-03 10:21:42 +01:00
Andre Bernet 6509a5a66e Conflict resolved the wrong way 2014-02-03 10:17:09 +01:00
Andre Bernet 9a81cc37b3 Remove Virtual SP2UART choice for serial port for now, sync translations (Debug) 2014-02-03 00:05:44 +01:00
Andre Bernet e1aba1bc1c Fixes fixed 2014-02-02 12:14:30 +01:00
Andre BernetandBertrand Songis 0b77d9921d VC doesn't like binary constants 2014-02-01 19:42:57 +01:00
Andre Bernet cae8cb9c1f TRN switch not in warnings... 2014-02-01 15:36:28 +01:00
Andre Bernet 3f2166330d Confirmation beep had been removed on stock 2014-02-01 14:57:35 +01:00
Andre Bernet 3a5b41ae54 Switch warnings on stock again 2014-02-01 14:55:10 +01:00
Andre Bernet fcce76cfa4 Correct for new constant name 2014-02-01 13:24:53 +01:00
Andre Bernet 856ffd4ed7 Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
	companion/src/firmwares/opentx/opentxeeprom.cpp
	radio/src/gui/menu_model.cpp
	radio/src/opentx.cpp
	radio/src/telemetry/frsky.cpp
	radio/src/translations.cpp
	radio/src/translations.h
	radio/src/translations/cz.h.txt
	radio/src/translations/de.h.txt
	radio/src/translations/en.h
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/it.h.txt
	radio/src/translations/pl.h.txt
	radio/src/translations/pt.h.txt
	radio/src/translations/se.h.txt
2014-02-01 13:19:27 +01:00
Andre Bernet 7d5e37d5fa Reset pot type to Pot if max no of steps exceeded to avoid stray switch entry 2014-02-01 10:13:18 +01:00
Andre Bernet a3b7852467 Overflow in S2 type selection 2014-02-01 09:52:27 +01:00
Andre Bernet 586b74b7f7 Little translation fixes 2014-01-31 00:36:35 +01:00
Andre Bernet 1d625bdac8 Realign translations 2014-01-26 14:42:59 +01:00
Andre Bernet 1451d7d37e Realign translations 2014-01-26 14:41:06 +01:00
Andre Bernet e9860ed649 Manual handling of pull request #596 - Polish translations 2014-01-26 14:06:26 +01:00
Andre Bernet 30c7e990fb Translations 2014-01-24 09:13:03 +01:00
Andre Bernet b32dcda598 EEPROM support for Hardware/UART mode, separated for easy cherry-picking (#588) 2014-01-24 00:35:24 +01:00
Andre Bernet 7d2d7cac08 Hardware tab with first item for #588 2014-01-24 00:19:17 +01:00
Andre Bernet 7c2cfd4db3 .lbm's weren't actually untracked 2014-01-23 22:08:27 +01:00
Andre Bernet ecc2be0b3e 16-bit limits were broken on ARM 2014-01-23 21:15:32 +01:00
Andre Bernet e695b92a50 Issue #552 - Port string length change to all languages, please translate again as required 2014-01-23 20:21:49 +01:00
Andre Bernet b38d278c75 New switch warnings and displayText in companion. Import/export conversions not done yet 2014-01-20 19:26:30 +01:00
Andre Bernet 006eee1411 Merge branch 'dvogonen/automatically_convert_settings_511' of https://github.com/opentx/opentx into next
Conflicts:
	companion/src/main.cpp
2014-01-15 23:02:21 +01:00
Andre Bernet 0b2b9ea1c3 Merge branch 'next' into kilrah/Switch_and_pot_warnings
Conflicts:
	radio/src/myeeprom.h
	radio/src/translations/cz.h
	radio/src/translations/de.h
	radio/src/translations/es.h
	radio/src/translations/fr.h
	radio/src/translations/fr.h.txt
	radio/src/translations/it.h
	radio/src/translations/pl.h
	radio/src/translations/pt.h
	radio/src/translations/se.h
2014-01-15 22:16:16 +01:00
Andre Bernet bea9c74243 Companion support for FAS offset, Persistent mAh and Altitude in top bar 2014-01-15 20:40:53 +01:00
Andre Bernet ba9f55cb67 Merge was resolved the wrong way, files that should have been deleted were reinstated 2014-01-15 16:30:54 +01:00
Andre Bernet f246c992c0 Merge branch 'next' of https://github.com/opentx/opentx into kilrah/FAS_Offset_compensation 2014-01-15 16:26:56 +01:00
Andre Bernet 06a2e757f1 Merge branch 'next' into kilrah/FAS_Offset_compensation
Conflicts:
	companion/src/modeledit.ui
	radio/src/translations/cz.h
	radio/src/translations/de.h
	radio/src/translations/fr.h
	radio/src/translations/it.h
	radio/src/translations/pl.h
	radio/src/translations/pt.h
	radio/src/translations/se.h
2014-01-15 16:02:32 +01:00
Andre Bernet 02f75dedd9 Merge branch 'bsongis/Companion_ModelEdit_split' into next 2014-01-15 14:55:15 +01:00
Andre Bernet 9b6c0e4fd1 Multiplex was collated to source 2014-01-15 14:41:54 +01:00
Andre Bernet 3ade8707a7 Nicer module UI 2014-01-07 21:30:57 +01:00
Andre Bernet c90e167594 Better location for switch warning enables to avoid a big shift (fixes #193) 2014-01-06 09:48:17 +01:00
Andre Bernet 8dcd1da919 Some timers are receiving 120MHz 2014-01-05 20:42:59 +01:00
Andre Bernet 1615fd7593 Switch CPU speed to 120MHz. Rest should not be affected. 2014-01-05 15:52:30 +01:00
Andre Bernet 300d6af086 Avoid Telemetry Lost / Telemetry Recovered voice alerts playing back to back when using the Reset Telemetry / Flight functions 2014-01-05 14:13:10 +01:00
Andre Bernet 4ffe49ef01 A2 was also disabled in custom switches in D16 mode 2014-01-05 14:02:25 +01:00
Andre Bernet c177824601 Reinstate A2 alarms in D16 mode for the 3rd party adapter 2014-01-05 14:02:20 +01:00
Andre Bernet 7a5154305b Fix mac paths - app icon still needs updating 2014-01-05 12:51:30 +01:00
Andre Bernet 63dd5927fb Merge branch 'bsongis/Sky9x_Stick_Gain_Issue_155' of https://github.com/opentx/opentx into next 2014-01-05 12:26:45 +01:00
Andre Bernet 624bab7826 Merge branch 'bsongis/Taranis_audio_freeze' of https://github.com/opentx/opentx into next 2014-01-05 12:26:14 +01:00
Andre Bernet d65b74269b More renaming. Just for the life of me can't get the translations to be recognised. Also, while a clean install will use the new app folders, the nsi scripts are currently configured to retrieve the install folder from registry if present. Might want to think about whether we want to remove this or not. 2014-01-05 12:13:38 +01:00
Andre Bernet b90a621db8 Telemetry view fix for new font 2014-01-04 23:20:54 +01:00