Clean up Shearwater string handling

[Dirk Hohndel]

> On Jul 9, 2017, at 2:31 PM, Linus Torvalds <torvalds at linux-foundation.org> wrote:
> 
> On Sun, Jul 9, 2017 at 1:11 PM, Dirk Hohndel <dirk at hohndel.org> wrote:
>> 
>> I'll take it.
> 
> Are you committing it or should I?
> 
> If you expect me to commit it, I would like to hear that you actually
> see that "T1 battery" string report "normal" for you. I couldn't
> actually test that code.

I'm building a new test binary right now, will report back in a little while.

/D