piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
10,946 Commits 2 Branches 0 Tags
bfcc0ffddfa80da42e411b661db3f104fbd6e574
Commit Graph
10946 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertrand Songis c473b8e105 Issue #592 - Support for Sticky Switches in Companion 2014-02-05 22:31:43 +01:00
Jacek Drewniak 71b28cff87 adding new things from changes 2014-02-05 22:08:55 +01:00
Kjell Kernen 1f7be79a92 Revert "Two new dialogs defined." 
This reverts commit d9f97016e2.
 2014-02-05 17:48:01 +01:00
Kjell Kernen 06bb5ab175 Merge branch 'origin/next' 2014-02-05 17:46:12 +01:00
Kjell Kernen d9f97016e2 Two new dialogs defined. 2014-02-05 17:44:49 +01:00
Bertrand Songis 873d2c4377 Merge remote-tracking branch 'origin/next' into 
bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/gui/menu_model.cpp
 2014-02-05 08:01:40 +01:00
Bertrand Songis 8ff61ef915 Update DONATIONS.txt 2014-02-05 07:22:12 +01:00
Bertrand Songis cefd125117 Merge pull request #654 from opentx/dvogonen/simplify_companion_preferences_dialog_632 
First preference simplification step
 2014-02-04 13:55:54 -08:00
Kjell Kernen bb3335b555 Updated translation files 2014-02-04 22:47:14 +01:00
Kjell Kernen 191c11056a Merge branch 'next' 2014-02-04 22:40:59 +01:00
Kjell Kernen cf6a56b64a Merge branch 'origin/next' 2014-02-04 22:38:03 +01:00
Kjell Kernen 0ecadadeb4 Settings menu created which will hold all configurations and settings. 
Language, theme and icon size broken out of the preferences and put into the menu, where they belong.
 2014-02-04 22:37:13 +01:00
Bertrand Songis cfa5382969 Update DONATIONS.txt 2014-02-04 22:26:08 +01:00
Bertrand Songis 77ff73a89b Merge pull request #653 from opentx/mhotar/layout_alignments_Issue#584 
Mhotar/layout alignments issue#584
 2014-02-04 11:51:48 -08:00
mhotar 9744eb966c pointer and ":" fix 2014-02-04 20:25:35 +01:00
mhotar 0a45a71ea0 merge ate PL,FR,ES translations files 2014-02-04 14:43:16 +01:00
mhotar 40edf9f88a Merge remote-tracking branch 'origin/next' into mhotar/layout_alignments_Issue #584 
Conflicts:
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/pl.h.txt
Manually resolved.
 2014-02-04 13:41:39 +01:00
mhotar 49bcb3b0fc Centered strings #584 2014-02-04 13:01:59 +01:00
Bertrand Songis 08cc65b517 Merge pull request #648 from opentx/driver33/PL_Translation 
fix according to (#646)
 2014-02-04 02:00:01 -08:00
Bertrand Songis b18a642de6 Test Companion automatic compilation 2014-02-04 10:48:48 +01:00
Bertrand Songis 9c82e62cc7 [all] Issue #592 - Corrections (GVARS) 2014-02-04 10:30:26 +01:00
Bertrand Songis 98eb42a77c Issue #592 - Corrections for ARM boards 2014-02-04 07:35:46 +01:00
Bertrand Songis 21398347f1 Update DONATIONS.txt 2014-02-04 07:16:33 +01:00
Bertrand Songis a48d76504a [all] Issue #592 - Sticky switches: more code rewritten, more flash 
saved on 9x stock. Logical Switches Delay and Duration modified on
Taranis and Sky9x
 2014-02-03 23:20:49 +01:00
Kjell Kernen 71ef6d5457 Changed names for Master/Slave in Swedsih translation 2014-02-03 23:17:55 +01:00
Andre Bernet 10dc3503c2 Pot warning UI in companion 2014-02-03 21:32:19 +01:00
Jacek Drewniak c4251c4ee2 fix according to (#646) 2014-02-03 19:09:51 +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
Bertrand Songis c2b18553ab Merge branch 'bsongis/Issue592_sticky_switches' of 
https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/opentx.cpp
 2014-02-03 15:10:27 +01:00
Bertrand Songis 075a21b53a Merge branch 'bsongis/Issue592_sticky_switches' of 
https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/opentx.cpp
 2014-02-03 15:07:37 +01:00
Bertrand Songis c8ae023a15 Merge branch 'bsongis/Issue592_sticky_switches' of 
https://github.com/opentx/opentx into bsongis/Issue592_sticky_switches

Conflicts:
	radio/src/opentx.cpp
 2014-02-03 15:05:10 +01:00
Bertrand Songis e48c27d30a [all] Issue #592 - Sticky switches on all boards. Saves 62bytes on 
stock!
 2014-02-03 14:33:55 +01:00
Bertrand Songis b404673f58 [all] Issue #592 - Sticky switches on all boards. Saves 62bytes on 
stock!
 2014-02-03 14:07:42 +01:00
Dvogonen b8f3e1771d Corrected an image problem with a section being slightly "blacker" than the black surrounding it. Pushing directly to next. 2014-02-03 13:58:19 +01:00
Kjell Kernen e0fe763832 Merge pull request #647 from opentx/dvogonen/renaming_even_more_CS_to_LS 
Changed CS labels in xsimulator to LS labels
 2014-02-03 04:52:12 -08:00
Dvogonen 5960f25878 Changed CS labels in xsimulator to LS labels 2014-02-03 13:50:19 +01:00
Kjell Kernen 719aa2ee49 Merge pull request #646 from opentx/dvogonen/rename_another_screenful_of_CS_to_LS 
Renamed the CS labels in the simulator dialog to LS
 2014-02-03 03:09:13 -08:00
Dvogonen 1b071cbf47 Renamed the CS labels in the simulator dialog to LS 2014-02-03 12:07:52 +01:00
Kjell Kernen 210c03e0a1 Merge pull request #645 from opentx/dvogonen/swedish_translation_branch 
Translated latest strings to Swedish and made minor improvements
 2014-02-03 02:55:22 -08:00
Dvogonen 2b878af183 TRanslated latest strings and made minor improvements 2014-02-03 11:53:40 +01:00
Bertrand Songis 9730f8d190 [Taranis] Issue #592 - Sticky switches 2014-02-03 11:22:06 +01:00
Andre Bernet 7c81920431 Debug wasn't padded 2014-02-03 10:21:42 +01:00
Andre Bernet d44f3d9f3e Merge pull request #643 from opentx/driver33/PL_translation 
Driver33/pl translation
 2014-02-03 01:18:11 -08:00
Andre Bernet 6509a5a66e Conflict resolved the wrong way 2014-02-03 10:17:09 +01:00
Jacek Drewniak 6a9b21b6e6 fixes in both companion and opentx new string in companion helpers that need to be transfered into other translation files 2014-02-03 00:59:29 +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 352a2e023a Merge pull request #641 from opentx/driver33/sport 
Driver33/sport
 2014-02-02 14:57:42 -08:00