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

mAh in OSD #158

Merged
merged 2 commits into from
Oct 18, 2018
Merged

mAh in OSD #158

merged 2 commits into from
Oct 18, 2018

Conversation

cyrilknops
Copy link
Contributor

the files on github are not up to date with the files in the 1.6 rc6 image so had to add current_ts() object which is included in the 1.6 rc6 release image

@bortek
Copy link
Collaborator

bortek commented Oct 15, 2018

Interesting. I started reviewing the code and finding some discrepancies. 1.6RC6 image, which I downloaded from the Gdrive link on Wiki, only has parts of the code that is in this PR. For example the variable mAhDrawRaw is not there at all (in the image) but present in the Git. Are you using the same 1.6RC6 ?

I am attaching render.c and render.h which I extracted from 1.6RC6 image. Take a look at them.

https://ufile.io/krmag
https://ufile.io/0alk0

@cyrilknops
Copy link
Contributor Author

MahDrawnRaw is part of my code for the implementation of the mAh in OSD feature, so it's understandable that it is not included in the image, I was talking about the current-ts() object, there is still some missing code in other files like the gpio-conifg.py for example

@bortek
Copy link
Collaborator

bortek commented Oct 15, 2018

That explains it :) I am in the process of updating the codebase using one of the 1.6RC6 images and as soon as that is done I will come back here and review/Merge the PR.

@cyrilknops
Copy link
Contributor Author

great to hear, looking forward to pull from a up to date codebase, have a lot of ideas for future features

@Yes21
Copy link
Contributor

Yes21 commented Oct 18, 2018

This Pull Request will have to be merged with this one, before 1.7 integration.
Thanks

@bortek bortek merged commit 7bb319f into rodizio1:develop Oct 18, 2018
@Yes21
Copy link
Contributor

Yes21 commented Nov 29, 2018

@bortek Do you know if there's a way to transfer this PR on @RespawnDespair's github ?

@bortek
Copy link
Collaborator

bortek commented Nov 29, 2018

No there is no way. Prs cannot be transfered. But it's quite easy to create a new one and then close this one. @cyrilknops could you be able to do it?

@cyrilknops
Copy link
Contributor Author

Yes i think so, Will take a look this evening

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.

None yet

3 participants