Commit Graph
9465 Commits
Author SHA1 Message Date
Damjan Adamic f40e64c2aa Added Q_OBJECT to TreeModel and some cosmetics 2017-01-27 20:07:00 +01:00
Damjan Adamic cc12601a01 Fixed radio data import [Horus] (broken in 0f90ff0b65) 2017-01-27 19:26:21 +01:00
3djcandDamjan Adamic 2f316b858a Fix #4302 (#4305)
Fixed: L1 switch was always edited in LS sub-menu [X7]
2017-01-27 09:39:09 +01:00
Damjan Adamic 16960cb9a0 Fixed segfault when saving setup with no models defined [Horus] 2017-01-27 09:32:43 +01:00
Damjan Adamic 7d849e1c4c Hide Show Splash Screen on Startup option in general settings [Horus] 2017-01-27 09:21:24 +01:00
Damjan AdamicandBertrand Songis 0f90ff0b65 Fixes #4299 and #4298 and other Horus import/export bugs. Checked all existing IS_TARANIS() macros and tuned them to IS_HORUS_OR_TARANIS() where needed. (#4301) 2017-01-26 22:15:17 +01:00
Damjan AdamicandBertrand Songis 8b1078d081 Fixes #4290: Input Offset fix [Horus] (#4293) 2017-01-26 18:26:40 +01:00
Damjan AdamicandBertrand Songis 8102f870fe Fixes for "Read Models and Settings from the radio": (#4291)
* show errors
 * close dialog in nothing in progress widget
2017-01-26 18:24:27 +01:00
3djcandDamjan Adamic 1202fa84fa This just allow spanish to compile, no clues if translations are ok or not (#4297) 2017-01-26 15:33:50 +01:00
Bertrand Songis 764b18d883 [Companion] Fixes #4288 2017-01-26 07:22:58 +01:00
Max Paperno 8c9f574f92 [Simulator] Fix the Lua Reload button and help text which was shown/hidden for wrong radio types (the actual reload still worked using F7 key). 2017-01-26 00:25:56 -05:00
Max Paperno efcfdf171d [Simulator] Fix keymap help text (closes #4289). 2017-01-25 23:43:14 -05:00
Max Paperno d6d694a36f [simu] Fix keyboard switch controls for X7. 2017-01-25 14:01:07 -05:00
Max Paperno 6a52458e15 [simu][Simulator] Fix X7 switch position indexes. 2017-01-25 13:10:05 -05:00
Florent MartelandBertrand Songis 4a76c023e6 Update the luadoc for sportTelemetryPop() (#4287)
Followup on #4232: DIY ID range changed to 0x5000 - 0x52FF
2017-01-25 18:16:30 +01:00
Arne SchwabeandBertrand Songis 51d1e6e94a Add q303 multi protocols and fix subtype selection on 128x64 ui (#4286)
* Multi: add Q303 protocol and variants (CX10D/CX10WD)

* Fix subType selection on 128x64 UIs

* Fix options display on other radios for custom photo as well
2017-01-25 16:23:21 +01:00
Max PapernoandBertrand Songis 6e2474081f [Simulator] Further Simulator improvements. (#4282)
* Refactor CompStoreObj to use templates. Clean up some formatting.

* [Simulator] Add SimulatorOptions type to replace individual simulator options; Fix storage handler for custom types; Cleanup some redundant code.

* [Simulator][Joystick] Rework the joystick options/calibration dialog.  Can now enable/disable/select the Joystick from there. Delay start of calibration until Start is pressed (otherwise looks like last calibration didn't work). And generally refactor a lot of it to be smarter.

* Cosmetics.

* [Simulator] Add state handling for RadioWidget class. Split code to cpp file.

* [Simulator] Add SimulatorStartupDialog as its own UI class.

* [Simulator] Multiple changes and new features:
    All Horus data source options are now fully supported with data properly saved after use (SD path, .otx file, or custom data path);
    Loading .otx files now works for all radio types (but not saving data back to .otx);
    Switch and knob/slider states are now saved to per radio profile;
    Joystick configuration/calibration is now available directly from inside Simulator;
    Due to refactoring, all previously saved per-profile simulator settings are now invalid;
    Further consolidated simulator dialog startup/shutdown, now handles temp. paths internally, etc;
    With WIN_USE_CONSOLE defined, Simulator and Companion when started from Windows command line will now use that console for all messages (instead of opening a new one). This allows full debug output to be seen at all stages of execution and after exit.

* [Simulator] Fix build w/out SDL Joystick support.

* [Simulator] Fix bogus throttle warning on simulator start; Add forgotten RadioWidgetState flags to stream handlers; Add debug state saver in SimulatorOptions.
2017-01-25 16:20:45 +01:00
Bertrand Songis b53ec7392c [Companion] OTX format bug with X9D boards
The files were always converted as X9D doesn't have its own FourCC
2017-01-25 15:32:30 +01:00
Damjan Adamic 362698484f Url traces added (Companion) 2017-01-25 13:20:08 +01:00
3djcandDamjan Adamic cbe0dc60e6 Enable LUA_COMPILER (#4283)
Added Companon firmware option luac
2017-01-25 13:09:53 +01:00
3djc 37b7714aff Prep for nightly 2017-01-25 10:59:42 +01:00
Damjan AdamicandBertrand Songis 398c3b1e33 DIY ID range changed to 0x5100 - 0x52FF (#4232)
[S.PORT] DIY range updated. The spec should follow soon
2017-01-25 08:22:24 +01:00
Bertrand Songis de49d155c6 [Companion] Compilation fix 2017-01-24 22:06:28 +01:00
Bertrand Songis 57aafeb062 [Companion] Refactoring - fixes the X9E=>X7 conversion segfault 2017-01-24 20:08:48 +01:00
Bertrand Songis 8f970fdbbf [9XR-PRO] Warning fixed (ATMEL code) 2017-01-24 18:57:45 +01:00
Bertrand Songis 0d05beae80 CRLF line endings converted to LF 2017-01-24 18:48:28 +01:00
Bertrand Songis 2f7bf7bcbd [9XR-PRO] Warning fixed (ATMEL code) 2017-01-24 18:47:09 +01:00
Bertrand Songis 6aa8337fc2 [9XR-PRO] Navigation issue in InputOne screen 2017-01-24 18:46:31 +01:00
3djcandBertrand Songis f686d15354 Shorten GVx to Gx on 128x64 radios, where screen estate is a real issue (#4280) 2017-01-24 18:29:21 +01:00
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