Clean-up the sensor code to have intermediate 'raw' representation of
every value read from the sensor.
Update energy code to include 'actual' value that can be read directly
from the chip. Adjust the 'expected' value that we were already calculating.