piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
3,320 Commits 2 Branches 0 Tags
af4e1ce85a33a99e6c0d43d095ea2e17a75aedf0
Commit Graph
3320 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertrand Songis af4e1ce85a Merge branch 'bsongis/Issue713_more_custom_functions' of 
https://github.com/opentx/opentx into
bsongis/Issue713_more_custom_functions

Conflicts:
	radio/src/audio_arm.cpp
 2014-02-21 16:45:58 +01:00
Bertrand Songis 0345173039 No more parsing of all system sounds. Automatic prompts silent after 
alerts
 2014-02-21 16:40:52 +01:00
Bertrand Songis 5f560e8d1b No more parsing of all system sounds. Automatic prompts silent after 
alerts
 2014-02-21 15:57:00 +01:00
Bertrand Songis a2ebf07cad Compilation was broken 2014-02-21 15:54:53 +01:00
Bertrand Songis 095bb38c03 Now logical switches automatic prompts 2014-02-21 15:18:05 +01:00
Bertrand Songis 5dbf2063f8 6-pos and 3-pos switches shouldn't be played at startup now 2014-02-21 14:47:38 +01:00
Bertrand Songis 9ade773618 Merge remote-tracking branch 'origin/next' into 
bsongis/Issue713_more_custom_functions

Conflicts:
	radio/src/.gitignore
	radio/src/opentx.cpp
 2014-02-21 14:26:11 +01:00
Bertrand Songis 9639d60acf Merge pull request #687 from opentx/andreas/Issue020_ThrWarnPotsAndTransmitterFix_Merged 
merged changes from Issue020_ThrottleWarning
 2014-02-21 14:15:37 +01:00
Bertrand Songis bb774648ff P25 and P26 automatic prompts were not played 2014-02-21 12:16:05 +01:00
Bertrand Songis 40579a0d75 Makefile cosmetics 2014-02-21 11:15:19 +01:00
Bertrand Songis 6312222eec Flash saving, I hope I am not wrong I removed the STARTUP_WARNING_INIT 
state
 2014-02-21 11:08:17 +01:00
Bertrand Songis f857d5454e Cosmetics 2014-02-21 10:15:12 +01:00
Kjell Kernen 0e09e1e270 Merge pull request #728 from opentx/dvogonen/making_settings_type_safe 
Merging this one myself since both Bertrand and I have been throug it over and over. Better merge it fast before something else changes and forces new changes.
 2014-02-21 10:14:09 +01:00
Bertrand Songis 1ca2e091a7 Update menus.cpp 2014-02-21 08:18:29 +01:00
Bertrand Songis cb88a28557 Merge remote-tracking branch 'origin/next' into next 2014-02-21 07:48:44 +01:00
Bertrand Songis 576682f6a8 Merge remote-tracking branch 'origin/next' into dvogonen/making_settings_type_safe 2014-02-21 07:38:30 +01:00
Bertrand Songis 08245aade9 Simulator updated with last Kjell improvements 2014-02-21 07:40:50 +01:00
Bertrand Songis b30cf3ee0e Update .gitignore 2014-02-21 07:19:57 +01:00
Bertrand Songis 9fa5ffc69c Update .gitignore 2014-02-21 07:17:35 +01:00
Bertrand Songis 67afb99c77 Update DONATIONS.txt 2014-02-20 23:23:15 +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 d5348de16e All alerts are TADA :) 2014-02-20 16:57:36 +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