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.

Sign up for GitHub

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

Jump to bottom

Fix lua name #842

Merged
merged 4 commits into from
Oct 5, 2021
Merged

Fix lua name #842

merged 4 commits into from
Oct 5, 2021

Conversation

Runsys16
Copy link
Contributor

@Runsys16 Runsys16 commented Oct 1, 2021

Return a formated string, limit the size of string (16), and comment

@pfeerick pfeerick mentioned this pull request Oct 1, 2021
Closed
@pfeerick pfeerick linked an issue Oct 1, 2021 that may be closed by this pull request
Display the name of a mixer-script when selecting as source #432
Closed
@pfeerick pfeerick added color Related generally to color LCD radios lua-api Lua API related UX-UI Related to user experience (UX) or user interface (UI) behaviour labels Oct 1, 2021
@pfeerick
Copy link
Member

pfeerick commented Oct 2, 2021

@wimalopaan Is this what you were after?

@wimalopaan
Copy link
Contributor

I think so, but why do we need a new PR?

@pfeerick
Copy link
Member

pfeerick commented Oct 2, 2021

I believe the branch name was changed, so the PR was no longer linked...

@Runsys16
Copy link
Contributor Author

Runsys16 commented Oct 2, 2021

Sorry It's my first commit in a open-source project.
I am a newbie in collaborative soft. I don't now the correct usage.
I wrote many, many code since 40 years, I use git for my personnel project.
Because I made two commit in my local git repository, there is two pull-request.

I will search the good usage for only one PR with many modifications in the same goal

@pfeerick
Copy link
Member

pfeerick commented Oct 2, 2021 •
edited

With git, if you commit to the same branch you started the Pull Request with, your PR should update automatically, as a PR is a request to merge a branch from your repo into another branch (which can be in your own repo, or another repo)... i.e. you can keep making changes on that branch up to the moment it is merged.

Anyway, we're here, and it's an excellent PR to get started with ;)

@wimalopaan
Copy link
Contributor

I tested this now for a while and it worked flawlessly.
Are there any other obstacles or can this be merged into main?

@Runsys16
Copy link
Contributor Author

Runsys16 commented Oct 4, 2021

yes you can

@pfeerick
Copy link
Member

pfeerick commented Oct 5, 2021

Are there any other obstacles or can this be merged into main?

Only that I was unable to test it because of the issue I raised here : #591

I've just found out why it's not working on github builds, so now I can actually test this ;)

@pfeerick pfeerick merged commit f970ab1 into EdgeTX:main Oct 5, 2021
@pfeerick
Copy link
Member

pfeerick commented Oct 5, 2021

And done... Looks and works perfectly. Thank you for the PR! :)

@Runsys16
Copy link
Contributor Author

Runsys16 commented Oct 5, 2021

Thanks

@Runsys16 Runsys16 deleted the fix-lua-name branch October 5, 2021 10:46
@pfeerick pfeerick linked an issue Oct 5, 2021 that may be closed by this pull request
Custom Scripts don't see Lua outputs name #591
Closed
pfeerick pushed a commit that referenced this pull request Oct 6, 2021
@Runsys16 @pfeerick
Fix Lua Mixer Scripts source naming (#842)
261bbd2 
* getSourceString() return a correct string for lcdcolor when the source
es a LUA script

* getSourceString() return a formated string with instanceName or
scriptName and outputName

Co-authored-by: Runsys16 <rene.negre@orange.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
color Related generally to color LCD radios lua-api Lua API related UX-UI Related to user experience (UX) or user interface (UI) behaviour
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Custom Scripts don't see Lua outputs name Display the name of a mixer-script when selecting as source
3 participants
@Runsys16 @pfeerick @wimalopaan