I have updated the system diagram to show the new position for the Emonpi CT as suggested by Glyn
The obvious problem is that only grid power is detected and shown on the display. Power coming from PV is not included. I am not sure if this is what Glyn intended or not.
