Commit Graph
2948 Commits
Author SHA1 Message Date
KongseandBertrand Songis ebee591990 Layout tweak (#4388)
Chineses fonts width of ubuntu is differents from windows, layout re-modified for windows, considering most people use windows version
2017-02-04 10:10:11 +01:00
Martin HotarandGitHub de572b53e4 X9E simu images for @mpaperno 2017-02-04 00:19:49 +01:00
Kelly ByrdandDamjan Adamic 86d0ac6745 Fixes #4368: Don't duplicate categories in OTX's models.txt (#4370) 2017-02-03 20:55:18 +01:00
3djcandAndre Bernet 3dba82622e Fix fields name (mixer,GC,..) (#4383) 2017-02-03 13:58:29 +01:00
Kelly ByrdandDamjan Adamic a0aa883743 Fixed #4375, fix pasting multiple items in Companion. (#4381) 2017-02-03 10:26:31 +01:00
Damjan Adamic 2b83160284 Fix needed to get f98f63fa5 working (PR was based on some older code) 2017-02-03 10:18:49 +01:00
Kelly ByrdandDamjan Adamic f98f63fa55 Issue #4224: Implement "duplicate model" in Companion (#4367) 2017-02-03 10:10:51 +01:00
3djcandGitHub fb44581496 Merge pull request #4376 from opentx/3djc/comp-french-uncomplete
3djc/comp french uncomplete
2017-02-02 22:17:47 -08:00
LapinFou e911922430 Updated French translation. 2017-02-02 15:49:45 +01:00
Andre Bernet 00074c508f Module compartment trainer input currently unavailable on Horus 2017-02-02 15:28:53 +01:00
Kelly ByrdandDamjan Adamic bdd62104c1 Issue #4224: Paste into and across categories in Companion (#4371)
* Issue #4224. Allow pasting models into and across categories.
* Issue #4224: Add "Paste" to category conext menu.
2017-02-02 09:05:26 +01:00
Andre Bernet 4554f19a4a Screenshot SF currently unsupported on Horus 2017-02-01 21:10:31 +01:00
Max Paperno 9c6a543434 [Simulator] Make sure a default Data File is always suggested in startup dialog; Fix silent exit upon startup if no file/data was provided. 2017-02-01 04:04:51 -05:00
Kelly ByrdandBertrand Songis c6026e8a0f Re #4224 Add "rename" item to Category context menu in companion. (#4360)
- Adds "rename" to the context menu for categories, it uses the
same code path as the default dblClick handler for the base class.

- Added a separator so the context menu looks more like the one
for models

- Some whitespace changes in mdichild.h, my editor truncates
whitespace on blank lines.
2017-02-01 07:35:46 +01:00
3djcandAndre Bernet 58971dffea Move antenna switch to module switches (#4355)
* Move antenna switches to module switches and fix display when moduel is OFF

* One line is missing and the whole field feels empty...
2017-01-31 14:50:18 +01:00
Arne SchwabeandBertrand Songis 59d9ec131b Schwabe/multi protocol update (#4352)
* Add multi frisky eu protocols

* Also implement MULTI_STATUS, the alternative to MULTI_TELEMETRY used by er9x/ersky9x
2017-01-31 07:41:08 +01:00
Max Paperno cab26a6a0f [Simulator] Make 2-way switches return -1 || 1 instead of 0 || 1. Fixes https://github.com/opentx/opentx/issues/4343 . 2017-01-30 20:19:04 -05:00
Andre Bernet 5077b10274 Only convert storage if boards are actually different 2017-01-30 11:03:42 +01:00
Andre Bernet 00adc318ce The "Downloads" dialog (previously firmware preferences) doesn't actually change anything anymore, so shouldn't update anything and thus run a storage conversion 2017-01-30 10:54:26 +01:00
Damjan AdamicandBertrand Songis 8eadee0719 Projectkk2glider/misc fixes (#4331)
* Re #4326: default backlight mode keys+sticks

* Re #4329: when saving radio/model data work on a copy of it, because Export() can change values. Fixes switch warnings change for Horus
2017-01-29 10:02:38 +01:00
Damjan AdamicandBertrand Songis d5e3fabf03 Read/write backup fixes: (#4327)
* Read/write backup fixes:
 * radio not found was show behind all windows (missing parent)
 * bad behavior on write when radio not found

* Disable model backup read/write for Horus (needs implementation)
2017-01-29 09:59:58 +01:00
Max Paperno 06a024e3e9 [Simulator] Replace default structure version value. 2017-01-28 20:36:46 -05:00
Max Paperno 122104daf5 [build] Fix MSVC build with WIN_USE_CONSOLE; silence new CMake warning for now (from fbb6c13). 2017-01-28 19:29:27 -05:00
Max Paperno fae095ea18 [Simulator] Fix startup when using a new file for radio data (file is now properly created, errors from Storage are ignored); Do not start simulator at all in case of data errors; Fix startup option dialog when finding radio type from profile for first time; Fix RadioOptions struct version control; Cleanup unused WinConsole code; Fix a warning and a missing const reference; Move ~SimulatedUIWidget() to public. 2017-01-28 19:15:46 -05:00
Andre Bernet 32dc0dd2a0 [companion] Missing default for backlight off on Horus (fix #4326) 2017-01-28 21:07:52 +01:00
Arne SchwabeandDamjan Adamic fbb6c1308c Fix current simulator lib not included in dmg (#4296) 2017-01-28 18:00:22 +01:00
Damjan AdamicandBertrand Songis d1547dd32d Prevent Companion crash if input data is smaller than required (#4309) 2017-01-28 13:47:45 +01:00
3djcandBertrand Songis 2fbe5a78d1 Proposition : model number handling (#4308)
* Try something for discussions

* Better alternative

* Typo

* Improve

* Change delimiter

* Move delimiter to space

* * Refactoring of CategorizedStorageFormat::load() and CategorizedStorageFormat::save() to support unused model slots
* Fix all unsafe usages of QString::toStdString().c_str()

* Fixed radio data import [Horus] (broken in 0f90ff0b65)

(cherry picked from commit cc12601a01)

* Added Q_OBJECT to TreeModel and some cosmetics

(cherry picked from commit f40e64c2aa)

* Cleanup
2017-01-28 13:46:45 +01:00
Max PapernoandBertrand Songis de68db0905 [Simulator] Further improvements (reload radio, momentary switches, etc.) (#4303)
* [Simulator] Add ability to reload all radio data w/out exiting simulator (will also adjust UI for any hardware changes); Refactor how keymap help text is generated.

* [Simulator] Only update channel/logical switch/GVar output displays if the corresponding tab is actually visible (further CPU usage reductions).

* [Simulator] Implement momentary toggle switches with "latch" function.

* [Simulator] Mouse wheel event over multi-position knobs now properly rotates them to detent positions.

* [Simulator] Fix mouse wheel event propagation after multi-position knob rotation; Cosmetics.

* [Simulator] Internals: Greatly improve object cleanup on exit; Refactor SimulatedUIWidget timer event triggering.

* [Simulator] Fix throttle stick position/lock not being set properly upon repeated launches from Companion.

* [Simulator] Fix build w/out SDL. KnobWidget cleanup.

* [Companion] Do NOT delete SimulatorInterface on simulator dialog exit (fix possible crash on dialog close).

* [Simulator] Ensure joystick is NULL at start.

* [Simulator] Fix/improve color blending on 4-bit screens with different BG colors; Cosmetics.

* [Simulator] Fix LCD screenshot folder path; Fix timer slot for Qt backwards compatibility.

* [TravisCI] Set Qt version to 5.3 to match release build servers.

* Fixed segfault when saving setup with no models defined [Horus]

* Fixed radio data import [Horus] (broken in 0f90ff0b65)

* [Simulator] Always keep toggle switch active while held with mouse button.
2017-01-28 13:43:56 +01:00
3djc 2a1e5914f5 Translate some of the new stuff 2017-01-27 20:35:29 +01:00
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
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
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
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
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
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