Commit Graph
2948 Commits
Author SHA1 Message Date
Max Paperno 992c4c4822 [Simulator] Remove keyboard grabbing, causing issues in Linux. 2017-01-17 02:47:54 -05:00
Bertrand SongisandGitHub 4d4a7471f3 [X7] EEPROM Variant introduced for Companion import (#4245)
* [X7] EEPROM Variant introduced for Companion import
* [X7] Also different FourCC needed if we want to use .otx files
* Allow early version of X7 firmware Eeprom to migrate to new variant (#4246)
* Allow early version of X7 firmware Eeprom to migrate to new variant
2017-01-16 21:52:34 +01:00
Damjan AdamicandBertrand Songis 979de6bfa2 Re #4224: Companion Hours simulator now uses temporary directory for radio/models settings. (#4247) 2017-01-16 21:35:52 +01:00
mhotar 99b9de271c X7 simu images 2017-01-16 20:46:59 +01:00
Arne Schwabe 0de4d9e7ad Fix clang warnings about virtual save methods not overriding the base method (const vs non const) 2017-01-16 12:54:16 +01:00
Bertrand Songis 263c07ace1 Compilation fix 2017-01-16 06:49:15 +01:00
Damjan AdamicandBertrand Songis f7543e3220 Projectkk2glider/simu tmp sd path (#4231)
* Re #4224: Introduced settingsPath and use std::string for paths in simpgmspace.

* Re #4224: Relevant parts of simpgmspace.cpp moved into simufatfs.cpp and simudisk.cpp

* Removed "/" from "mask_monitor_logsw.png"

* Re #4224: findTrueFileName() refactoring

* Faster gtests (less waiting for eeprom operations to finish)

* Re #4224: Radio settings and models directories now taken from alternate path (if set) [simu]

* Fixes #3322: together with previous changes to the SD browser this prevents the simulator from browsing higher than SD card root path.

* f_chdir() debug traces
2017-01-15 21:53:18 +01:00
Arne SchwabeandBertrand Songis bedaa505a2 Add two new multi protocols (#4240)
- Add binding sound while multi module is binding.
2017-01-15 21:51:44 +01:00
3djcandBertrand Songis 81e042971c getCapability review (#4238)
* getCapability review

* X7 has haptic too

* Typo

* @bsongis feedback and other cosmetics
2017-01-15 20:53:05 +01:00
Max Paperno 616eb9206d [companion] Minor warning fix. 2017-01-15 14:46:17 -05:00
Andre Bernet 2b9badf728 Compilation fix 2017-01-15 17:48:32 +01:00
Bertrand SongisandGitHub a65aa3d6c7 [Companion] Work in progress - QTreeView in MdiChild (#4197)
[Companion] QTreeView in MdiChild, Horus and X7 support added, fixes for #4224
2017-01-15 17:45:57 +01:00
Neil HorneandBertrand Songis 05ca719522 Port #4189 to next (#4235)
Add data modification for su trim, min and max
2017-01-15 15:27:23 +01:00
mhotar d9bac83532 9X simu photo button action 2017-01-13 20:45:04 +01:00
KongseandAndre Bernet e70a857459 Chinese translation minor revise (#4217) 2017-01-11 10:23:44 +01:00
Arne SchwabeandBertrand Songis 707b000111 Install also multimedia and print support plugins for OS X (#4212)
* Install also multimedia and print support plugins for OS X

* cosmetics
2017-01-09 18:14:37 +01:00
Andre Bernet e7f258ee45 Fix Chinese translation (fix #4179)
Remove disabled languages from build
2017-01-08 10:10:41 +01:00
KongseandAndre Bernet 01a1b74028 #4179 cn translation done (#4196)
translation finished
2017-01-08 09:50:51 +01:00
Max PapernoandBertrand Songis 1f788723f9 Build system updates, including -Werror on TravisCI (#4202)
* [TravisCI] Build using avr-gcc 4.9.2 (up from 4.8.2). Relies on https://github.com/opentx/opentx/pull/4169 . Fixes all linker warnings, makes clean build.

* [build] Add ARM/AVR compiler version check/display and a workaround for avr-gcc linker warnings when using WARNINGS_AS_ERRORS=true.

* [TravisCI] Enable -Werror on all build targets (WARNINGS_AS_ERRORS=true).

* [build] CMake script updates:
  Enable WARNINGS_AS_ERRORS option for all targets (not just firmware);
  Consolidate some C/CXX flag settings for firmware target, avoid duplication/redundancy;
  All warning flags are now passed to linker (GCC only);
  Add a "build report" for each main target showing compiler, flags, and defines, with verbosity controlled by new VERBOSE_CMAKELISTS option;
  Added properties to PCB, TRANSLATIONS, and a few other options (makes option selector lists in cmake-gui);
  Add macro for conditionally adding C++11 flag;
  Silence CMake >3.0 warnings about CMP0054 policy not being set;
  Reverts AVR linker -Werror workaround;
  Misc. cleanup/consolidation.

* [build] More CMakeLists updates:
  Silence superfluous "CRT_SECURE" series MSVC warnings;
  Formalize finding pthread lib/dll on MSVC builds and fix some issues with install target script;
  Add property string lists to more options;
  Quotes some paths with possible spaces, & other minor cosmetics.

* [build] firmware/bootloader: Remove remaining CMake default compiler flags and add FIRMWARE_C[XX}_FLAGS[_DEBUG] options for user to specify additional flags. Also move ASM language call to silence CMake warning w/MSVC.

* [build] Workaround bogus "uninitialized" warnings from AVR linker.

* [tests] Add custom printer for less verbose gtest output (use --verbose option to revert to gtest default).

* [build] Use less verbose CMake output for TravisCI builds. Formalize search for gtest code and enable gtests target on WIN32-GCC. Minor language fix.
2017-01-08 09:44:33 +01:00
Max PapernoandBertrand Songis 52b68c9ea2 [companion] Fix a few reasonable warnings brought up by MSVC /W3. (#4206) 2017-01-07 08:33:56 +01:00
Andre Bernet e49bbfe91f Cleanup 2017-01-05 23:24:29 +01:00
Andre Bernet 0e65aad1a8 [companion] Distributing qm files is useless since we compile them in as qrc 2017-01-05 23:16:23 +01:00
Andre Bernet af34a1568f [companion] Don't disable standard buttons on printdialog 2017-01-05 23:01:28 +01:00
Andre Bernet 3b58ee8d3c Missing reference to CN translation 2017-01-05 20:58:19 +01:00
Bertrand Songis 1d9c9a6cdb Cosmetics 2017-01-04 18:31:10 +01:00
3djcandBertrand Songis f8c6b20a35 Add missing units (#4181)
* Add missing units

* Add import shift
2017-01-02 11:32:54 +01:00
Damjan AdamicandBertrand Songis 803dc7d853 Projectkk2glider/issue 4138 and other fixes (#4182)
* Fixed Companion translations cmake target

* Some translations had problems with string termination (missing or excessive " characters)

* Fixes #4138: Use [RTN] instead of [EXIT] on Horus

* Define spare bits if BUZZER is not defined
2017-01-02 11:31:55 +01:00
Andre Bernet eb4508e12d [companion] Add zh_CN Chinese translation (fix #4179)
Fix lupdate working dir
2017-01-01 09:25:00 +01:00
Max Paperno ebdc73a421 [simulator] Fix standalone simulator radio type name in window title. 2016-12-30 19:12:20 -05:00
Max PapernoandBertrand Songis 5bf7a6c28d Simulator key/mouse mapping improvements (#4175)
* [simulator] Keyboard and mouse control adjustments:
  ~ Make kay/mouse navigation more consistent between radios and ensure keyboard events are always properly detected (eg. after clicking on a control);
  * Fix mouse wheel direction for rotary encoder emulation (fixes https://github.com/opentx/opentx/issues/4160);
  * Fix page up/down buttons on Horus (also #4160);
  ~ Horus rotary encoder can now be controlled with +/- keys (also keeps X/C, otherwise supersedes https://github.com/opentx/opentx/pull/4087 );
  ~ DEL key now another alternative for ESC/BKSP (brings all controls to number pad);
  ~ "=" key now acts same as "+" key (+ requires SHIFT in main row on most US keyboards);
  * Fix controls direction when using mouse wheel over RC switches;
  + Add help text showing keyboard mappings for each radio type (activate on F1 key).

* [simulator] Enable mouse wheel scrolling on radios w/out a rotary encoder (acts as +/- keys on X9D, PU/DN keys on 9X).
2016-12-30 22:36:29 +01:00
Max PapernoandBertrand Songis 1eead1504c Clean up build warnings (#4169)
* [build][OSX] Fix clang warnings.

* [build][OSX] A few more warnings taken care of.

* [build] Fixed yet more build warnings across all platforms.

* [build] Fix final warning due to bad CMake flag.

* [build] Remove unused variables as requested, fix indent.

* Fix output display limit type for 8-bit targets.
2016-12-30 18:16:11 +01:00
Max PapernoandBertrand Songis e204031ef6 Standalone simulator startup options (#4164)
* [simulator] Save and restore Simulator window sizes and positions (based on current radio profile).

* [simulator] Set startup throttle stick lock in standalone sim based on default mode in current Companion radio profile;
  Add new flag indicating standalone simulator;
  Unique titles for simulator console windows.

* [simulator] New/updated Simulator startup options:
  Radio profile used for standalone Simulator can now be separate from Companion;
  Allow selecting a radio profile and EEPROM image file (in addition to radio type) at startup via GUI and CLI;
  All startup settings are saved between uses.
2016-12-27 22:04:24 +01:00
Damjan AdamicandBertrand Songis fd01376f1e Reduced Companion simulator CPU usage by a factor of 5. (#4167) 2016-12-27 22:00:23 +01:00
Andre Bernet 625babc55e Companion modification propagation fixes (Fix #4155 and #3254) 2016-12-24 11:31:57 +01:00
Max Paperno 8f74388ae1 [companion] Fix CP1252 Windows build warnings by reverting arrow character encoding (fixes https://github.com/opentx/opentx/pull/4154#discussion_r93789409) 2016-12-23 18:44:56 -05:00
Max PapernoandBertrand Songis e90bd0fd70 Enable Windows build with Qt5.5+ & MinGW-w64 (#4150)
* [Windows][MinGW] Update some WIN32 macro checks in source code to be MSVC-specific (not needed for GCC-based builds).

* [build] CMakeLists updates:
  Adjust for Windows MinGW builds: now fully compatible with Qt5.5+ and MinGW-w64 toolchain (included in Qt installs);
  Add option to specify path to required libraries/includes (instead of hard-coding `c:\programs`);
  Add package check for Python and use found executable name;
  Remove custom FindSdl package handler in favor of stock (and improved) CMake one (still works with Windows);
  Do not force SIMU_AUDIO and LUA_COMPILER in SIMU builds (leave it up to user);
  Add SIMU_LUA_COMPILER option specifically for SIMU builds (default = ON);

* [build][Windows] Rewrite/Fix Windows Companion `install` target, with two options:
    a) just copy supporting Qt and c++ DLLs to build folder so programs can be quickly be run from there (this is default and similar to the old behavior);
    b) full installation to CMAKE_INSTALL_PREFIX path, including all binaries, supporting DLLs, language files, and OTx utilities.
  Option b) can be selected with new WIN_DO_FULL_INSTALL parameter;
  Also cleans up the Linux install a bit and consolidates the OS X parts;

* [simulator][Windows] Add option to build Windows simulator with system console/terminal enabled (both standalone and when launched from Companion). Mostly useful for debug as it gives output messages much sooner in the startup process than the current debug console. Also helpful because you don't have to open it manually on every launch, and it remembers last window position and size. Possible candidate for a user-selectable runtime option in the future.

* [Windows] Fix MSVC build issues.

* [build] More build fixes:
  Use a customized FindSDL.cmake script again due to bugs and deficiencies in the official version (based on script from CMake v3.7);
  Fixes missing SDL DLL error in NSIS installer);
  Use string for Timers option (checkbox in GUI is confusing);
  Remove an unused variable.

* [simu][Windows] Fix f_getcwd() cutting off too many characters (fixes SD browser interactions).
2016-12-24 00:11:07 +01:00
Arne SchwabeandBertrand Songis 06b0694f03 Schwabe/multi telemetry (#4151)
* Add FY805 protocol

* Fix stray space

* Fix multi sending 120% instead of 100%.

* Implement a custom telemetry for the multi module

The custom telemetry allows the module to tell the telemetry protocol to OpenTX and also allows signaling the status of the Module (e.g. invalid protocol) to OpenTX

This should also close #3979.

* Cosmetics and a few small bugfixes

* remove empty if

* Move status line directly below the mode to be always visible when selecting a protocol

* warn if internal RF module is on

* Replace sprint with small helper function to build on AVR ARM (AR9X, 9XPRO, …)

* TR in wrong order, RF_PROTO_OFF inverted

* Refactor definition of Multimodule protocols to have one central place to define all multi protocol properties

* Also update protocols in companion

* Update multi version number to display as a.b.c.d
2016-12-24 00:04:11 +01:00
Max PapernoandBertrand Songis b0de35f57d Reduce width of all simulator windows (#4154)
* [simu] Reduce width of all simulator windows and also height of Horus window. (https://github.com/opentx/opentx/issues/3135)

* [simu] New vertical channel outputs layout for all simulators, all outputs in one window and horizontally scrollable. Consolidate outputs and gvars widgets to one code base for all sims. Make simulator dialog re-sizable.

* [simu] Make simulation dialog resizable, and greatly reduce minimum size requirements of all simulators. Introduces new VirtualJoystickWidget class with all controls. Simplifies every simulator dialog UI form.
2016-12-23 23:56:28 +01:00
Bertrand Songis 74c03f0d4e [Horus] Companion default types for switches / pots / sliders 2016-12-23 23:49:51 +01:00
joaquinsandDamjan Adamic d9981b25d9 Fixes #4085: Horus simulator rotary control improvements (#4087)
* Fix for issue with trackpad & mouse wheel: Small movements up or down send delta=0, causing always events in the same direction.
* Changed keys to X,C
2016-12-23 20:13:00 +01:00
Bertrand Songis d35736732b [X7D] EEPROM support fixes 2016-12-16 07:29:14 +01:00
Bertrand Songis 82d6b96f8b X7D renamed to X7 2016-12-12 07:39:51 +01:00
Mike MorrisonandDamjan Adamic 4f47c13efc fix log playback when log frequency is .1s (#4115) 2016-12-11 20:36:30 +01:00
3djcandDamjan Adamic c3238ee38c Port #4116 to Next (#4118)
Fixes #4103: SF repeat parameter was not reset when changing function type
2016-12-10 19:33:13 +01:00
Andre Bernet e3cb1fe91b Merge branch 'kilrah/vc_mp' into next 2016-12-09 11:24:43 +01:00
Andre Bernet f99cba75d1 Enable multiprocessor compilation on windows 2016-12-08 22:31:00 +01:00
Arne SchwabeandBertrand Songis 85f3e3510e Update protocols of Multi module (#4093)
* Update protocols of Multi module

* Fix missing ;
2016-12-08 21:33:59 +01:00
Bertrand SongisandGitHub ec56d2dbdb [Companion] MdiChild now use a QTreeWidget instead of a QListWidget (… (#4096)
* [Companion] MdiChild now use a QTreeWidget instead of a QListWidget (for Horus compatibility)

* [Companion] Horus models.txt parsing / writing implemented

* Fix for QT53 (#4109)
2016-12-08 21:26:08 +01:00
Arne SchwabeandBertrand Songis dd77670007 Also bundle avrdude in addition to dfu-util and default to the executables in the bundle (#4106) 2016-12-08 21:22:12 +01:00
Arne SchwabeandBertrand Songis 0c255572ec Enable hide according to http://doc.qt.io/qt-5/highdpi.html (#4110)
* Enable hide according to http://doc.qt.io/qt-5/highdpi.html

* Also enable Retina support for OS X
2016-12-08 20:38:39 +01:00