Commit Graph
3314 Commits
Author SHA1 Message Date
Bertrand Songis d7a67fc7a1 Update myeeprom.h 2014-02-22 20:12:59 +01:00
Bertrand Songis c7eccdec0f Merge pull request #735 from opentx/andreas/WeightAndGVARS_BugFix
Bugfix for GVARS in weight for stock and ranges for ARM based transmitter
2014-02-22 20:12:13 +01:00
Kjell Kernen 059234a6e0 Fixed image load bug in burn dialog.
Needs to be tested on Linux and Mac.
2014-02-22 18:25:10 +01:00
Kjell Kernen bebb067ee3 Merge pull request #736 from opentx/dvogonen/fix_companion_gui_bugs
Fixed a few minor issues. It seems larger since I had to reformat an entire source file. One of my editors had mangled it and inserted tabs everywhere. Hate that.
2014-02-22 15:30:03 +01:00
Kjell Kernen a4a6d3b0ce Merge branch 'origin/next' 2014-02-22 14:59:27 +01:00
openfsguruh da277536b7 For All:
- GV1_XXX constants are now in myeeprom.h to be close to the mixer defines
  (they need to match to the defined types, e.g. needs to have enough bits)

For Stock:
- bugfix gvars not working for weight for stock transmitter

For ARM based Transmitter:
- limits offset now to 490 (instead of 4085)
- limits for weight and offset can be easily changed in myeeprom.h, with defines
  #define GV_RANGE_WEIGHT 500
  #define GV_RANGE_OFFSET 490
  (be sure they are not bigger than something about 4000)

No code cost
2014-02-22 14:47:36 +01:00
Bertrand Songis 7cf94ec204 Should fix Issue #732. Not reproduced, not tested 2014-02-22 13:15:10 +01:00
Bertrand Songis 5337158911 Core in Custom Functions Panel 2014-02-22 12:32:21 +01:00
Jacek Drewniak aab70cde9d Merge pull request #734 from opentx/driver33/PL_trans
comapnion translation fixes
2014-02-22 11:08:40 +01:00
Jacek Drewniak fdb0e00685 comapnion translation fixes 2014-02-22 11:06:47 +01:00
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
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
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 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 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
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