piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
3,149 Commits 2 Branches 0 Tags
d5e22111e1ee94be6b935e5c8ae2a4eec607a1a4
Commit Graph
3149 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kjell Kernen d5e22111e1 App Preferences dialog tabs fully functional, except for adding profiles. 
Splash Editor fully functional. Improved handling of image formats remain.
Merged branch 'origin/next'
 2014-02-10 16:59:49 +01:00
Bertrand Songis 51a6c3c0ab Merge pull request #679 from opentx/kilrah/Switch_and_pot_warnings 
Kilrah/switch and pot warnings
 2014-02-10 16:21:25 +01:00
Bertrand Songis c205336fa6 mAh was store two times on Tx shutdown 2014-02-10 16:17:47 +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
Bertrand Songis 12997bd169 Bug on ID2 fixed 2014-02-10 10:22:12 +01:00
Kjell Kernen c48e1781fd The profile tab is now functional 2014-02-10 07:54:42 +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
Jacek Drewniak ac57faa85e Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-09 15:28:38 +01:00
Bertrand Songis c64ef77f08 Update DONATIONS.txt 2014-02-09 15:22:33 +01:00
Kjell Kernen 07a6fd8ee7 Alternative testable tab based setting version. 2014-02-09 14:30:50 +01:00
Jacek Drewniak 0188d076e3 Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-09 11:43:17 +01:00
Andre Bernet 0f340e1aaf Merge pull request #669 from opentx/bsongis/Issue594_settimer_function 
Bsongis/issue594 settimer function
 2014-02-09 11:35:51 +01:00
Jacek Drewniak 2e270950fe Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-09 11:17:44 +01:00
Bertrand Songis 24ae9854c0 Merge pull request #671 from opentx/dvogonen/remove_profile_import_export 
Import and Export of profiles removed.
 2014-02-09 08:51:40 +01:00
Bertrand Songis 4b280fb3fa Merge pull request #672 from opentx/dvogonen/add_menu_help_link 
Fixes #495
 2014-02-09 08:50:34 +01:00
Bertrand Songis d932bfc79a Update DONATIONS.txt 2014-02-09 08:49:54 +01:00
Kjell Kernen 7ef7436118 Fixes #495 
Added link to OpenTX documentation page in the help menu
 2014-02-09 01:12:01 +01:00
Kjell Kernen b99cb4c431 Import and Export of profiles removed. 2014-02-09 00:35:46 +01:00
Jacek Drewniak 0b13c57b96 Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-08 23:54:30 +01:00
Bertrand Songis 6560c99445 Avoids the crash in Companion 2014-02-08 18:22:06 +01:00
Bertrand Songis e27a8bece4 Avoids the "No matching signal" warnings (on_XXX slots seem parsed by 
moc)
 2014-02-08 18:06:55 +01:00
Bertrand Songis 1ef2e89972 Merge pull request #668 from opentx/dvogonen/simplify_companion_preferences_dialog_632 
Dvogonen/simplify companion preferences dialog 632
 2014-02-08 17:17:14 +01:00
Bertrand Songis d146966a18 Issue #594 (SetTimer) - Companion part done 2014-02-08 17:12:26 +01:00
Kjell Kernen 417ab94993 Merge branch 'origin/next' 2014-02-08 17:03:48 +01:00
Bertrand Songis 9052f8824e Issue #594 - Two timers can be set ... 2014-02-08 16:58:12 +01:00
Bertrand Songis 2aca8a1338 Merge pull request #666 from opentx/kilrah/665_Failsafes 
Fix Issue #665
 2014-02-08 16:43:30 +01:00
Kjell Kernen 5c70c2f415 Moved fields around in the fwPref dialog to make it clear what affects the current settings (profile) and what configures the download. 2014-02-08 16:41:06 +01:00
Bertrand Songis a9ed6485fd Issue #594 (Set Timer Function) - Still missing UI in Companion 2014-02-08 13:44:42 +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
Bertrand Songis 63d48e810d Update DONATIONS.txt 2014-02-08 09:30:50 +01:00
Bertrand Songis 08a37b77e7 Renaming started ... who wants to continue? 2014-02-08 08:38:06 +01:00
Bertrand Songis afc3b61232 Merge pull request #661 from opentx/dvogonen/simplify_companion_preferences_dialog_632 
Dvogonen/simplify companion preferences dialog 632
 2014-02-08 07:48:37 +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
Bertrand Songis 4c5ac47507 Problem with AdjustGVAR modes on ARM boards (mode has > 2bits, allowing 
more modes if needed later)
 2014-02-07 22:58:12 +01:00
Bertrand Songis f686934430 Delay not applicable on Stay logical switches 2014-02-07 22:17:32 +01:00
Bertrand Songis 2e35e095c6 AUTOSWITCH enabled with Stay function 2014-02-07 22:10:06 +01:00
Bertrand Songis 8f0a318cc3 Issue #662 fixed - Companion copy/paste bug 2014-02-07 21:52:30 +01:00