From 03fae13a609c0d9f653406a134032fc1f0c9db46 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 30 Dec 2016 13:22:26 +0100 Subject: Split prettyprinting --- protocol2.go | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'protocol2.go') diff --git a/protocol2.go b/protocol2.go index e578c9c..6e71b0c 100644 --- a/protocol2.go +++ b/protocol2.go @@ -1,10 +1,5 @@ package anki -import ( - "fmt" - "time" -) - const ( VehicleMsgV2CSpeedUpdate ID = 0x36 VehicleMsgV2CStatusUpdate ID = 0x3f @@ -20,9 +15,9 @@ const ( type VehicleMsgSpeedUpdate struct { Size uint8 MsgID ID - DesiredSpeed Speed // mm/sec - Accel Accel // mm/sec² -- missing on older firmware - CurrentSpeed Speed // mm/sec -- missing on older firmware + DesiredSpeed MMperSec // mm/sec + Accel MMperSecSQ // mm/sec² -- missing on older firmware + CurrentSpeed MMperSec // mm/sec -- missing on older firmware } // 05 3F 01 00 01 00 @@ -41,8 +36,8 @@ type VehicleMsgLaneChangeUpdate struct { MsgID ID CurrentOffsetFromRoadCenter float32 TargetOffsetFromRoadCenter float32 - HorizontalSpeed Speed - VerticalSpeed Speed + HorizontalSpeed MMperSec + VerticalSpeed MMperSec LaneChangeID uint8 } @@ -50,14 +45,8 @@ type VehicleMsgLaneChangeUpdate struct { type VehicleMsgCollisionDetected struct { Size uint8 MsgID ID - WasSideOnCollision uint8 - WasFrontBackCollision uint8 -} - -type UT uint32 - -func (u UT) String() string { - return fmt.Sprintf("%v", time.Duration(u)*time.Microsecond) + WasSideOnCollision Bool + WasFrontBackCollision Bool } // 0B 86 11 00 26 08 00 00 13 10 00 00 cchii @@ -65,8 +54,8 @@ type VehicleMsgCycleOvertime struct { Size uint8 MsgID ID NumOvertimeCycles uint16 - AverageCycleTime UT // µsec - MaxCycleTime UT // µsec + AverageCycleTime MicroSec // µsec + MaxCycleTime MicroSec // µsec } // ID(201) | 04 15 03 00 00 -- cgit v1.2.3