Fixed Combined energy

[kr0ner]

• Wh offset is float not int
• property_wh substitution was missing in one place

[kr0ner]

no longer have the artifacts at midnight or when resetting the ESP

this was without the fix

[kr0ner]

@Hotdogxxxx I think this is done and you can rebase you changes on top :)