Fixed Logging

Assets/PolygonCity/Models/Collisions/SM_Prop_BusStop_01_Convex 1.asset

@@ -3,30 +3,29 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5b71ad40e238046238f9b0c6f33c3791, type: 3}
+  m_Script: {fileID: 0}
   m_Name: SM_Prop_BusStop_01_Convex 1
   m_EditorClassIdentifier: 
-  ConvexMeshes:
-  - {fileID: 43257271686295472}
-  - {fileID: 43379027713151126}
-  HashOfSourceMeshes: 245df48d806a61dcfa487cdbffffffff
 --- !u!43 &43257271686295472
 Mesh:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: Generated convex submesh 1
-  serializedVersion: 8
+  serializedVersion: 10
   m_SubMeshes:
   - serializedVersion: 2
     firstByte: 0
     indexCount: 84
     topology: 0
+    baseVertex: 0
     firstVertex: 0
     vertexCount: 16
     localAABB:
@@ -40,14 +39,17 @@ Mesh:
   m_BindPose: []
   m_BoneNameHashes: 
   m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
   m_MeshCompression: 0
   m_IsReadable: 1
   m_KeepVertices: 1
   m_KeepIndices: 1
+  m_IndexFormat: 0
   m_IndexBuffer: 030009000f00020003000400030002000800020005000800050006000800080006000900060005000900030008000900090005000a00020001000a00050002000a00000009000a00040000000b00070004000b000a0007000b00010002000c00020004000c00040007000c000a0001000c0007000a000c00030000000d00000004000d00040003000d0000000a000e000b0000000e000a000b000e00000003000f00090000000f00
-  m_Skin: []
   m_VertexData:
-    m_CurrentChannels: 1
+    serializedVersion: 3
     m_VertexCount: 16
     m_Channels:
     - stream: 0
@@ -82,6 +84,30 @@ Mesh:
       offset: 0
       format: 0
       dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
     m_DataSize: 192
     _typelessdata: f94780bfc0953bbd04fb4c3d309909406e851840babddcbed8140a400ec91840007f67bf8ea712c0ec781d401eece6be517bf73fec781d40c8d0313f96c105408ac3e03c007f67bf82150ac010c5e03cf87e67bf591c0740e659b63e7081273f82150ac00bc91840f87e67bf8ea712c0c0953bbd2ac905bfe30e0e40c0953bbd2ac905bf517bf73f18f19f3ec8d0313f591c0740d38c19407081273ff94780bf619a2b3f04fb4c3d9946803fc0953bbd04fb4c3d8ea712c03ae318401eece6be
   m_CompressedMesh:
@@ -142,19 +168,27 @@ Mesh:
   m_MeshUsageFlags: 0
   m_BakedConvexCollisionMesh: 
   m_BakedTriangleCollisionMesh: 
-  m_MeshOptimized: 0
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: -1
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
 --- !u!43 &43379027713151126
 Mesh:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: Generated convex submesh 2
-  serializedVersion: 8
+  serializedVersion: 10
   m_SubMeshes:
   - serializedVersion: 2
     firstByte: 0
     indexCount: 84
     topology: 0
+    baseVertex: 0
     firstVertex: 0
     vertexCount: 16
     localAABB:
@@ -168,14 +202,17 @@ Mesh:
   m_BindPose: []
   m_BoneNameHashes: 
   m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
   m_MeshCompression: 0
   m_IsReadable: 1
   m_KeepVertices: 1
   m_KeepIndices: 1
+  m_IndexFormat: 0
   m_IndexBuffer: 000009000f00020001000500000002000600020003000600020000000800040008000900000006000a00060003000a00030007000a00070000000a00050001000b00040009000b00010002000c00020008000c00080004000c000b0001000c0004000b000c00000007000d00090000000d000b0009000d000b000d000e00030002000e00020005000e00070003000e0005000b000e000d0007000e00080000000f00090008000f00
-  m_Skin: []
   m_VertexData:
-    m_CurrentChannels: 1
+    serializedVersion: 3
     m_VertexCount: 16
     m_Channels:
     - stream: 0
@@ -210,6 +247,30 @@ Mesh:
       offset: 0
       format: 0
       dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
     m_DataSize: 192
     _typelessdata: 8ea712c004b746401025f93d0c040cc0ca681e4078a66abf8ea712c0d7791d407af3e6be92770940e50f2240bc711f3f92770940f28b3d40ecc83cbf0c040c40ca681e4078a66abf8ea712c0e50f2240bc711f3f92770940f28b3d402d8af53e8ea712c0f28b3d40ecc83cbf9277094004b74640309a9dbe8ea712c0f0623440bc711f3f8ea71240eaa42640d6c673bf8ea712c0e8613440766b61bf9277094004b746401025f93d8ea71240d7791d407af3e6be8ea712c004b74640309a9dbe
   m_CompressedMesh:
@@ -270,4 +331,10 @@ Mesh:
   m_MeshUsageFlags: 0
   m_BakedConvexCollisionMesh: 
   m_BakedTriangleCollisionMesh: 
-  m_MeshOptimized: 0
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: -1
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 

Assets/Scenes/MainScene.unity

