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
2958 Commits
Author SHA1 Message Date
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
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
Dvogonen 5960f25878 Changed CS labels in xsimulator to LS labels 2014-02-03 13:50:19 +01:00
Dvogonen 1b071cbf47 Renamed the CS labels in the simulator dialog to LS 2014-02-03 12:07:52 +01:00
Dvogonen 2b878af183 TRanslated latest strings and made minor improvements 2014-02-03 11:53:40 +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
Bertrand Songis f4784e61b1 Companion didn't compile properly! 2014-02-02 21:57:12 +01:00
Bertrand Songis 53c670deee Merge remote-tracking branch 'origin/next' into 
bsongis/Issue554_trims_relative_default

Conflicts:
	radio/src/gui/menu_model.cpp
 2014-02-01 19:56:31 +01:00
Andre BernetandBertrand Songis 0b77d9921d VC doesn't like binary constants 2014-02-01 19:42:57 +01:00
Andre Bernet 856ffd4ed7 Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings 
Conflicts:
	companion/src/firmwares/opentx/opentxeeprom.cpp
	radio/src/gui/menu_model.cpp
	radio/src/opentx.cpp
	radio/src/telemetry/frsky.cpp
	radio/src/translations.cpp
	radio/src/translations.h
	radio/src/translations/cz.h.txt
	radio/src/translations/de.h.txt
	radio/src/translations/en.h
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/it.h.txt
	radio/src/translations/pl.h.txt
	radio/src/translations/pt.h.txt
	radio/src/translations/se.h.txt
 2014-02-01 13:19:27 +01:00
Jacek Drewniak e28e048e12 small fixes to Companion translation due to new things 2014-02-01 11:49:32 +01:00
Jacek Drewniak dbc29b4444 qMerge branch 'next' into driver33/PL_translation 2014-02-01 10:38:56 +01:00
Andre Bernet cdfc8b5b2b Merge pull request #630 from opentx/bsongis/Taranis_6Positions_Pot 
Bsongis/taranis 6 positions pot
 2014-02-01 01:24:21 -08:00
Jacek Drewniak f8b0100655 Fix translation against new telemetry panels changed 2014-02-01 00:40:41 +01:00
Bertrand Songis b9ee9ee0d6 Merge pull request #619 from opentx/dvogonen/add_monowhite_borders 
Added black outlines to 24x24, 32x32 and 48x48 icons to improve visibili...
 2014-01-31 13:26:57 -08:00
Bertrand Songis c57e0fc6d3 Merge pull request #629 from opentx/driver33/PL_translation 
Translation of Companion + changes in core files to make translation fil...
 2014-01-31 13:26:27 -08:00
Bertrand Songis 582b14e919 Merge remote-tracking branch 'origin/next' into 
bsongis/Issue554_trims_relative_default

Conflicts:
	companion/src/eeprominterface.h
	companion/src/firmwares/er9x/er9xinterface.cpp
	companion/src/firmwares/ersky9x/ersky9xinterface.cpp
 2014-01-31 22:15:23 +01:00
Bertrand Songis 2d884d413a [Taranis] Pots type added to the Companion UI 2014-01-31 21:49:38 +01:00
Jacek Drewniak e44c49f189 Translation of Companion + changes in core files to make translation file aviable 2014-01-31 19:47:04 +01:00
Bertrand Songis 8ef1456fe9 EEPROM support in Companion for the 6pos pots on Taranis 2014-01-31 17:19:21 +01:00
Bertrand Songis ce2b033ccb Issue #469 fixed (Telemetry tab in Companion rewritten - 20% code 
removed). More tests needed!
 2014-01-31 09:40:34 +01:00
Bertrand Songis 722a9686e4 Bars / Logical Switches in Companion should be ok on all boards 2014-01-29 08:30:34 +01:00
Bertrand Songis 35659a09a4 Telemetry bars should be again ok in Companion 2014-01-28 23:51:37 +01:00
Bertrand Songis f41f1a3f7b Input scale now added in Companion. I have broken all getStep / getMin / 
getMax / getOffset used for custom switches and telemetry bars.
Everything needs to be tested again ...
 2014-01-28 15:43:52 +01:00
