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
13879 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacek Drewniak 2f1056b05a Merge branch 'next' of https://github.com/opentx/opentx into next 2014-02-22 10:47:17 +01:00
Bertrand Songis 3333d68fd8 Inputs alignement fixed in Companion 2014-02-22 10:37:08 +01:00
Bertrand Songis 7ebd371ab6 Issue #731 fixed (companion Inputs import bug) 2014-02-22 10:37:07 +01:00
Jacek DrewniakandAndre Bernet 0f373353c7 Companion PL translation fixes 2014-02-22 10:20:01 +01:00
Andre Bernet 903cb8bd83 Throttle warning fixed 
Top bar time colon now blinks "correctly", some people seemed to be confused by it...
 2014-02-22 08:47:22 +01:00
Kjell Kernen ccfa25d58e Souce buttons checked in edit splash dialog. 
Corrected faulty theme icon.
 2014-02-22 00:41:27 +01:00
Andre Bernet 47259fb40a Fix throttle warning 
No need to write a space for blinking colon as all positions are hardcoded
 2014-02-21 23:35:55 +01:00
Andre Bernet 92a5429ce0 Longer inhibition time for automatic switch prompts at power up 2014-02-21 23:22:06 +01:00
Bertrand Songis 1a61ff64bd Issue #731 - Flight modes switches conversion 2014-02-21 22:59:53 +01:00
Andre Bernet 3f14d6a066 Top bar time colon now blinks "correctly", some people seemed to be confused by it... 2014-02-21 22:55:04 +01:00
Bertrand Songis 0602a550d7 Issue #731 - Calibration conversion 2014-02-21 22:22:05 +01:00
Kjell Kernen e9ce69c6a4 Fixed setting conversion and initialization problems 2014-02-21 20:49:00 +01:00
Bertrand Songis 9c38236a30 Another bug in system prompts referencing 2014-02-21 17:50:34 +01:00
Kjell Kernen ea57e3e40a Corrected a number of smaller issuses in the GUI. 
A new profile now keeps the values from the current profile.
Removed the special handling of the Name field in profiles.
 2014-02-21 17:29:02 +01:00
Bertrand Songis 9b5b22658a Cosmetics 2014-02-21 17:09:03 +01:00
Bertrand Songis a7bba2a578 Logical switches automatic prompts bugfix 2014-02-21 16:55:43 +01:00
Bertrand Songis d02912577b Merge problem :( 2014-02-21 16:51:51 +01:00
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 23b3ea1856 Background Music should now stop correctly when switch is OFF 2014-02-21 11:58:19 +01:00
Bertrand Songis 6955a492d7 A new set of amplitudes for the sine wave ... 2014-02-21 11:52:02 +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 04f5afbb9b Merge remote-tracking branch 'origin/next' into bsongis/vario_improvements 2014-02-21 07:19:02 +01:00
Bertrand Songis 9fa5ffc69c Update .gitignore 2014-02-21 07:17:35 +01:00
Bertrand Songis 2aa8c68cf6 Merge remote-tracking branch 'origin/next' into bsongis/vario_improvements 2014-02-21 07:17:00 +01:00
Bertrand Songis 903dc152a5 Merge remote-tracking branch 'origin/next' into 
bsongis/vario_improvements

Conflicts:
	radio/src/maths.cpp
 2014-02-21 07:13:33 +01:00
Bertrand Songis 99e42ceeb2 Different harmonics. Seem to be better. I would say that: 
- all beeps from the radio need to be lowered.
- perhaps the low frequencies don't need to be amplified any more?
 2014-02-20 23:26:34 +01:00
Bertrand Songis 67afb99c77 Update DONATIONS.txt 2014-02-20 23:23:15 +01:00
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