diff --git a/core/format.go b/core/sensordata.go similarity index 93% rename from core/format.go rename to core/sensordata.go index 4124f64..a2cb8cc 100644 --- a/core/format.go +++ b/core/sensordata.go @@ -9,19 +9,6 @@ import ( "time" ) -/*{ -"smartphone": { -// hier daten von hyperimu -}, -"serial": { -// hier Daten von M8U: -"timestamp": 37539672354 -"position": [0, 0, 0], -"orientation": [0, 0, 0] -} -} -*/ - type sourceId string const ( @@ -81,7 +68,7 @@ func (s Sensordata) Consolidate2(n Sensordata) Sensordata { if n.Position == null.Position { n.Position = s.Position } - if n.Orientation == null.Orientation{ + if n.Orientation == null.Orientation { n.Orientation = s.Orientation } return n @@ -144,10 +131,10 @@ func convertIPhoneSensorLog(jsonData []byte) (*Sensordata, error) { roll := gjson.Get(string(jsonData), "motionRoll").Float() * 180 / math.Pi yaw := gjson.Get(string(jsonData), "motionYaw").Float() * 180 / math.Pi sd := &Sensordata{ - SourceId: SOURCE_TCP, + SourceId: SOURCE_TCP, Timestamp: int64(timestamp * float64(time.Second)), //Timestamp: time.Unix(0, prep.Timestamp * int64(time.Millisecond)), - Position: [3]float64{lat, lon, alt}, + Position: [3]float64{lat, lon, alt}, Orientation: [3]float64{pitch, roll, yaw}, } //log.Println(string(pretty.Pretty(jsonData))) @@ -155,7 +142,6 @@ func convertIPhoneSensorLog(jsonData []byte) (*Sensordata, error) { return sd, nil } - func convertAndroidHyperImu(jsonData []byte) (*Sensordata, error) { timestamp := gjson.Get(string(jsonData), "Timestamp").Int() lat := gjson.Get(string(jsonData), "GPS.0").Float() @@ -166,10 +152,10 @@ func convertAndroidHyperImu(jsonData []byte) (*Sensordata, error) { yaw := gjson.Get(string(jsonData), "orientation.2").Float() sd := &Sensordata{ - SourceId: SOURCE_TCP, + SourceId: SOURCE_TCP, Timestamp: timestamp * int64(time.Millisecond), //Timestamp: time.Unix(0, prep.Timestamp * int64(time.Millisecond)), - Position: [3]float64{lat, lon, alt}, + Position: [3]float64{lat, lon, alt}, Orientation: [3]float64{pitch, roll, yaw}, } return sd, nil