piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
11,775 Commits 2 Branches 0 Tags
157e94de851fa5781adcba08072a742203ae7535
Commit Graph
11775 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
Kjell Kernen c19c592035 THe rest of the monochrome icons originals. 2014-01-17 00:23:44 +01:00
Bertrand Songis ddd8d137fc Replace SVN strings by a VERS string (2.0) 2014-01-16 22:31:03 +01:00
Dvogonen eca1273b59 Final icon commit. I have a couple of original icons on another computer hat I will add tomorrow. Besides that I thing this thing is ready for prime time (except if there is some kind of an uproar against mhotars new nice icons). 2014-01-16 21:47:54 +01:00
Dvogonen e0e16a4256 Icons optimized for sharpness 2014-01-16 21:03:21 +01:00
Bertrand Songis bf54445c94 Merge remote-tracking branch 'origin/kilrah/Taranis_120MHz' into next 2014-01-16 13:05:21 +01:00
Kjell Kernen d2e510792d First round of 32x32 optimized icons 2014-01-16 12:44:27 +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 34776b24c0 Mike's bootloader added 2014-01-16 00:02:18 +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 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
Dvogonen 18a5883f66 Merge branch 'origin/next' 2014-01-15 22:06:10 +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
Bertrand Songis b4c6d123c8 Better implementation for the automatic detection of a 6pos switch 2014-01-15 21:15:28 +01:00
Dvogonen 2f67344b81 Fixes #512 2014-01-15 21:13:57 +01:00
Dvogonen 78b28444e6 Example of optimized icons for actual resolution. 2014-01-15 20:46:53 +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
Kjell Kernen fb705d66df New, flat icons for everything. Optimized for 32x32. Work needed to optimize for 16x16 used in menus. 2014-01-15 17:32:49 +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
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 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
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
Dvogonen f11c961be4 Enlarged and moved icons 2014-01-15 08:28:11 +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
Andre Bernet b6be6222f3 Indents 2014-01-13 16:46:56 +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
Romolo Manfredini 9419f565aa Merge origin/romolo/fix_and_improve_contributors_dialog_506 into romolo/fix_and_improve_contributors_dialog_506 2014-01-12 14:29:30 +01:00
Bertrand Songis a292fabb02 [Taranis] 6Pos switch support is now ok. Calibration is automatic. More 
tests needed
 2014-01-12 12:57:14 +01:00
Romolo Manfredini f2c5e428d9 more space between sections 2014-01-12 10:49:37 +01:00
Dvogonen bcf072708d Corrected name of releae notes 2014-01-12 10:46:16 +01:00
Romolo Manfredini a025d325dd Contributor dialog fixed 2014-01-12 10:14:55 +01:00
Bertrand Songis 278f5013ab Update DONATIONS.txt 2014-01-12 09:25:24 +01:00