piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
13,786 Commits 2 Branches 0 Tags
96892db80bbcaa801f70a84844d3fc403274c78f
Commit Graph
13786 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertrand Songis 901c5339ff 1000bytes RAM saved 2014-02-20 22:47:14 +01:00
Kjell Kernen 5842bc8473 First merge problem fixed (there are more) 2014-02-20 22:33:41 +01:00
Kjell Kernen 58d8a99511 Merge branch 'origin/next' 
Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/mainwindow.cpp
	companion/src/simulatordialog.cpp
	companion/src/xsimulatordialog.cpp
 2014-02-20 21:37:51 +01:00
Kjell Kernen de3e0e802f Merge pull request #703 from opentx/bsongis/standalone_simu 
Bsongis/standalone simu
 2014-02-20 21:18:14 +01:00
Bertrand Songis a05a88cc89 Link error when no SDL on VC++ 2014-02-20 21:07:31 +01:00
Kjell Kernen 681a4f436c Forgot the updated CMakeLists.txt file 2014-02-20 20:36:02 +01:00
Kjell Kernen 4805e3eb4b Fixed name space collisions introduced by included QT header. Now compiles on Windows. Finally! 
Broke up definitions and declarations in separate files.
Declared base storage class as protected member.
 2014-02-20 20:08:49 +01:00
Bertrand Songis f2f9579b77 Automatic sounds for multipos switches 2014-02-20 19:51:32 +01:00
Bertrand Songis e5f336fba1 Indentation 2014-02-20 19:33:09 +01:00
Bertrand Songis 65e6814b28 Switches positions not played at startup 2014-02-20 19:25:08 +01:00
Bertrand Songis 91bec1e4d9 Now it works. No hashed sounds at startup. 2014-02-20 19:07:39 +01:00
Bertrand Songis a91bfbba9e Bug in SD audio parse 2014-02-20 18:15:24 +01:00
Bertrand Songis 7f12f50036 Again the TADA on all alerts 2014-02-20 18:00:14 +01:00
Bertrand Songis fe99e0d917 Merge branch 'bsongis/Issue713_more_custom_functions' of https://github.com/opentx/opentx into bsongis/Issue713_more_custom_functions 2014-02-20 17:13:49 +01:00
Bertrand Songis 204b4b2369 Merge branch 'bsongis/Issue713_more_custom_functions' of 
https://github.com/opentx/opentx/ into
bsongis/Issue713_more_custom_functions
 2014-02-20 17:17:23 +01:00
Bertrand Songis f8d7007ef8 Merge branch 'bsongis/Issue713_more_custom_functions' of https://github.com/opentx/opentx/ into bsongis/Issue713_more_custom_functions 2014-02-20 17:15:12 +01:00
Bertrand Songis 444fc85710 All alerts are TADA :) 2014-02-20 17:12:53 +01:00
Bertrand Songis 1f318844f0 Compilation error (thanks Jenkins) 2014-02-20 17:01:34 +01:00
Bertrand Songis d5348de16e All alerts are TADA :) 2014-02-20 16:57:36 +01:00
Bertrand Songis be20388278 Now the Ele stick can be used for tests when vario source is dTE 2014-02-20 16:51:25 +01:00
Bertrand Songis 7e0a30c08f Reduces the duration of SD search for automatic model files 2014-02-20 16:21:04 +01:00
Kjell Kernen e87bec64e3 Merge pull request #727 from opentx/dvogonen/use_correct_icons 
Now it is possible to see Martins beautiful new icons in a number of the dialogs.
 2014-02-20 15:35:59 +01:00
Kjell Kernen 2ac79a7791 Most icons set correctly. Icons only seen in Windows (perhaps Mac). 
I have not figured out how to set icons of daughter-windows, only dialogs.
 2014-02-20 15:34:13 +01:00
Bertrand Songis 067c4ee0db Another TODO removed 2014-02-20 13:18:18 +01:00
Bertrand Songis a14848fc7f One TODO less ... 2014-02-20 13:01:22 +01:00
Andre Bernet 9fa0919a36 Merge pull request #721 from opentx/bsongis/Issue718_cells_voltage_precision 
Issue #718 fixed (Cells voltage accuracy)
 2014-02-20 12:48:01 +01:00
Andre Bernet 5659dcb78f Fix cell logs 2014-02-20 12:46:29 +01:00
Andre Bernet 44ea1ae8eb Cells decoding wasn't updated for SPORT 2014-02-20 12:35:34 +01:00
Bertrand Songis e0a03f6728 Simu renamed to simulator, in the same directory as companion 2014-02-20 12:11:10 +01:00
Bertrand Songis 0db90e34c3 Windows inserted \r\n in the EEPROM! 2014-02-20 12:10:26 +01:00
Bertrand Songis 4a9e8d6a4b VC++ Warning removed 2014-02-20 12:08:09 +01:00
Kjell Kernen 4385be717f Defined missed global variable (lastUpdatesDir). 
Renamed lastDir to eepromDir, which is a better name.
 2014-02-20 09:23:47 +01:00
Kjell Kernen 0cfbc7669d Merge branch 'origin/next' 2014-02-20 08:38:38 +01:00
Bertrand Songis fd855d8a8c VC++ Warning removed 2014-02-20 07:56:13 +01:00
Bertrand Songis 342d2cdb83 VC++ Warnings removed 2014-02-20 07:51:51 +01:00
Bertrand Songis a93ea1faa1 Compilation problem on VC++ 2014-02-20 07:22:36 +01:00
Bertrand Songis 82348f7e05 Import/Export broken in Companion (7scripts instead of 3) 2014-02-19 21:39:39 +01:00
Bertrand Songis 4d1df6a166 4 stages mixer. Now vario can be used with a background music! 2014-02-19 20:31:50 +01:00
Kjell Kernen 73621e1f75 Merge pull request #726 from opentx/mhotar/companion_new_theme 
Mhotar/companion new theme
 2014-02-19 18:58:25 +01:00
Bertrand Songis 481e312ae3 Vario part in Global Settings page reworked 2014-02-19 17:47:21 +01:00
mhotar 7eee552f2c icons32 -manual handling 2014-02-19 17:14:50 +01:00
Bertrand Songis b3e2e8e321 Compilation failure. Thanks Jenkins! 2014-02-19 16:57:02 +01:00
Bertrand Songis 7c4214d5b9 More custom scripts (7 instead of 3) 2014-02-19 16:41:18 +01:00
Bertrand Songis 5a7fda2f81 Merge branch 'next' into bsongis/Issue713_more_custom_functions 2014-02-19 15:24:51 +01:00
Bertrand Songis 3340a18461 Fix for simu running on VirtualBox mounted directories 2014-02-19 15:23:13 +01:00
Bertrand Songis 59af2e2719 Valgrind detected a value tested, not initialized 2014-02-19 15:22:36 +01:00
Bertrand Songis 271fe6804d Merge remote-tracking branch 'origin/next' into bsongis/Issue713_more_custom_functions 2014-02-19 15:16:30 +01:00
Kjell Kernen 80ef2b8d38 All function names changed to a consistent standard. 
Cleaned up indentation of appdata.h
 2014-02-19 14:01:34 +01:00
Bertrand Songis ad134173be Issue #713 - Now automatic Switch files are played 2014-02-19 11:30:54 +01:00
Bertrand Songis e38a4d320f Issue #713 - Automatic Switch Audio Files (part 1) 2014-02-19 10:41:03 +01:00