@@ -277114,6 +277114,7 @@ GameObject:
   - component: {fileID: 1169776439}
   - component: {fileID: 1169776438}
   - component: {fileID: 1169776437}
+  - component: {fileID: 1169776441}
   m_Layer: 0
   m_Name: Logging
   m_TagString: Untagged
@@ -277200,6 +277201,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   bike: {fileID: 1689915695}
+--- !u!114 &1169776441
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1169776434}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20f5c412b40b43bcbbbf4aa01b9051d1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1169810052
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -321848,7 +321861,6 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 5420001012381158399}
   - {fileID: 811644742014359626}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -453866,12 +453878,12 @@ PrefabInstance:
     - target: {fileID: 4988978072042319893, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4988978072042319893, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: steer
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4988978072042319893, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
@@ -453888,6 +453900,11 @@ PrefabInstance:
       propertyPath: frontWheelTrackerConfig.frontWheelTracker
       value: 
       objectReference: {fileID: 504796931}
+    - target: {fileID: 4988978072042319893, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
+        type: 3}
+      propertyPath: accelerate
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4988978072042319894, guid: 3b07d6594636ab04d9c1fac04c1cde7e,
         type: 3}
       propertyPath: m_Enabled
@@ -507858,7 +507875,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1357559321}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &825695653624690960
 PrefabInstance:
@@ -513712,23 +513729,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1210001036159969342}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1262068930449296894
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5420001012381158399}
-  - component: {fileID: 6606347374356133377}
-  m_Layer: 0
-  m_Name: CoinPool
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
 --- !u!1001 &1270431729785388369
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -526477,20 +526477,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 5372707935723358955}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &5420001012381158399
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1262068930449296894}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1357559321}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &5422482461786211898
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -530526,18 +530512,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 6604488066859536588}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &6606347374356133377
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1262068930449296894}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b2243e4869d84bebb8546c26e68f7c63, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &6606720722099106110
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/Logging/PolarAccDataLogger.cs

@@ -42,7 +42,7 @@ namespace Logging
 
         private IDisposable sub;
 
-        public override void Start()
+        public override async void Start()
         {
             base.Start();
             timeSync = new TimeSync
@@ -51,6 +51,7 @@ namespace Logging
                 DifDataStreamStart = -1
             };
             var bikeSensorData = BikeSensorData.Instance;
+            await bikeSensorData.PolarReceiverAvailable;
             sub = bikeSensorData.RawAccData?.Subscribe(data => OnData(data));
         }
 

Assets/Scripts/Logging/PolarEcgDataLogger.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using Sensors;
 using Sensors.Polar;
 using UniRx;
+using UnityEngine;
 
 namespace Logging
 {
@@ -36,7 +37,7 @@ namespace Logging
 
         private IDisposable sub;
 
-        public override void Start()
+        public override async void Start()
         {
             base.Start();
             timeSync = new TimeSync
@@ -45,6 +46,7 @@ namespace Logging
                 DifDataStreamStart = -1
             };
             var bikeSensorData = BikeSensorData.Instance;
+            await bikeSensorData.PolarReceiverAvailable;
             sub = bikeSensorData.RawEcgData?.Subscribe(data => OnData(data));
         }
 

Assets/Scripts/Sensors/BikeSensorData.cs

@@ -5,6 +5,7 @@ using ANT_Managed_Library;
 using JetBrains.Annotations;
 using Sensors.ANT;
 using Sensors.Polar;
+using UniRx;
 using UnityEngine;
 
 namespace Sensors
@@ -35,9 +36,13 @@ namespace Sensors
         [CanBeNull] public IObservable<AccData> RawAccData => polarReceiver?.RawAccData;
 
         public PolarSensorConfig? PolarConfig => polarReceiver?.SensorConfig;
-        
+
+        private readonly Subject<object> polarReceiverAvailable = new Subject<object>();
+        public Task PolarReceiverAvailable { get; }
+
         private BikeSensorData()
         {
+            PolarReceiverAvailable = polarReceiverAvailable.ToTask();
         }
 
         public void StartListening(SpeedSensorConfig? speedSensorConfig = null,
@@ -92,6 +97,7 @@ namespace Sensors
                 try
                 {
                     powerMeterReceiver.StartScan();
+                    
                 }
                 catch (ANT_Exception e)
                 {
@@ -110,6 +116,8 @@ namespace Sensors
                 }
                 polarReceiver = new PolarReceiver(polarSensorConfig.Value); //automatically starts listening
                 polarReceiver.StartListening();
+                polarReceiverAvailable.OnNext(null);
+                polarReceiverAvailable.OnCompleted();
             }
         
         }
@@ -118,6 +126,7 @@ namespace Sensors
         {
             polarReceiver?.Dispose();
             //TODO: also dispose ANT sensors?
+            polarReceiverAvailable.Dispose();
 
             polarReceiver = null;
             speedSensorReceiver = null;

Assets/Scripts/Sensors/Polar/UdpConnection.cs

@@ -50,7 +50,7 @@ namespace Sensors.Polar
                 
                 }
             
-                Debug.Log($"RECEIVED DATA VIA UDP: {receivedStr}");
+                //Debug.Log($"RECEIVED DATA VIA UDP: {receivedStr}");
             }
         });