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

X3 Hybrid G4: Attributes added #136

Merged
merged 24 commits into from
Mar 7, 2024
Merged

Conversation

SebStaeubert
Copy link
Contributor

Content:

  • Unit corrections (EPS Volt.,Cur.)
  • Battery Items added
  • Load/Generator Power added
  • Totals added (Bat. Disch./Charge, PV, EPS, Feed-in, Consumed E., etc.)

Open:

  • Tests

refs #80

add Battery mode
Battery Remaining Energy added
Feed-in und Consumed Energy total added
EPS Energy total / today added
PV Energy total added
Battery (Dis-)charge Energy total/today added
Load/Generator Power added
EPS Current and Voltage Units fixed
Battery Voltage and Current added
import twoway_div100
rename Feed-in -> Grid Power
@SebStaeubert SebStaeubert changed the title X3 Hybrid G4 X3 Hybrid G4: Attributes added Nov 21, 2023
@squishykid
Copy link
Owner

Can you please pull in master? Then we can run the tests

@SebStaeubert
Copy link
Contributor Author

Can you please pull in master? Then we can run the tests

I tried to. Is ok now? It is still squishykid:master. I cannot choose any other.

@squishykid
Copy link
Owner

You have the PR all correct :)

To clarify, I mean that you need to update your branch by 'pulling in' all the changes from upstream's master (squishykid/solax repo [this repo]). These changes include new testing infrastructure.

There's a guide here: https://www.atlassian.com/git/tutorials/git-forks-and-upstreams. You will need to set this repo (squishykid/solax) as the 'upstream'.

@SebStaeubert
Copy link
Contributor Author

@squishykid finally, all test are fine.
I learned a lot (i have no skills in python...) :-)

@squishykid squishykid merged commit 2e2cdd2 into squishykid:master Mar 7, 2024
3 checks passed
@squishykid
Copy link
Owner

Nice work. Now you can raise a PR against home-assistant to bump the solax package to v3.0.5. Then your changes will be included in the next release!

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.

2 participants