piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
2,656 Commits 2 Branches 0 Tags
2ea96f15d2760fa871bd9271f5c017dc02bc04d8
Commit Graph
2656 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim G. Foley 2ea96f15d2 Merge branch 'next' of https://github.com/TimGFoley/opentx into next 2014-01-16 17:13:01 -08:00
Tim G. Foley 01c2413a0c Added RPM calculation based on Spur and Pinion Gear 2014-01-16 17:10:04 -08:00
Tim G. Foley 1edd98f501 Update README.txt 2014-01-16 19:42:48 -05:00
Bertrand Songis ddd8d137fc Replace SVN strings by a VERS string (2.0) 2014-01-16 22:31:03 +01:00
Bertrand Songis bf54445c94 Merge remote-tracking branch 'origin/kilrah/Taranis_120MHz' into next 2014-01-16 13:05:21 +01:00
Bertrand Songis 1574df9e12 Update DONATIONS.txt 2014-01-16 12:32:51 +01:00
Bertrand Songis c27c4f2c78 Update DONATIONS.txt 2014-01-16 07:07:37 +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
Dvogonen 4f087a216f Fixes #511 - Again :-) 2014-01-15 22:24:31 +01:00
Andre Bernet cfec9ed00e Merge pull request #535 from opentx/dvogonen/Rename_companion9x_qrc_to_companion_qrc_512 
Fixes #512
 2014-01-15 12:59:15 -08:00
Dvogonen 9fd20a87fe Fixes #511 2014-01-15 21:54:43 +01:00
Dvogonen 20ddf27fff Merge branch 'origin/next' 2014-01-15 21:30:05 +01:00
Dvogonen 2f67344b81 Fixes #512 2014-01-15 21:13:57 +01:00
Bertrand Songis e7dc6644c7 Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next 
Conflicts:
	companion/src/CMakeLists.txt
	companion/src/main.cpp
	companion/src/modeledit.cpp
	companion/src/xsimulatordialog.cpp
 2014-01-15 16:09:17 +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
Bertrand Songis 691b52572f Fixes in ExpoDialog. Some more code refactoring 2014-01-15 14:05:33 +01:00
Bertrand Songis 888895b60b Corrections on Curves in MixerDialog and ExpoDialog (introduction of 
CurveGroup to share code)
 2014-01-15 11:50:00 +01:00
Bertrand Songis 0f0db5e1d3 Companion core in simu now understood: the stickMode was completely out, 
and the Tx trims were shifted!
 2014-01-14 22:44:10 +01:00
Bertrand Songis d945052c82 Removes the core in companion simu, compiled on VC++. A compiler bug? I 
don't get it...
 2014-01-14 20:06:01 +01:00
Bertrand Songis bea06a1772 Update DONATIONS.txt 2014-01-14 07:13:15 +01:00
Bertrand Songis cedddfe8d2 EEPROM 'next' support. A lot of corrections. 2014-01-13 19:09:05 +01:00
Dvogonen 9cc9e115a4 Icons regenerated to correct font related problem. 2014-01-13 14:02:39 +01:00
Bertrand Songis 0b387a2467 [Companion] Assert on EEPROM import errors removed 2014-01-13 11:54:08 +01:00
Bertrand Songis 7755ae6063 Update DONATIONS.txt 2014-01-13 07:12:18 +01:00
Bertrand Songis bbf5e9608d Update CREDITS.txt 2014-01-12 22:02:52 +01:00
Bertrand Songis 01cb2411c8 Update DONATIONS.txt 2014-01-12 21:08:15 +01:00
Bertrand Songis 1bdca8ae9c Update DONATIONS.txt 2014-01-12 16:47:31 +01:00
Bertrand Songis 278f5013ab Update DONATIONS.txt 2014-01-12 09:25:24 +01:00
Bertrand Songis 8ad6f3d5e6 Update DONATIONS.txt 2014-01-11 19:55:10 +01:00
Bertrand Songis 7426aa7738 Update DONATIONS.txt 2014-01-10 17:04:58 +01:00
Bertrand Songis cb4286d99d make clean now removes all .o files 2014-01-10 15:58:58 +01:00
Bertrand Songis 96e1dcbcd8 Issue #193 fixed (curves names shifted) 2014-01-10 15:57:25 +01:00
Bertrand Songis 7880d144f6 Issue #193 fixed (shift when importing Taranis EEPROM v215) 2014-01-10 11:43:10 +01:00
Bertrand Songis 7f6bdd87cb Update DONATIONS.txt 2014-01-09 20:43:56 +01:00
Bertrand Songis cb6d13bf6a Merge branch 'bsongis/Companion_ModelEdit_split' of github.com:bsongis/opentx into bsongis/Companion_ModelEdit_split 2014-01-09 19:44:00 +01:00
Bertrand Songis e8d54d35f1 Sources shift when exporting EEPROM (Virtual and Lua inputs) 2014-01-09 19:47:18 +01:00
Bertrand Songis 9a2b668956 GvarsOfsNum (er9x) removed 2014-01-09 18:53:35 +01:00
Bertrand Songis 691d568b1a FixOffset (from er9x) removed 2014-01-09 18:03:22 +01:00
Bertrand Songis 84661b20d4 Update DONATIONS.txt 2014-01-09 17:12:54 +01:00
Bertrand Songis b5435ce940 Update DONATIONS.txt 2014-01-09 07:15:06 +01:00
Bertrand Songis df4c7afdbb Update DONATIONS.txt 2014-01-08 17:32:37 +01:00
Andre Bernet 3ade8707a7 Nicer module UI 2014-01-07 21:30:57 +01:00
Bertrand Songis 57f9489d81 EEPROM import bugfixing 2014-01-07 19:33:29 +01:00
Bertrand Songis 27f8be304a The non active curves are not drawn in bold (pen width 2) 2014-01-07 18:03:50 +01:00
Bertrand Songis 3b59d07724 Support of current EEPROM inside Companion. Some more code around 
EEPROMS export removed (needed to be fixed, so I preferred to remove in
the same commit).
 2014-01-07 17:57:42 +01:00
Bertrand Songis 3dfdd1b61d Update DONATIONS.txt 2014-01-07 15:13:26 +01:00
Bertrand Songis 5d3c827488 Merge remote-tracking branch 'origin/next' into bsongis/Companion_ModelEdit_split 2014-01-07 07:12:14 +01:00
Dvogonen d0281da58d The part where the old companion9x settings are automatically transferred to companion settings is done. Tested on Linux. Should work on Windows/OSX. 
Now remains only to rename all the hundreds of seting references from companion9x to companion. This is blocked until Bertrand merges his reworked edit dialogs.
 2014-01-07 02:10:50 +01:00
Dvogonen 893eb3c061 Fixed problem with language selection in dropbox. 2014-01-06 19:11:30 +01:00