piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
13,879 Commits 2 Branches 0 Tags
21bf5ba94debe5c4dea5716e6c6a1afaeeeabe27
Commit Graph
3027 Commits
Author SHA1 Message Date
Jacek Drewniak 60b4fb1126 Fixes 2014-02-11 21:04:39 +01:00
Andre Bernet a76484a7eb Merge branch 'next' into bsongis/Lua_interpreter_171 2014-02-11 18:21:18 +01:00
Kjell Kernen 48af7aefd0 Made the Splash editor respect the 9x/Taranis LCD widths in a consistent way. Previously everything was displayed as a Taranis bitmap. 
Pictures larger than 9x width will get scaled to Taranis width (212 pix).
 2014-02-11 18:08:54 +01:00
openfsguruh a4f4999546 bugfix: Throttle warning shown wrong in companion 
Actually Throttle warning was not ticked by default in companion, and if
ticked, it was disabled, and when not ticked it was enabled.
Now it fits to the real firmware settings.
 2014-02-11 17:40:05 +01:00
Kjell Kernen 18a2af7291 A few bug fixes and an updated Swedish translation. 2014-02-11 14:03:03 +01:00
Kjell Kernen eedc5ea68f Profiles can now be added and removed in a proper way. 2014-02-11 08:37:07 +01:00
Kjell Kernen 70ddd2911a Merge pull request #676 from opentx/driver33/PL_Translation 
Fixes (reverted from commit 1a6832c83a)
 2014-02-10 20:41:29 +01:00
Bertrand Songis 1a6832c83a Merge pull request #676 from opentx/driver33/PL_Translation 
Fixes
 2014-02-10 18:01:47 +01:00
Kjell Kernen b74d7f0f32 Added code for creating new profiles. 2014-02-10 18:01:43 +01:00
Bertrand Songis 7eddd64e3a Merge remote-tracking branch 'origin/next' into 
bsongis/Lua_interpreter_171

Conflicts:
	companion/src/firmwares/opentx/opentxeeprom.cpp
 2014-02-10 17:57:40 +01:00
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
Andre Bernet f635a1e762 Solve merge conflict 2014-02-10 15:25:18 +01:00
Bertrand Songis ce6e9fa4a9 Lua EEPROM support in Companion added 2014-02-10 14:47:33 +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
Bertrand Songis d374453c8f Lua now uses our fake FatFS when running in simu 2014-02-10 12:15:24 +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 330234df01 Lua interpreter now running inside companion! 2014-02-10 10:31:14 +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 af755fa549 R E T A no-translate fix 2014-02-09 17:21:53 +01:00
Jacek Drewniak ee2e46f3cb Fixes 2014-02-09 15:27:30 +01:00
Kjell Kernen 07a6fd8ee7 Alternative testable tab based setting version. 2014-02-09 14:30:50 +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
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
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
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
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 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 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 8f0a318cc3 Issue #662 fixed - Companion copy/paste bug 2014-02-07 21:52:30 +01:00
Bertrand Songis 55f600a63c Stay function added in Companion 2014-02-07 18:24:25 +01:00
Bertrand Songis 9894fda194 Issue #592 - Stay logical switches function added. Range also prepared 
to avoid another EEPROM change in a future release.
 2014-02-07 17:50:29 +01:00
Kjell Kernen db1a459a47 Updated translation 2014-02-07 17:19:29 +01:00
Kjell Kernen 23a61cc60e Merge branch 'origin/next' 
Conflicts:
	companion/src/translations/companion_pl.ts
 2014-02-07 17:10:40 +01:00
Kjell Kernen 98779da0cf Editor getting some functionality 2014-02-07 17:06:11 +01:00
Andre Bernet b12f76bc39 Merge pull request #621 from opentx/bsongis/Issue554_trims_relative_default 
All good!
 2014-02-07 11:35:58 +01:00