lap official_time

Author: durandom

telemetry/management/commands/replay.py

@@ -14,8 +14,8 @@
 
 from telemetry.influx import Influx
 from telemetry.models import Lap
-from telemetry.pitcrew.firehose import Firehose
-from telemetry.pitcrew.session_saver import SessionSaver
+# from telemetry.pitcrew.firehose import Firehose
+# from telemetry.pitcrew.session_saver import SessionSaver
 
 B4MAD_RACING_MQTT_HOST = os.environ.get("MOSQUITTO_MQTT_SERVICE_HOST", "telemetry.b4mad.racing")
 B4MAD_RACING_MQTT_PORT = int(os.environ.get("MOSQUITTO_MQTT_SERVICE_PORT", 31883))

telemetry/migrations/0034_lap_official_time.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1b1 on 2024-11-13 06:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("telemetry", "0033_alter_car_unique_together"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="lap",
+            name="official_time",
+            field=models.FloatField(default=0),
+        ),
+    ]

telemetry/models/lap.py

@@ -11,6 +11,7 @@ class Lap(ExportModelOperationsMixin("lap"), DirtyFieldsMixin, TimeStampedModel)
     start = models.DateTimeField(default=datetime.datetime.now)
     end = models.DateTimeField(default=datetime.datetime.now)
     time = models.FloatField(default=0)
+    official_time = models.FloatField(default=0)
     length = models.IntegerField(default=0)
     valid = models.BooleanField(default=False)
     completed = models.BooleanField(default=True)

telemetry/models/session.py

@@ -141,7 +141,7 @@ def analyze_rbr(self, telemetry, now):
 
         if not self.current_lap:
             # RBR has only one lap
-            self.new_lap(now, current_lap)
+            self.current_lap = self.new_lap(now, current_lap)
             self.previous_tick_time = -1
             self.previous_tick_distance = 100_000_000
             self.counter_time_not_updated = 0
@@ -168,7 +168,8 @@ def analyze_rbr(self, telemetry, now):
 
         if self.counter_time_not_updated > 10 and self.counter_distance_updated > 10:
             self.current_lap.completed = True
-            self.current_lap.end = now
+            self.current_lap.official_time = lap_time
+            self.current_lap.save_dirty_fields()
 
         self.previous_tick_time = lap_time
         self.previous_tick_distance = distance
@@ -215,13 +216,13 @@ def analyze_other(self, telemetry, now) -> None:
             if distance > self.current_lap.length:
                 self.current_lap.length = distance
             self.current_lap.valid = lap_is_valid
-            # self.current_lap.time = lap_time
+            self.current_lap.time = lap_time
 
         if lap_time_previous != self.previous_lap_time_previous:
             if self.previous_lap:
-                self.previous_lap.time = lap_time_previous
                 self.previous_lap.valid = previous_lap_was_valid
-                self.previous_lap.finished = True
+                self.previous_lap.official_time = lap_time_previous
+                self.previous_lap.completed = True
                 logger.debug(f"lap {self.previous_lap.number} time {lap_time_previous} valid {previous_lap_was_valid}")
                 self.previous_lap.save_dirty_fields()