Commit Graph
13786 Commits
Author SHA1 Message Date
3djcandBertrand Songis aa19475c90 3djc/x7 mixer screen rework (#4281)
* Optimise display on 128x64

* Name if present are displayed (like now), but when the row is selected, the name moves on top and the display alternates between FM and other info

* Compile fix
2017-01-24 18:25:38 +01:00
Damjan Adamic 36928b7b60 Cosmetics 2017-01-24 11:26:19 +01:00
Damjan Adamic 6d2ea5c801 Changes to allow compilation with Qt5.2 2017-01-24 10:19:20 +01:00
Max PapernoandBertrand Songis 17a03e6c18 [Simulator] Dyanamic Simulator virtual hardware generation and many other improvements (#4260)
* Move simulator widgets to subfolder (no code changes).

* [Simulator] Major Simulator re-structuring to reduce code redundancies and allow for fully dynamic simulated hardware setup:
    SimulatorDialog is no longer sub-classed by individual radio UIs, instead a new class is added which handles just the "skin," LCD, and navigation controls (also makes setting up new models much quicker);
    All radio switches/knobs/sliders are populated dynamically based on loaded hardware configuration data (eeprom/bin), including control types and names (in case of no hardware config data, reasonable "factory defaults" are loaded);
    Starting Horus sim with alternate path for RADIO and MODEL data folders is now supported (.otx file is WIP);
    6-way switch now works properly and various other inconsistencies addressed (eg. some Horus analogs were backwards).

* Add missing OpenTX headers to new files.

* [Simulator] Fix loading of Horus hardware settings from Companion simulation.

* Update Travis CI build environment to Qt 5.7.

* [Simulator] Fix 9X missing colored side LCD images, an #include fix, and some cleanup.

* [TravisCI] Set up for parallel Travis builds and use Qt5.7 (#4263)

* Fix starting Simulator with non-existing file/folder structure (now properly creates new ones as needed, including Horus directories with default radio/model);  Temporarily remove option for using .otx file with Horus (until that feature is added).

* Load correct simulator skin for X7 when launching from Companion.

* X7 hardware defaults changed to match production hardware

* Fix minor compiler warning in mdichild.cpp, and some cleanup in eeprominterface.cpp.

* [Simulator] Centralize radio UI flavor determination.

* [Simulator] Updates:
    Add X7 UI flavor;
    Centralize LCD settings;
    Simplify drawing curved UI widgets;
    LCD color can be changed for any 1/4-bit display radio;
    Slight change on default LCD "off" color;
    Refactor LcdWidget to not use globals.

* [Companion] X7 EEPROM import fix

+ cosmetics
+ compilation error fixed on Manjaro

* [Companion] 9XR-PRO EEPROM import fix

+ cosmetics
+ compilation error fixed on Manjaro

* Navigation fix
French translations

* [X7] Main view cosmetics

* Fix switch/ana custom name import

* [Simulator] Add white border above/below X7 bezel, and use white-colored padding on sides; Adjust X7 default LCD color.

* Does this work? (#4269)

Read an Horus SD card produces a temporary .otx file now

* Bsongis/companion warning before automatic conversions (#4271)

* Does this work?

* Warning before automatic conversions

* Force different file name after conversion (#4272)

* Force different file name after conversion

* More detailed instructions

* [Companion] Files automatically named during XXX => Horus conversions
2017-01-24 07:54:12 +01:00
Damjan AdamicandBertrand Songis b3f4870da7 Refactoring of startup code, mainly dealing with detection of unexpec… (#4275)
* Refactoring of startup code, mainly dealing with detection of unexpected restart/shutdown

* Added g_FATFS_Obj initialization [Horus]

* Fix normal startup

* Use g_eeGeneral.unexpectedShutdown only on radios that have PWRMANAGE defined
Fixes for radios that don't have power control.
Other fixes

* CLI test for new()

* [Horus] Reboot protection reworked to also handle non-WDT events

(cherry picked from commit fe9a52779d062e3f24639479273c906abe6e440b)

Conflicts:
	radio/src/targets/horus/board.h

* Reverting most of the changes

* Cleanup

* Added comment that explains apparent non usage of the wdt_disable() function

* More cleanup

* Missing include

* Compilation fix
2017-01-24 07:52:33 +01:00
Andre BernetandBertrand Songis bf15410bf1 3djc/x7 outputs (#4273)
[128x64] Rework Outputs screen
[X7] Fix for min/max limits bug
[X7/X9] UI fixes
2017-01-24 07:36:40 +01:00
Andre Bernet 824317c477 Fix linking problem due to SDL main definition 2017-01-23 22:11:07 +01:00
Bertrand Songis 821efb3499 .gitignore updated 2017-01-23 21:05:25 +01:00
3djcandBertrand Songis 6027c519e4 Force symlimits and ppmca for ARM (#4267)
Make PPM_LIMITS_SYMETRICAL(symlimits), PPM_CENTER_ADJUSTABLE(ppmca)  and CURVES mandatory on ARM platforms.
2017-01-23 20:08:39 +01:00
Bertrand Songis 227e412b68 [Companion] Cosmetics 2017-01-23 19:48:07 +01:00
3djcandBertrand Songis a5577da36d Fix firmware version recognition for Horus (#4276) 2017-01-23 19:42:31 +01:00
Bertrand Songis d60de4466a [Horus] Malloc check added 2017-01-22 22:01:39 +01:00
Bertrand Songis cdb3f48da7 [Horus] Malloc check added 2017-01-22 21:44:44 +01:00
Bertrand Songis 2f0492cec5 [Horus] Malloc check added 2017-01-22 21:41:06 +01:00
Bertrand Songis fb6c9cde6b [Horus] Malloc check added 2017-01-22 21:32:19 +01:00
Bertrand Songis 05129b6785 [Companion] Horus default view setup 2017-01-22 19:07:46 +01:00
Bertrand Songis ff7c698371 [Companion] Files automatically named during XXX => Horus conversions 2017-01-22 18:17:14 +01:00
Andre BernetandBertrand Songis 7c33043ac0 Force different file name after conversion (#4272)
* Force different file name after conversion

* More detailed instructions
2017-01-22 17:44:55 +01:00
Andre Bernet be0ef50195 Fix Horus haptic import without code complexification. Will reset people's haptic mode setting on Horus, but we can afford it. 2017-01-22 17:24:58 +01:00
Andre Bernet 7990973b35 Revert "Fix Horus haptic mode (#4224)"
This reverts commit 9bbc595eb1.
2017-01-22 17:20:28 +01:00
Andre Bernet 9666a7f649 Horus model image support 2017-01-22 16:25:40 +01:00
Bertrand SongisandGitHub 285b8786b9 Bsongis/companion warning before automatic conversions (#4271)
* Does this work?

* Warning before automatic conversions
2017-01-22 15:31:22 +01:00
Andre Bernet 7a60714071 [companion] Missing General settings items added 2017-01-22 14:52:12 +01:00
Bertrand SongisandGitHub c21be4845e Does this work? (#4269)
Read an Horus SD card produces a temporary .otx file now
2017-01-22 14:08:13 +01:00
Andre Bernet 9bbc595eb1 Fix Horus haptic mode (#4224) 2017-01-22 13:19:20 +01:00
Andre Bernet d9d7920c1c Fix switch/ana custom name import 2017-01-22 12:08:55 +01:00
Andre Bernet eea7d503fa [X7] Main view cosmetics 2017-01-22 11:26:28 +01:00
Andre Bernet 293f1e8805 Navigation fix
French translations
2017-01-22 11:16:14 +01:00
Bertrand Songis 7140eec2df [Companion] 9XR-PRO EEPROM import fix
+ cosmetics
+ compilation error fixed on Manjaro
2017-01-22 09:09:15 +01:00
3djcandBertrand Songis 2ffbb4e46c Changes to allow Linux companion to be compiled with qt5.7 (#4262) (#4265)
* Changes to allow Linux companion to be compiled with qt5.7

* Optimize
 (reverted from commit cc205dcc91)
2017-01-22 00:03:06 +01:00
Bertrand Songis 54d1cb8f9a [Companion] X7 EEPROM import fix
+ cosmetics
+ compilation error fixed on Manjaro
2017-01-21 23:56:34 +01:00
Max Paperno 3e9a60b9b7 Fix minor compiler warning in mdichild.cpp, and some cleanup in eeprominterface.cpp. 2017-01-21 16:47:54 -05:00
Andre Bernet 5144550e4e UI cosmetics 2017-01-21 21:53:23 +01:00
Bertrand Songis 89680ddf70 Warning fixed on Manjaro 2017-01-21 21:22:53 +01:00
Andre Bernet e94d123404 Horus has 9 scripts 2017-01-21 20:12:48 +01:00
Andre Bernet 8cc8b53d63 Add "Adjust RTC" option for ARM128 2017-01-21 17:30:24 +01:00
Max PapernoandBertrand Songis 70e4dbd45b [TravisCI] Set up for parallel Travis builds and use Qt5.7 (#4263)
* [TravisCI] Set up for parallel Travis builds and use Qt5.7 (with option of selecting version).  commit-tests.sh script can now optionally build one, all, or sets of targets.

* [TravisCI] Move "COMPANION" build to first slot and rename to "DEFAULT".

* [TravisCI] Fix "ALL" build flavor, remove TARANIS flavor, rename HORUS to X12, streamline some code, add comments, fix indents.
2017-01-21 17:18:42 +01:00
Andre Bernet 0ee59dc438 X7 hardware defaults changed to match production hardware 2017-01-21 12:21:57 +01:00
Damjan AdamicandBertrand Songis 3085ba7d91 Fixes for simulator paths on Windows (#4259) 2017-01-20 21:45:47 +01:00
3djcandBertrand Songis cc205dcc91 Changes to allow Linux companion to be compiled with qt5.7 (#4262)
* Changes to allow Linux companion to be compiled with qt5.7

* Optimize
2017-01-20 20:13:33 +01:00
Bertrand Songis 0ff8ed35b9 [Companion] clang warning fixed 2017-01-20 20:10:07 +01:00
Damjan Adamic 7e0c461740 Copyright OpenTX Team 2011-2017 2017-01-20 20:00:21 +01:00
Damjan Adamic 0a351112dd Re #4224: Enable .otx file drag&drop on main window 2017-01-20 19:35:46 +01:00
Damjan Adamic f3521728ef Cosmetics 2017-01-20 19:22:18 +01:00
3djcandBertrand Songis 12a8770ad5 Companion : add Horus antenna handling (#4258)
Horus antenna handling
2017-01-20 07:40:13 +01:00
Bertrand Songis 212838f12a [Companion] clang / linux compilation fix 2017-01-20 07:38:46 +01:00
Bertrand Songis 28ccf7d8ee [Companion] Crash fix 2017-01-20 07:22:26 +01:00
Bertrand Songis 324544835a [Companion] Compilation fix 2017-01-19 21:31:18 +01:00
3djcandAndre Bernet 905301fc06 Change "External" to "Ext+Int" to reflect actual Horus antenna handling (#4255) 2017-01-19 21:28:47 +01:00
Damjan AdamicandBertrand Songis e59a51e25f Re #4224: Enable reading and writing Models and Settings from/to Horu… (#4254)
* Re #4224: Enable reading and writing Models and Settings from/to Horus radio (SD card)

* Fix for findMassstoragePath() on Windows (which got there in previous commit)
2017-01-19 21:26:18 +01:00