piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
3,332 Commits 2 Branches 0 Tags
0f3e6581bd86ac4e5edfa0900a14c4878b3ecc4c
Commit Graph
3332 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
mhotar 7eee552f2c icons32 -manual handling 2014-02-19 17:14:50 +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
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
Kjell Kernen 82910acffe Merge branch 'origin/next' 2014-02-19 00:41:45 +01:00
mhotar bd8c1b6f32 source vectors 2014-02-18 23:51:33 +01:00
mhotar da0c47f536 theme icons -all but not optimised 2014-02-18 23:49:46 +01:00
Kjell Kernen da68c593cf Changed every single QSetting in Companion. 
Next step: Function renaming
 2014-02-18 23:48:57 +01:00
mhotar 141b999b92 theme rename -missing part 2014-02-18 23:48:24 +01:00
Bertrand Songis 197c008937 Update DONATIONS.txt 2014-02-18 20:46:04 +01:00
Bertrand Songis d389d31694 Issue #718 fixed (Cells voltage accuracy) 2014-02-18 14:54:23 +01:00
Bertrand Songis 45330e6468 Update DONATIONS.txt 2014-02-18 11:49:24 +01:00
mhotar 9f658cd760 new theme folder renamed 2014-02-18 11:37:58 +01:00
mhotar 259f8efdf9 new theme renamed 2014-02-18 11:29:34 +01:00
Bertrand Songis 298fb332f9 Update DONATIONS.txt 2014-02-18 07:51:30 +01:00
Kjell Kernen f617ae1362 Modeledit added 2014-02-18 00:25:04 +01:00
Kjell Kernen 2616961b95 Merge branch 'origin/next' 2014-02-17 23:49:08 +01:00
Kjell Kernen c23a096a73 Almost all global settings wrapped in protective object to guarantee type safety and protect against tag spelling errors (I have found and corrected a lot of those!). 
Joystick settings and burner configuration is not yet within the global object.
 2014-02-17 23:47:40 +01:00
openfsguruh b82ffe308d Merge branch 'next' 2014-02-17 21:08:39 +01:00
openfsguruh 76bda4f89a Revert "Revert "Merge branch 'next'"" 
This reverts commit a9f4d2185c.
 2014-02-17 21:06:46 +01:00
openfsguruh a9f4d2185c Revert "Merge branch 'next'" 
This reverts commit a2ecdaa484, reversing
changes made to c909590091.
 2014-02-17 20:59:11 +01:00
openfsguruh a2ecdaa484 Merge branch 'next' 
Conflicts:
	companion/src/customizesplashdialog.cpp
	companion/src/mainwindow.cpp
	companion/src/translations/companion_pl.ts
 2014-02-17 20:56:50 +01:00
Bertrand Songis ade4c07083 Update DONATIONS.txt 2014-02-17 20:22:34 +01:00
Kjell Kernen 2633b61433 Profiles working. 
Next all duplicated variables will be removed from global and only exists in profile.
 2014-02-17 15:28:50 +01:00
Bertrand Songis 8ec13c59e9 Update DONATIONS.txt 2014-02-17 07:05:41 +01:00
Kjell Kernen fdc9873ab8 Profile date is now type safe. Semi working, not complete yet. 2014-02-17 01:16:24 +01:00