From 6b52adb71fcba7af885edec2e8ac18fcddecf285 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 30 Dec 2016 13:25:16 +0100 Subject: Uniform --- protocol.go | 10 +++++----- types.go | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/protocol.go b/protocol.go index 6f2ee38..4efa15a 100644 --- a/protocol.go +++ b/protocol.go @@ -169,10 +169,10 @@ see also: https://github.com/IBM-Bluemix/node-mqtt-for-anki-overdrive type VehicleMsgSetOffsetFromRoadCenter struct { Size uint8 MsgID ID - Offset Offset // mm + Offset OffsetMM // mm } -func (v *VehicleMsgSetOffsetFromRoadCenter) Set(offset Offset) { +func (v *VehicleMsgSetOffsetFromRoadCenter) Set(offset OffsetMM) { v.Size = uint8(binary.Size(v) - 1) v.MsgID = VehicleMsgC2VSetOffsetFromRoadCenter v.Offset = offset @@ -183,12 +183,12 @@ type VehicleMsgChangeLane struct { MsgID ID HorizontalSpeed MMperSec // mm/sec HorizontalAccel MMperSecSQ // mm/secĀ² - Offset Offset // from road center mm + Offset OffsetMM // from road center mm HopIntent uint8 Tag uint8 } -func (v *VehicleMsgChangeLane) Set(hspeed MMperSec, haccel MMperSecSQ, offset Offset) { +func (v *VehicleMsgChangeLane) Set(hspeed MMperSec, haccel MMperSecSQ, offset OffsetMM) { v.Size = uint8(binary.Size(v) - 1) v.MsgID = VehicleMsgC2VChangeLane v.HorizontalSpeed = hspeed @@ -208,7 +208,7 @@ type VehicleLocalizationPositionUpdate struct { MsgID ID LocalizationID uint8 RoadPieceID uint8 - Offset Offset // from road center mm + Offset OffsetMM // from road center mm Speed MMperSec // mm/sec ParsingFlags Flags diff --git a/types.go b/types.go index 121deba..72195b5 100644 --- a/types.go +++ b/types.go @@ -41,19 +41,19 @@ func (v MMperSec) String() string { return fmt.Sprintf("%5.3fm/s", float64(v)/1000.0) } -type Offset float32 +type OffsetMM float32 -func (c Offset) String() string { - return fmt.Sprintf("%4.1fmm", c) +func (v OffsetMM) String() string { + return fmt.Sprintf("%4.1fmm", v) } type Flags uint8 -func (f Flags) String() string { +func (v Flags) String() string { return fmt.Sprintf("{Bits: %d InvColor: %t RevParse: %t RevDrive: %t}", - f&ParseflagsMaskNumBits, - f&ParseflagsMaskInvertedColor != 0, - f&ParseflagsMaskReverseParsing != 0, - f&ParseflagsMaskReverseDriving != 0, + v&ParseflagsMaskNumBits, + v&ParseflagsMaskInvertedColor != 0, + v&ParseflagsMaskReverseParsing != 0, + v&ParseflagsMaskReverseDriving != 0, ) } -- cgit v1.2.3