change serial and gps so they can be use with softserial.
fix upstream format
Merge branch 'upstream' into hil