Bertrand Songis 80a6c4727d [Taranis] Issue #554 - Companion part done 2014-01-27 17:25:43 +01:00
Dvogonen 63193951e9 Added black outlines to 24x24, 32x32 and 48x48 icons to improve visibility 
Replaced 16x16 icons whith monoblack icons, to make them visible in menus
 2014-01-27 15:11:03 +01:00
Dvogonen 33d214234c Companion renaming done for now. 2014-01-26 01:19:52 +01:00
Dvogonen ab67433c45 Merge branch 'origin/next' 2014-01-25 12:15:09 +01:00
Dvogonen 4ad86b5ac5 All 16x16 mono icons optimized 2014-01-25 12:07:26 +01:00
Dvogonen 0505836e33 All the 24x24 mono icons are done! Finally! 2014-01-25 10:28:47 +01:00
Dvogonen 2890259808 More 24x24 optimizations. Getting there slowly. 2014-01-25 10:20:32 +01:00
Dvogonen f89fc9a9ae Replaced Custom Switches with Logical Switches and LS in Companion UI. 
Replaced Custom Functions with Switch Assignment in the Companion UI.
 2014-01-24 23:24:53 +01:00
Dvogonen 1a6880400d A bunch of 24x24 icons optimized 2014-01-24 22:05:07 +01:00
Dvogonen 5690186fcc Merge branch 'origin/next' 2014-01-24 20:45:57 +01:00
Kjell Kernen 802e7e64ff Optimezed some 24x24 icons, many to go 2014-01-24 12:21:01 +01:00
Bertrand Songis 3473b685b8 Merge pull request #589 from opentx/kilrah/588_Hardware_settings 
Kilrah/588 hardware settings
 2014-01-24 02:14:39 -08:00
Dvogonen 8b33ba4576 Merge branch 'origin/next' 2014-01-24 09:13:45 +01:00
Andre Bernet b32dcda598 EEPROM support for Hardware/UART mode, separated for easy cherry-picking (#588) 2014-01-24 00:35:24 +01:00
Dvogonen 7a60bd8203 First version done 2014-01-23 23:48:36 +01:00
Andre Bernet fcd1e69eb9 Merge pull request #586 from opentx/bsongis/remove_lbm_files 
Bsongis/remove lbm files
 2014-01-23 13:17:32 -08:00
Dvogonen d0d9556498 corrected icon names. 2014-01-23 21:09:38 +01:00
Dvogonen 87bf0a163c Cleaning up the icon archive for the monochrome originals 2014-01-23 21:04:17 +01:00
Bertrand Songis 5741739360 Issue #585 fixed (Companion stack overflow on Windows, already fixed on 
SVN)
 2014-01-23 20:59:54 +01:00
Dvogonen 834c415028 Corected name of 22x22 icon 2014-01-23 20:54:51 +01:00
Dvogonen 0dcf67cd8e Added icons in in the outstanding Linux sizes. 2014-01-23 20:31:12 +01:00
Andre Bernet a9e8450578 Merge pull request #578 from opentx/bsongis/Issue552_checkbox_for_reset_custom_function 
Issue #552 fixed
 2014-01-23 11:25:01 -08:00
Bertrand Songis 08da268aff All .lbm files removed 2014-01-23 20:14:08 +01:00
Dvogonen 8438a5b044 Merge branch 'origin/next' 2014-01-23 19:57:15 +01:00
Andre Bernet 4764cc889c Merge pull request #577 from opentx/bsongis/Issue488_change_default_trim_mode_to_fine 
Bsongis/issue488 change default trim mode to fine
 2014-01-23 10:52:26 -08:00
Kjell Kernen 2b3b0f5feb Resized Stop and Play icons to fit theme sizes 2014-01-23 17:40:07 +01:00