Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Companion 2.5 #555

Merged
merged 39 commits into from
Sep 8, 2021
Merged

Companion 2.5 #555

merged 39 commits into from
Sep 8, 2021

Conversation

elecpower
Copy link
Collaborator

@elecpower elecpower commented Aug 4, 2021

Refer PR #409 for history of this PR.

Tasks:

  • data conversion from version 219 to 220
  • model timers edit
  • EdgeTX branding and references where possible
  • fix some simulators crashing when launched from Companion
  • replacement EdgeTX win, linux and osx icons refer Refresh Windows, Linux and Mac Companion icons + helper script #565
  • splash and title images (simple rebrand)
  • turn off upgrade checking and downloads for firmware and Companion and redirect to Installation web page
  • add support for new radios:
    • FlySky NV14
      • capabilities (initial)
      • simulator (initial)
  • YAML stub
  • merge OpenTX PRs since fork
  • replace theme and layout blobs with detailed data structures
  • add custom screens tab for colorlcd and move b&w telemetry screens

elecpower added 3 commits May 2, 2021 16:18
Replace some OpenTX refs
Data conversion to v220
Update Timers ui to cater for mode field split
@elecpower elecpower added the companion Related to the companion software label Aug 4, 2021
@lshems
Copy link
Contributor

lshems commented Aug 4, 2021

Will this get complied artefacts for testing as well?

@raphaelcoeffic
Copy link
Member

Will this get complied artefacts for testing as well?

I’d love this!

@raphaelcoeffic
Copy link
Member

replacement EdgeTX icons and images (one for theme team)

@elecpower what is needed exactly? Which format / size / etc. @JimB40 I think he meant you with "theme team" 😇

@elecpower
Copy link
Collaborator Author

what is needed exactly? Which format / size / etc.

The compile and bundle processes source images from edgetx/companion/src/images.
Refer edgetx/companion/src/CMakeList.txt and edgetx/companion/src/companion.qrc.

@JimB40
Copy link
Collaborator

JimB40 commented Aug 4, 2021

@raphaelcoeffic if there is no dmg it's no-go for me.
No spare minute to read abt CMAKE etc.
I like to learn but simply no spare time now.

@elecpower
Copy link
Collaborator Author

elecpower commented Aug 4, 2021

To save some effort I would suggest skipping looking at the library sub-directory as from a quick look at the code those files are mainly/only used for eeprom radio splash screens editing. That leaves:
./linuxicons
./winicons
companion-title.png
icon.png
iconmac.icns
splash.png

@raphaelcoeffic
Copy link
Member

@raphaelcoeffic if there is no dmg it's no-go for me.
No spare minute to read abt CMAKE etc.
I like to learn but simply no spare time now.

No worry, we can work something out ;-)

@elecpower
Copy link
Collaborator Author

No worry, we can work something out ;-)

Surely there is a tool out there that can take an svg or png and generate icons for all OSes. If one can be found that only leaves a couple of images to be done manually.

@pfeerick
Copy link
Member

pfeerick commented Aug 6, 2021

Can you also throw in a change to

add_executable(gtests-companion EXCLUDE_FROM_ALL ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h)

Just needs .in at the end of the filename... (i.e. location.h.in). CMake 3.21 picked up that the explicit name wasn't given...

CMake Warning (dev) at companion/src/tests/CMakeLists.txt:25 (add_executable):
  Policy CMP0115 is not set: Source file extensions must be explicit.  Run
  "cmake --help-policy CMP0115" for policy details.  Use the cmake_policy
  command to set the policy and suppress this warning.

  File:

    /src/companion/src/tests/location.h.in
This warning is for project developers.  Use -Wno-dev to suppress it.

With the bump to cmake 3.21, there is now also a deprecation warning, but I don't know how to fix that one yet, so it can stay that way for now unless anyone has an idea on how to make the changes it's moaning about.

CMake Deprecation Warning at companion/src/CMakeLists.txt:364 (cmake_policy):
  The OLD behavior for policy CMP0026 will be removed from a future version
  of CMake.

  The cmake-policies(7) manual explains that the OLD behaviors of all
  policies are deprecated and that a policy should be set to OLD only under
  specific short-term circumstances.  Projects should be ported to the NEW
  behavior and not rely on setting a policy to OLD.

@elecpower elecpower changed the title Companion 2.5 Companion 2.5 DO NOT MERGE Sep 2, 2021
@elecpower
Copy link
Collaborator Author

Do not merge as I have found a bug in the read and save of the colorlcd screens data.

@pfeerick
Copy link
Member

pfeerick commented Sep 3, 2021

No worry from me... I'm still waiting for the "Merge it already!" comment :)

@elecpower
Copy link
Collaborator Author

elecpower commented Sep 4, 2021

Hopefully fixed import/export.
Added custom screens tab for colorlcd and moved b&w telemetry screens to the new tab.
Colorlcd custom screens have limited information and are read-only as the raw data is not reversible eg ZoneOptionValueTyped. This field is the bane of my life!!!! Have you thought about how data conversion is going to work between radios or data versions for example source and switch values? Companion converts all sources and switches to its own internal format on import and export and tries between radios. This will not be possible if the value type is generic. Auto conversion is something OTX users expect and demand through numerous issues.
If the type was the ZoneOption then so much easier IMHO but there are reasons for the design choice that I haven't twigged to.
Companion needs more 'training' ie reimplement a cutdown version of the radio code.
Hey @pfeerick "Merge it already!"

@elecpower elecpower changed the title Companion 2.5 DO NOT MERGE Companion 2.5 Sep 4, 2021
@pfeerick
Copy link
Member

pfeerick commented Sep 8, 2021

Right, so I've pulled the trigger since this has been your labour of love @elecpower ... Also any future changes to companion can be based on main again now ;)

@elecpower elecpower deleted the elecpower/cpn_25 branch September 8, 2021 06:40
@rotorman rotorman mentioned this pull request Sep 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
companion Related to the companion software
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants