Fixes #3082.
Merge pull request #3096 from Zuhayr/master

Solar charging fix.
Added 5 barsigns.

Signed-off-by: Jim Apples <cheeckan@gmail.com>
Merge pull request #3103 from AppleMaster/bleeding-edge-freeze

I don't know what I broke