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

Alternative transmit data: #4351 #4386

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Conversation

wimalopaan
Copy link
Contributor

@wimalopaan wimalopaan commented Dec 6, 2023

WIP: first try for: #4351

@pfeerick
Copy link
Member

pfeerick commented Dec 6, 2023

Please rebase rather than merge main where possible, as this keeps the commit history and changes clearer. It's not so much of an ordeal if you do it regularly, as the conflicts / changes become minimal, and often need to be resolved with after merge commits anyway, which adds even more noise.

@wimalopaan
Copy link
Contributor Author

Mmh, I did a rebase ...

@pfeerick
Copy link
Member

pfeerick commented Dec 6, 2023

If the main branch in your repo was up to date at the time, it should have left you with only the two unique commits, rather than also including these ones.

image

@pfeerick
Copy link
Member

pfeerick commented Dec 6, 2023

If you have no objections, I can push that through as I rebased it locally and just need to push it back to this branch. You'll just need to reset your local copy to the state of the remote branch in order to continue working on it.

@wimalopaan
Copy link
Contributor Author

If you have no objections, I can push that through as I rebased it locally and just need to push it back to this branch. You'll just need to reset your local copy to the state of the remote branch in order to continue working on it.

Well, I'm not a real git guru ;-)

We can do as you suggested above (then you have to guide me a bit for my local repo), or I can delete the PR and setup a new branch and PR ... choose the way that means the least work for you!

@wimalopaan
Copy link
Contributor Author

This PR will just provide the basic infrastructure for sending data to the RX/FC/..., it is left to some LUA to actually push that data via crossfileTelemetryPush(), sportTelemetryPush() (or TelemetryPush(), e.g. = mavlink) according to the needs of the user and his infrastructure in the model.
The question now: where should I place the lua-example? In the edgetx-sdcard repo?

@3djc
Copy link
Collaborator

3djc commented Dec 7, 2023

I think the option should be off by default, not on

Also some TRACES are left commented out, some not

@pfeerick
Copy link
Member

pfeerick commented Dec 7, 2023

Yes, any supporting Lua code would go in the edgetx-sdcard repo.

rebase has been pushed. And don't worry, I'm not a git guru either... I've just learnt a bit over the past few years having to use it more and more ;)

Using the command line, do a git fetch in your local working copy folder, so that git recognises there are changes in the remote. When you do git status, it should complain about it being not up to date. Using the branch name as shown here (I'm guessing it will say origin/wmbindata for you...)

image

you can then do git reset --hard origin/wmbindata and your local working copy should be back in sync with the remote copy on github.

simplified data handling
@wimalopaan
Copy link
Contributor Author

Thanks, looks good now.

const uint8_t start = mNextIndex;
for(uint8_t i = 0; i < numberOfValuesToPush; ++i) {
const uint8_t v = mData[mNextIndex];
TRACE("pushNextData: %d = %d", mNextIndex, v);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this TRACE really needed ?

@wimalopaan wimalopaan marked this pull request as draft December 8, 2023 09:52
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.

3 participants