Restructuring and combining of energy values

[Hotdogxxxx]

I calculate the sum of the energy values and only publish this in HA. The original values have been set to inactive in HA, in case someone wants to display them.