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

Updated Crossfire telemetry FM strings for 3.0 #7108

Merged
merged 2 commits into from
Oct 28, 2021

Conversation

MrD-RC
Copy link
Collaborator

@MrD-RC MrD-RC commented Jun 12, 2021

Changed the old 3CRS to CRUZ and CRS to CRSH, to reflect the mode changes.

Changed the old __3CRS__ to **CRUZ** and __CRS__ to **CRSH**, to reflect the mode changes.
@MrD-RC MrD-RC changed the title Updated FM strings for 3.0 Updated Crossfire telemetry FM strings for 3.0 Jun 12, 2021
@OptimusTi
Copy link
Contributor

OptimusTi commented Jun 12, 2021

Will this change break functionality with LUATelemetry?

@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Jun 12, 2021

@OptimusTi I did realise that after posting. But figured to leave it up, and maybe I’ll look at the LUA.

@avsaase avsaase added this to the 3.1 milestone Jun 13, 2021
@wx4cb
Copy link

wx4cb commented Jun 14, 2021

@OptimusTi I did realise that after posting. But figured to leave it up, and maybe I’ll look at the LUA.

you theoretically wouldn't need to change anything as OTTOMH i think it goes by the modes numeric value.

@OptimusTi
Copy link
Contributor

OTTOMH

The lua script (and possibly OpenTX) expects a string from crsf telemetry. Not a number. right?

@wx4cb
Copy link

wx4cb commented Jun 14, 2021

OTTOMH

The lua script (and possibly OpenTX) expects a string from crsf telemetry. Not a number. right?

i am not sure. not by my pc to double check. but it might just be in modes.lua that you need to deal with.

@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Jun 15, 2021

I’ve had a quick look, and it looks like https://github.com/iNavFlight/OpenTX-Telemetry-Widget/blob/master/src/SCRIPTS/TELEMETRY/iNav/crsf.lua would need to be changed, but I believe that would be all.

Of course, the LUA script it’s self could be updated to use the terms Course Hold and Cruise.

@wx4cb
Copy link

wx4cb commented Jun 15, 2021

@MrD-RC That would be correct, but i would assume that would be for crossfire only and not all radios. there was an issue before where one sensor was called something different in crossfire than other radios but i could also be thinking about something else too :D

@OptimusTi
Copy link
Contributor

OptimusTi commented Jun 15, 2021

Check OpenTX too. :) Not familiar with the code and I can't find anything... but FM is in the sensors. It may spit out whatever it's sent though...(looks like that's the case so OTX may not be affected)

@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Jun 19, 2021

I had a look in EdgeTX and could only see FLIGHT_MODE_ID. I'm sure it just displays the string it receives.

@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Jun 19, 2021

I've updated the LUA. It will still work with older versions too. iNavFlight/OpenTX-Telemetry-Widget#4

MrD-RC added a commit to MrD-RC/LuaTelemetry that referenced this pull request Jun 19, 2021
This will update the script to work with the changes here iNavFlight/inav#7108
The old mode names are also present to maintain backwards compatibility with earlier versions of iNav.
@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Jun 19, 2021

... and here teckel12/LuaTelemetry#467

@DzikuVx
Copy link
Member

DzikuVx commented Oct 28, 2021

@MrD-RC Should we merge or not so much?

@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Oct 28, 2021

@DzikuVx The change has been added as a PR to both LUA scripts, and merged in the iNav repo version. It would kind of make sense to merge it now, rather than later, as we are already breaking backwards compatibility with this master. Up to you though mate. It would make sense to change, as the modes are now different.

@DzikuVx
Copy link
Member

DzikuVx commented Oct 28, 2021

Then let's merge it as our fork works just fine. Thanks

@DzikuVx DzikuVx merged commit 312d038 into iNavFlight:master Oct 28, 2021
@stronnag
Copy link
Collaborator

stronnag commented Oct 28, 2021

@mr-rc please add LUA changes to the official inav LUA widget repo

@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Oct 28, 2021

@mr-rc please add LUA changes to the official inav LUA widget repo

Already merged ;) iNavFlight/OpenTX-Telemetry-Widget#4

@stronnag
Copy link
Collaborator

@mr-rc please add LUA changes to the official inav LUA widget repo

Already merged ;) iNavFlight/OpenTX-Telemetry-Widget#4

Thanks. I should have known that.

@MrD-RC MrD-RC deleted the patch-1 branch November 9, 2021 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants