Commit Graph
43 Commits
Author SHA1 Message Date
c4f1e7127d chores(flysky): Separate AFHDS2A and AFHDS3 into 2 different module type (#3783)
* chores(flysky): separate AFHDS2A and AFHDS3 into 2 different module type

This should allow to remove some of the hacks added earlier.

* chore: Add some EL18 CI bits

* fix(afhds): cmake defs

* fix(ci): add el18 to commit-tests.sh

* chore(cpn): separate AFHDS2A and AFHDS3

* chore(cpn): remove binary import of afhds and legacy fxFreq field for afhds3

* fix(cpn): limit available internal afhds protocols to those supported by hardware

* chore(cpn): update Flysky int module test

* fix(cpn): compile error

* fix(cpn): afhds2a max channels

* fix: TR_MODULE_PROTOCOLS

* enh(cpn): more support for afhds2a and 3

* fix(cpn): rebase compile error

* fix(cpn): bit indexes

* fix(cpn): emi toString

* fix(cpn): limit available internal afhds protocols to those supported by hardware

* enh(cpn): add support for Flysky EL18

* fix(cpn): available protocols

* fix(cpn): rebase moduledata

* chore(cpn): add module fields to model print

* Separate AFHDS2A and AFHDS3 UI settings.

* Fix AFHDS3 conversion from old subtype value.
Fix 'Channel Range' layout on portrait LCD.

* Fix name.

---------

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
Co-authored-by: elecpower <neilh713@tpg.com.au>
Co-authored-by: Phil Mitchell <phil.a.mitchell@gmail.com>
2023-09-07 19:24:03 +10:00
MichaelandGitHub 04359757c4 fix: Update built-in Multi-protocol module protocol lists, single source for firmware and cpn (#3435)
* - Concentrated Multi protocol definitions into a consistent single source. Actually two .h files, one for the protocol list and names, the other for subtypes and capababilites, see comments in .h files as to why

- updated available protocols reflecting 1.3.3.20 (15+ protocols)
- fixed Companion always showing f/s and channel map options in model setup disregarding the protocol capability

* Following @pfeerick's review: changed heaeders and typos

fixed Ubuntu runtime error on assert
fixed change of Multi protocol not triggering writing yaml file

* corrected copy/paste error

* fixed FrSky index juggling

* Updated Multiprotocol database to current MPM project status (ref. MPM Multiprotos.ino)

- changed protocol name FX816 to FX
- added Flysky AFHDS2A options PPM and PPWM SBUS 16ch subtypes "PWM,SB16" and  "PPM,SB16
- added V761 option to select TOPRC
- added FX options "816" and "620"
- added FRSKYR9 option "-- 8ch"

* MPM protocol scan excludes some protocols which are not meant to be selected. For Companion and Simualtor (and for radios if there is no MPM connected) this was handled in different places with outdated information. Harmonized and centralized the handling of non-selectabale protocols into the single source for all companion, Simulator and all gui types.

* More cleanup:

- changed some MPM protocol names to the ones the MPM delivers with MPM protocol scan to harmonize names between CPN/Simulator/radio
- added XN2927DUMP and MOULDKG to the list of excluded MPM protocols just like the MPM does with MPM protocol scan
- added new option value limits and moved definitions to single source
- adapted CPN and radio to use common definitions of option values for all GUI types
- moved distributed MPM (as far as possible) to one coherent place under a single #if defined (MULTIMODULE)
- fixed option value not reset at change of protocol
- some editorial stuff

Note: There is still some work to be done on CPN GUI option values. DSM2 servo rates are hard coded, BAYANG telemetry options are only shown by index and not by text as in radio code, AFHDS2A servo update rate is shown as index too which is to no use for users.

I'll try to fix all this in the next session, but request to get rid of BAYANG telemetry options translations. It is much easier to define a common string list by using untranslated.h

* rebase due to fr.h

* resolve merge conflict with main fr.h

* more cleanup:

- deleted multiple definition of MM_RF_CUSTOM_SELECTED in favor of single source define
- bw radios: change to only allow defined protocols rather than a fixed 127 protocols

* Changes:

- magic sentinel number 0xfe as define
- add 10 NN protocol entries for future use of new MPM protocols not yet defined in ETX (still recommend timely ETX maintenance update if MPM releases new firmware)

* Changes by @elecpower:

- align field labels to radio
- change servo update frequency from combo box to spin box with edit only via up/down arrows to stop invalid values being entered via keyboard. Remove frequency list used to populate combo box as only used by Companion.
- add validation to module yaml decode checking for unsupported multi protocols and/or multi protocol sub types and if unsupported set module to OFF just to be safe.

* Changes:

- radio: added validation to module yaml decode checking for unsupported multi protocols and/or multi protocol sub types and if unsupported set module to OFF just to be safe.

* CPN: use sentinel define

* cpn: Sort multi protocols list (courtesy @elecpower)

* fixes #3480

changes:
- moved FrSky subtype defines to MultiProtoDefs.h
- updated bind_button_driver.cpp

* missed replacing one instance of setMultiProtocol()

* changes:

- editorial change
- added multi option to OMP protocol (ref #2713)

* rather go for STR_MULTI_RFTUNE because MPM manual talks about RF tune

* made XN297_DUMP selectable (available with MPM debug fw only)

* corrected merge mistakes
2023-05-22 20:07:29 +10:00
Neil HorneandGitHub 8b13813126 cpn(fix): Multi module DSM protocol options (#2724)
* cpn(fix): Multi module DSM protocol option check box

* Add servo rate option for multi DSM

* Use bitmap helper functions
2022-11-17 16:03:10 +10:00
Raphael Coeffic 17986843e3 Add Baudrate to Module Setup 2022-03-21 11:52:19 +01:00
4571c7b724 chore: Companion - add support for GHOST 12bit opt (#1689)
* chore: Companion - add support for 12bit GHOST opt
Resolves #1510

* Ghost protocol reading and writing non-yaml formats

Co-authored-by: elecpower <neilh713@tpg.com.au>
2022-03-14 11:10:12 +10:00
elecpowerandRaphael Coeffic d7190493d5 Add Internal Module to companion 2022-01-02 13:05:09 +01:00
elecpowerandPeter Feerick a62545a674 Merge pull request #8545 from opentx/opentx/fix-8541-trainer 2021-10-14 20:34:53 +11:00
Bertrand Songis 6299c35844 [Companion] Racing mode support added 2021-02-08 22:46:11 +01:00
JakubandGitHub 5bf197439a Support of FRM302 module. (#7533)
AFHDS3 support added
2020-06-22 16:44:35 +02:00
3djcandBertrand Songis 810d2d7978 Various fixes around Companion trainer mode (#7116)
Various fixes around Companion trainer mode
Fixes #7091
2019-11-26 14:53:45 +01:00
3djcandGitHub c5a8429313 Fix "bind on startup" string (#7064) 2019-11-18 16:14:32 +01:00
3djcandGitHub 3a7e006635 Support new Multi 1.3 features (#7077) 2019-11-15 16:20:24 +01:00
Bertrand SongisandGitHub 6c530c6f7b External antenna configuration: proposal for #4285 (#6656)
External antenna configuration
2019-09-06 11:26:18 +02:00
Raphael Coeffic c8e7522b38 added receivers on module frame 2019-08-18 18:53:56 +02:00
Raphael Coeffic ac0ee91078 support for other modules & protocols 2019-08-18 00:49:25 +02:00
Bertrand SongisandGitHub 83ab5b6c36 R9M warning (#6464)
R9M warning + refactoring
2019-05-29 17:18:14 +02:00
3djc 95c035ed73 Support for non certified firmwares (#6118)
* Support new r9m firmwares

* More future proof, thx Kilrah

* (significant) typo

* Companion part

* Make support a compilation option

* Fix compilation for normal users

* Warning popup for usability tests

* Better implementation

* All sizes

* Cosmetics

* Flex is EU+/AU+ only

* [Companion] Handle "flexr9m" option in module settings UI (to match radio UI, including warning msg); Move some "toString" functions out of ModelPrinter into ModuleData/Multiprotocols; "Future-proof" available R9M power options based on "stdr9m" fw option; Fix missing "Hitec" MM protocol name; Fix printing of R9M-EU power level in ModelPrinter.

* Cosmetics

* Rename R9M flex option

* Move failsafe further back to prevent nav oddity
2018-08-30 13:16:39 +02:00
Max Paperno 777fc58578 [Companion][ModulePanel] Fix RF Output Power warning message display. 2018-06-04 04:51:32 -04:00
Bertrand SongisandGitHub 806715e166 Bsongis/companion r9m fixes (#5914)
* Cosmetics

* First part ...

* First part ...

* Second part ...

* End?

* Handle new  R9M and R9M lite

* Display 'mini' module in case of R9M and xlite
2018-06-02 18:16:51 +02:00
3djcandBertrand Songis 8ee9199abc R9M : activate automatically MODULE telem when possible (#5553)
* Fix #5543

* Auto activate R9M telem

* Adjust radio ui

* Thx @schwabe

* Stop being stupid ?

* PR rework

* [Companion] Removed "Module Telemetry" checkbox.
2017-12-29 09:47:45 +01:00
Bertrand SongisandGitHub a6044a684d Bsongis/r9 m fixes (#5406)
R9M support
2017-12-08 11:26:46 +01:00
Arne SchwabeandBertrand Songis 8e84724c62 Implement R9M Companion support (#5157)
also implement (like with multi) own pxx struct for pxx options
2017-08-15 21:45:15 -07:00
Arne SchwabeandBertrand Songis 40dae8a8a7 [MULTI] Implement option Value adjustment in Companion (#4459)
* [MULTI] Implement option Value adjustment in Companion

Also refactor ui code to use the same multi table as the radio to make updates easier and consistent

* Fix warnings with gcc 6

* Make the whole thing more C++ like

Using QVector instead of std::vector gives me strange errors.

* Fix gcc warning

* another signedness fix

* Add missing include

* Add Gw008 protocol and move subtype definitions out of the translations

* Add note about struct

* More cleanups

Integrate @mpaperno’s latest ideas about cleaning up
2017-03-02 18:40:31 +01:00
Max PapernoandBertrand Songis 171e08c2fd [Companion][ModelEdit] Fix/improve module custom failsafe value settings (fixes #4443): (#4492)
* Properly set limits based on model's Extended Limits setting;
    * Fix rounding issues between percentile display and underlying value in μs;
    * Add ability to display values in μs as well as percent.
    * Channels numbering & count is responsive to module's defined start/end channels.
2017-02-26 13:00:49 +01:00
Max PapernoandBertrand Songis 4e24d0ef7d [Companion][ModulePanel] Clean up some layout issues in outputs/trainer protocol setup UI; Make sure proper form fields are shown for radios with only one external radio system (eg. PPM on 9X). (#4424) 2017-02-07 22:17:05 +01:00
3djcandBertrand Songis 12a8770ad5 Companion : add Horus antenna handling (#4258)
Horus antenna handling
2017-01-20 07:40:13 +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
Bertrand Songis d82ec0fe9c [Companion] Unix format used everywhere 2016-11-23 16:46:56 +01:00
Arne SchwabeandBertrand Songis 92dde79dec New protocol and telemetry: FlySky AFHDS2A (#3948)
* New protocol for multimode FlySky AFHDS2A

* Also add AFHDS2A protocol to companion

* fix compile error
2016-10-25 22:51:34 +02:00
Arne Schwabe 7b30201867 Implement Multimodule TX options for Companion 2016-04-18 00:09:51 +02:00
Andre Bernet 08ff104d26 Correct failsafe mapping (fix #2975) 2015-10-30 13:08:26 +04:00
bsongis 6b41b558dd Companion part 2015-05-07 19:46:06 +02:00
Damjan Adamic 60b2a378dd Re #2239: PPM output type added for 9XR-PRO (open drain or push-pull) 2015-05-04 20:35:29 +02:00
Damjan Adamic 2ac04e60ae Re #1909: tabs fixed in .ui files 2014-12-14 16:41:42 +01:00
Andre Bernet 0de8acd608 Fix receiver number range (Fix #1790) 2014-10-17 22:55:44 +04:00
bsongis e73b0120cc New trainer modes added in Companion 2014-09-29 09:01:13 +02:00
Andre Bernet 5402dd7ad9 Translation/typo cleanup part 4 2014-04-15 18:17:01 +02:00
Andre Bernet c65b26ec69 Firmware/companion string consistency 2014-04-03 21:04:36 +02:00
Kjell Kernen e61b411d7a A few minor adjustments to modeledit to give it a more consistent layout for both Taranis and 9x. 2014-03-28 01:20:01 +01:00
bsongis 8ae3276747 Issue #863 fixed (Companion part done) 2014-03-25 20:44:12 +01:00
Bertrand Songis dddad5389a The failsafe frame was displayed even when the radio was not a Taranis 2014-01-22 21:25:15 +01:00
Andre Bernet 3ade8707a7 Nicer module UI 2014-01-07 21:30:57 +01:00
Bertrand Songis e16500de9e Model Setup reworked again! 2013-12-22 17:01:41 +01:00