* Add options to disable radio and model menu tabs.
- Update radio and model data structs
- UI for color LCD radios
- Convert existing 'noGlobalFunctions' property.
- Language strings.
* Make 'theme' control specific to color LCD radios.
* Add B&W radio UI.
* Simplify code, reduce compiled code size.
Fix page count display on model select tab.
Fix GVARS for 212x64 radios.
* Collapse timer sections if timer is off.
* Remove 'Use global functions' checkbox from B&W model setup.
* Make preflight checks, throttle and view options sections expand & collapse (default collapsed).
* Fix build.
* Add view options to companion data classes, save and load values in YAML files.
Fix scrolling for radio setup view options.
* Add Companion UI for view option settings.
* Remove 'Mixes' from list of tabs that can be hidden.
* Updated Companion UI from elecpower.
* Use view options flags to enable/disable functionality:
- skip heli mixer logic if heli not enabled
- Remove heli, gvars and telemetry options from source selection if not enabled
* Remove 'flight mode', 'curve' and 'global variable' settings from input & mix editors if option disabled.
* Rename 'View Options' to 'Enabled Features'.
Put GVAR option under Flight Mode and indent text.
Make relationship between FM and GV more obvious.
* Remove global variable option dependency on flight modes.
Hide FM1-FM8 in global variables if flight modes hidden.
* Hide 'Custom Mixer Scripts' in source selection menu popup if disabled.
* Add translation strings for Hebrew language file.
* Fix typo. Add comment for double call to setCurrentTab.
* - 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
* Reduce RAM usage for advanced joystick system on radio:
- Don't allocate memory blocks unless joystick mode is being used.
Support multiple radio joystick configurations in Companion:
- Save configured joystick settings by joystick name in Companion settings.
- Save last joystick name used in each profile.
- Reload joystick settings by name when profile is changed.
* Only show configuration for used axes and buttons in Companion.
Send actual number of configured joystick buttons from radio in USB packet.
* Fix issue where USB joystick not recognised if no buttons configured.
* Fix compiler warnings.
* Remove debugging.
* Fix crash in Companion.
* Change channel 8 to type 'dial', workaround for Linux mapping issue.
---------
Co-authored-by: Phil Mitchell <phil.a.mitchell@gmail.com>
* Add 'Show Instance ID' button to telemetry page to show/hide sensor instance number (default is hidden).
Fix issues with page refresh when all sensors deleted.
Select closest sensor when a single sensor is deleted.
On change, only refresh the sensor list instead of the whole page.
The 'showInstanceIds' property is saved to the model file.
Update Companion to save/load 'showInstanceIds' in model YAML file. Add checkbox to telemetry edit page.
* Update all radio specific files.
* Keep focus on 'Discover/Stop' button when searching for new sensors.
Start sensor ID index at 1 to match B&W radios.
Keep focus on changed parameter when editing sensor, don't rebuild entire parameter list on change.
* Display actual 'instance' ID instead of 'instance' + 1.
* Fix incorrect ID when reloading simulator data.
* Fix incorrect ID when reloading simulator data on B&W radios.
* Add layout 4+2B right side 3QRT+1QRT
* Fix Layout 4+2B LayoutId, length max 9 char
* Maybe this will work?
---------
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
* Change ThemeFile class to use generic YAML parser instead of hard wired code.
Fix handling of empty input lines in YAML parser.
Increase size of YAML parser variables to handle theme 'info' property length.
* Update comment.
* Fix error.
* Proper fix for blank lines in YAML file.
* Fix YAML blank line handling (attempt 3).
* Ensure theme YAML file is backward compatible.
* Store selected theme in radio settings instead of selectedtheme.txt file.
On start, if radio settings theme is empty, try and load from selectedtheme.txt file.
In Companion, save/load the selected theme in the radio settings YAML file; but no UI to select theme.
* Update selected theme name in radio.yml if the theme name was edited.
* Only save 'selectedTheme' in Companion on color LCD radios.
* Allow switches on the connected radio to control switches in the simulator via the joystick interface.
* Merge configurable radio joystick interface from banyaszg.
* Add two more 'axis' channels to companion.
* Fix 6POS from USB joystick to simulator.
* Reduce data size.
* Fix build error on B&W radios.
* Add 'Companion' button mode to work with the button logic in the Companion app.
* Build Companion joystick setup layout at runtime.
Change #define names for simulator joystick.
Allow 15 axes and 32 buttons.
Initial support for trim sliders.
* Remove custom joystick button type for companion - use 3 buttons per switch in companion to control simulator switch state.
* Fix joystick constructor calls parameters. Connect some radio joystick trims to simulator widgets.
* Restore 'companion' button type to reduce number of buttons needed. Make trims work via buttons in USB joystick.
* Connect joystick trim buttons to simulator widgets.
* Use companion source names for trims.
* Add encode / decode of usb joystick custom settings to Companion.
* Convert to lvgl layouts.
Update language files.
* Fix generated YAML storage files.
* Fix initialisation error when editing button channel. Cleanup code.
* Fix rebase.
* Fix refresh of joystick channel list view after editing an entry.
Companion joystick config window uses two columns.
* Fix vertical joystick inversion bug.
Change stick axis labels.
---------
Co-authored-by: Phil Mitchell <phil.a.mitchell@gmail.com>
PR #2995 didn't take into account the data model storage actually does change when you change a variable name.
Boxer yaml generation was missed in earlier PR.
* chore: Run `generate-yaml.sh`
* chore(cpn): carryTrim -> trimSource
* fix(build): Boxer missing from `generate-yaml`
* dodgy attempt to read old carryTrim
* fix: Don't break the byte boundary + reorder
* fix(yaml): indentation for attributes that should not be output
* chore: Regenerate YAML after rebase
---------
Co-authored-by: raphaelcoeffic <raphael.coeffic@frafos.com>
* Fix rebase merge issue.
* Incorporate solution from @ParkerEde in PR #2626
* Fix selection logic for models.
* Select model on first press.
* Fix quick model selection when using scroll wheel & enter button.
Add setting to enable quick model selection.
* German translation.
* Fix behaviour when 'model quick select' is off to work like existing 2.8 logic.
* Add translations.
* Prioritise active model as selected model when the set of visible models changes.
* Fix selection ordering when using scroll wheel.
Minor code cleanup.
* Model Labels Selector
* Portrait Layout
* Receiver ID Check
* Fix Labels .yml format
* Companion Initial Commit
commit 967ddf3979b4954402fe62c858faba4b7a416bba
Author: dlktdr <cblackburn320@gmail.com>
Date: Mon Aug 29 01:49:15 2022 -0700
Fix Labels .yml format
commit 534221cad9e01146c47a9ac1080a655e04f1f6c8
Author: dlktdr <cblackburn320@gmail.com>
Date: Mon Aug 29 01:20:57 2022 -0700
Receiver ID Check
commit f32c0939d44e9ae60bc0705a9176354c23fec198
Author: dlktdr <cblackburn320@gmail.com>
Date: Sun Aug 28 23:13:25 2022 -0700
Portrait Layout
commit 961181217c7841ff3f21299ac6aa419b810f80e9
Author: dlktdr <cblackburn320@gmail.com>
Date: Sat Dec 11 16:56:13 2021 -0800
Model Labels Selector
commit dc99dd40d2
Author: David PHAM-VAN <1387855+DavBfr@users.noreply.github.com>
Date: Fri Aug 26 03:04:34 2022 -0300
feat: Allow Lua widget to override built-in widget with same name (#2208)
* Allow CPP Widgets Override with LUA
* Reset a widget option it the type differs
commit 4b747caff9
Author: eshifri <46511024+eshifri@users.noreply.github.com>
Date: Thu Aug 25 19:47:53 2022 -0700
fix: Write model name into models.yml when duplicating model (#2224)
* Update model name in the models.yml file (#2214)
* Fix the length of the name.
commit e97f23a305
Author: eshifri <46511024+eshifri@users.noreply.github.com>
Date: Wed Aug 24 21:19:52 2022 -0700
fix(cpn): Fix full path to model notes for Simulator (#2223)
* Correct Highlighted Column
* labels .yml indentation
* Update da.h
New defines translated to Danish
* Update dataconstants.h
Omit warnings due to difference of LEN_MODEL_FILENAME and LEN_MODEL_NAME in modellist.cpp
* Update modelslist.cpp
Wonder if this are the right file in PR #1374 (?), seems a lot are changed to the better in #1374
* Update dataconstants.h
Restore #define for LEN_MODEL_FILENAME to 16
* Rebase, Correct Issues
Delete now deletes instead of select
New model stores correct information
Duplicate save all information in cell
Rework items to use cell over button
Reword function variables
* CMPN: Add context menu
Fix output not functional. Removed Yaml::null at some point :)
Fix some compiler warnings
* CMPN: Compiler warning, replace ,->_ in list
* FW: Various Changes
Change view to a grid
Don't allow comma in label name
Add scroll indicators
Save sort order
Co-authored-by: HThuren <99370924+HThuren@users.noreply.github.com>
* reduce risk of corrupt radio.yml #1412
Adds CRC16 checksum to radio.yml when saved.
Adds save to temporary file, folowed by rename to radio.yml
Adds check on load, with fall-back to temporary file
* Made sure that only the first read block of radio.yml is checked for the 'checksum' value.
Added checksum generation on radio.yml produced by conversion.
* Added namespace.
Github actions triggered build failed on this - compiler difference.
* Fixed typo in code not run locally.
* Made checksum result code a enum class.
Fixed null-poionter dereference bug.
* Added check and handling for radio.yml file not read (will be handled as if checksum failed)
Added evaluation of checksum when radio_new.yml is read.
Added f_unlink() calls before f_rename() to ensure the target filename does not exist.
* Added radio.yml cheksum handling to Simulator/Companion.
Cleaned radio firmware handling of checksum field up to be newline agnostic.
* Added handling of files without checksum.
- Letting files pass the check if no checksum field is present (old files) and the size is realistic (25 bytes)
* Fixed bug causing new conversion from binary if no radio.yml BUT a radio_new.yaml
is present in the filesystem.
Now the conversion is only performed if neither file exsits.
* repair rebase problems
* rerun yaml generator
* fix another rebase problem
* update text in companion to be more meaningful when the radio.yml file has a checksum error
fix wrong error message in trace
* add trigger to check radio config when leavin menu_radio
* fix: add handling for temporary and error yaml radio settings files to simu/simulator/libsimulator
* fix corner cases when comverting non crc-ed files
* chore: Tweak radio data warnings for screen sizes
- Changed the define to be a little shorter
- Added missing define for TW
- Three string lengths to suit 128, 212 and basically colorlcd
Co-authored-by: gagarinlg <malte@langermann.net>
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
* First build
* Fix X9
* Update api_general.cpp
* Update translations.h
* clean up translations
* fix: B&W option handling, remove magic numbers, cleanup
- Remove references to invertRotary, change to RotEncDir or similar
- Add compatabilty importing to companion, firmware
- Rename Lua API call
- Move magic numbers to enum
- Improve B&W option handling so it doesn't apply changes while in menu
* chore: yaml regen
* fix: Add missing guards for X9D/X9D+
* fix: Wrong enum name in simu
* fix(cpn): Use correct names for UI elements
* fix: Translations
* fix: Allow `rotEncMode` in all yaml due to x9d var
Of the three X9D variants, the X9D+2019 is the only one that
has a rotary encoder as standard. However, as the base config
file is for the X9D, this meant it wasn't reading or writing the
config value. Rather than add a seperate config file for it for
a single variable, simple to just allow it across all targets.
* fix: Companion string, change colorlcd to `Choice`
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
* timer direction: ellapsed or left
* Add AUDIO announcement support
* Storage for showElapsed
* Translations
* Fix storage
* BW implementation
* Different BW implementation
* Companion support
* Color LCD implementation and rebase to lvgl
* Fix problems found by raphaelcoeffic
* chore: Regenerate the YAML files properly
* fix: Remove unused `TR_SHOW` remnant
* chore: Formatting and cleanup
* fix: Timer dir choice was shown in wrong place
Wrong newline used in ce23b50
* Fix cpn ui triggers, remove unnecessary code and some formatting
* fix(colorlcd): Hide timer dir opt if zero value
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
Co-authored-by: elecpower <neilh713@tpg.com.au>
Imported from open-flysky/Flysky-OpenTX-Test-Branch
* companion: Don't nuke `stickDeadZone` setting
* Implement data storage properly
* Add missing check for NV14 storage struct sizes
* Formatting
* Use one less byte in the packed data struct
Thanks @raphaelcoeffic :)
* Move setting of stickDeadZone default
* Use a Choice combo rather than NumberEdit
* Good riddance magic number
* Also set default stick zone if setting is missing
* Teach tests about `STICK_DEAD_ZONE`
* Tweak choice width
* Cpn NV14 add stick dead zone to hardware and section labels
* Cpn NV14 align default pot names to radio
Co-authored-by: elecpower <neilh713@tpg.com.au>
* feat: Add option for rotary encoder direction
Based heavily on opentx/opentx#8852 by @3djc
* companion ui elements
* Cleanup
* Hook up UI, reading setting from yaml
* Teach simulator about rotEncDirection
* Simu and radio default scroll direction correction
Otherwise the "default" would be the opposite to how it has always been
* Remove what will be a confict with fix in #1586
* Wasn't using rotEncDirection consistently
* Zorro RE dir is opp to TX16, TX12, TPro, X9D+2019
* Clean up some errors introduced in PR #1363
- Cleaning up bad YAML definitions
- Reverted renaming of 'jitterfilter' radio setting in storage/conversions/yaml/ files
* Add a custom attribute to allow for backward compatibility
* Prevent custom attributes without a 'write' function to output a tag
* companion - read but don't write old name
Co-authored-by: Raphael Coeffic <raphael.coeffic@frafos.com>
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
* replace magic number for throttle idle with correct define
* settings for custom throttle warning position
* settings fixed not to break byte-aligment of bit-fields
* evaluate custom throttle warning position
* add requested throttle value to warning text
* comment about field alignment in ModelData struct
* Menu for editing custom throttle warning for 128x64 radios
Tested on RM TX12
* Improoved menu display
* move displayed strings to translation
* translation template added for each language
* support for 212x64 B&W radios
* menu for colorlcd
not tested
* corrected translation entry for TW
* corrected handling of padding bits in ModelData structure
* Companion support for custom throttle warning position
* Rebase catchup
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
* ADC Filter - On/off state configurable at the model level
* Updated YAML configuration to match change from ADC Filter feature commit
* Companion changes to support ADC jitter filter to be a model configuration item.
* Renamed jitterFilter field to noJitterFilter.
This better describes the semantic, which is inverted.
* Updated after review
* Re-run generate-yaml
* Changed ADC Jitter filter control on Model to be tri state.
Off, On or use the radio setting
* Adde NOBACKUP() to the added field
* Re-generate yaml_datastructs
* Making the default state to use radio setting/Global value
* Updated after review:
Changing to more consistent naming across firmware and companion.
* Reverted files that was accidently added to the commit.
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
