Commit Graph
78 Commits
Author SHA1 Message Date
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
Andre Bernet ca61fe4298 Switch Warnings disabled by default on ARM 2014-01-04 22:12:41 +01:00
Andre Bernet fce51a6945 A2 was also disabled in custom switches in D16 mode 2014-01-04 20:41:19 +01:00
Andre Bernet dbf39608eb Reinstate A2 alarms in D16 mode for the 3rd party adapter 2014-01-04 18:21:08 +01:00
Andre Bernet 0618f98a13 Avoid Telemetry Lost / Telemetry Recovered voice alerts playing back to back when using the Reset Telemetry / Flight functions 2014-01-04 18:11:33 +01:00
Andre Bernet f879c54f8e Fix German translations 2013-12-26 10:18:05 +01:00
Andre Bernet 1f6bd16d8e UI for FAS offset in companion 2013-12-14 13:19:03 +01:00
Andre Bernet 6d0398ec64 Merge branch 'next' into kilrah/FAS_Offset_compensation
Conflicts:
	radio/src/translations/es.h
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h
	radio/src/translations/fr.h.txt
2013-12-14 13:03:25 +01:00
Andre Bernet 595258e3e8 French translations 2013-12-14 12:29:46 +01:00
Andre Bernet 825cc28bd8 Pot warning mode labels 2013-12-05 12:42:48 +01:00
Andre Bernet 7c9b0960ea mAh and pot positions weren't saved on model change 2013-12-05 11:27:21 +01:00
Andre Bernet 9c5e8881fc Reorder pot warning modes to simplify potential stock board implementation
Might be good to make an enum too.
2013-12-04 12:04:52 +01:00
Andre Bernet 05fca48115 [Taranis] Option to display checklist at startup if present - done here to avoid merge conflicts 2013-12-03 23:04:45 +01:00
Andre Bernet d125e408f2 FAS offset now an option for M64 only 2013-12-03 22:29:22 +01:00
Andre Bernet ab1c367dba French translation 2013-12-03 16:07:22 +01:00
Andre Bernet 6749d26333 Translations 2013-12-03 16:04:00 +01:00
Andre Bernet 413119efc5 French translation 2013-12-03 15:47:25 +01:00
Andre Bernet 7f6591edad Pot warning finished on Taranis, ready to merge once tested by more people :) 2013-12-03 14:56:55 +01:00
Andre Bernet 43b0c00e11 More pot checking - still need to find how to read the pot's position on the warning screen, the current solution only works the first time. 2013-12-02 15:51:12 +01:00
Andre Bernet 452e987fca checkSwitches() hopefully more sane 2013-12-02 14:54:02 +01:00
Andre Bernet 74918e4d12 Pot warning beta - needs testing, and checkSwitches() needs reviewing! 2013-12-02 14:11:35 +01:00
Andre Bernet eab9fdc24c Pot warning UI done (Taranis only) 2013-12-02 12:07:01 +01:00
Andre Bernet 5c582390f6 Confirmation blink added to trim reset and failsafe set 2013-12-01 22:19:19 +01:00
Andre Bernet 0fefe2f2dd Beep for switch warning definition, had gone missing in the various changes.... 2013-12-01 21:48:03 +01:00
Andre Bernet ad7c110179 Safer switch warning entry - fixed 2013-11-30 15:34:22 +01:00
Andre Bernet f9adb56d10 Shouldn't have been in that branch 2013-11-30 15:25:49 +01:00
Andre Bernet 4bfb7caaa8 Merge branch 'next' into kilrah/Switch_and_pot_warnings 2013-11-30 15:08:10 +01:00
Andre Bernet f088c481f8 Shouldn't have been committed to next 2013-11-30 15:03:58 +01:00
Andre Bernet 9f25f558fd Merge branch 'kilrah/FAS_Offset_compensation' into kilrah/Switch_and_pot_warnings
Conflicts:
	src/translations/es.h
	src/translations/es.h.txt
2013-11-30 12:40:25 +01:00
Andre Bernet 9aa5e6d5b5 Merge branch 'kilrah/Pot_warning' into kilrah/Switch_and_pot_warnings
Conflicts:
	src/gui/menu_model.cpp
2013-11-30 12:16:22 +01:00
Andre Bernet 0b267c4a4c [ARM] Pot warning UI first steps 2013-11-30 12:11:31 +01:00
Andre Bernet c7dac9c9a9 Merge branch 'next' into kilrah/Switch_and_pot_warnings 2013-11-30 11:59:13 +01:00
Andre Bernet 11521c128c [ARM] Reserve EEPROM for stored pot positions and startup checklist display 2013-11-30 11:51:38 +01:00
Andre Bernet d563f64fe3 [Taranis] Text display menu entry was inoperative 2013-11-30 11:51:11 +01:00
Andre Bernet ea98552365 [ARM] Better import of existing switch warnings 2013-11-30 11:49:57 +01:00
Andre Bernet b13fbade78 [all] Switch warnings can be enabled/disabled for each individual switch 2013-11-30 11:49:17 +01:00
Andre Bernet c31f184813 [all] FAS Offset compensation, +/- 1.5A ( issue 166 ) 2013-11-30 11:43:59 +01:00
Andre Bernet 0c0f559f75 [Taranis] Add cumulative usage timer in Statistics view, reset with MENU LONG 2013-11-30 11:40:59 +01:00
Andre Bernet aee3a1c25e [ARM] mAh count can be stored when the radio is powered down between flights ( issue 186 ) 2013-11-30 11:39:11 +01:00
Andre Bernet 1c510326cb [ARM] Adapt DBLKEYS for new limits with decimals 2013-11-30 11:34:37 +01:00
Andre Bernet 023051bf47 Polish translations, other translation fixes 2013-11-30 11:27:02 +01:00