Fleshed out peacock server-->router conversion
Fixed an API type mismatch in peacock structure

the "units" fields were uint8_t's, but they should have been chars.
This has been fixed.
Peacock conversion test passes
Fixed a transient squawk conversion error
Merge branch 'testing'

For this merge, I got peacock conversion on the router working.