check if race is restarted/rewound or if new race

This commit is contained in:
Alex Janka 2022-10-19 10:49:13 +11:00
parent 599df22d8b
commit 9756b5d2ea
2 changed files with 25 additions and 3 deletions

@ -1 +1 @@
Subproject commit d46772089f87b13268f1cf8da5bd61cad66eb7d9 Subproject commit 708149c87b453d677399feb0a97dba65baf6997d

View file

@ -1,8 +1,8 @@
use fh5_common::{Filename, Telemetry}; use fh5_common::{is_position_equal, Filename, Telemetry};
use std::fs::OpenOptions; use std::fs::OpenOptions;
use std::io::Write; use std::io::Write;
use std::mem::size_of; use std::mem::{size_of, swap};
use std::net::UdpSocket; use std::net::UdpSocket;
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
use std::os::unix::fs::OpenOptionsExt; use std::os::unix::fs::OpenOptionsExt;
@ -42,6 +42,8 @@ struct Status {
struct NextFile { struct NextFile {
writer: csv::Writer<Vec<u8>>, writer: csv::Writer<Vec<u8>>,
name: Filename, name: Filename,
initial: Telemetry,
last_race_time: f32,
} }
fn listen(socket: &net::UdpSocket, mut buffer: &mut [u8], last_size: &mut usize) -> usize { fn listen(socket: &net::UdpSocket, mut buffer: &mut [u8], last_size: &mut usize) -> usize {
@ -109,6 +111,24 @@ fn main() {
} }
match status.next { match status.next {
Some(ref mut next) => { Some(ref mut next) => {
if deserialised.current_race_time < next.last_race_time
&& deserialised.current_race_time < 1.
{
if is_position_equal(&next.initial, &deserialised, 1.) {
// then it's just rewound to the start
} else {
// new race
verbose_print!(
args,
"{}: back to back race",
&Local::now().format("%A %e %B - %H:%M:%S").to_string()
);
let mut new = begin_race(&deserialised);
swap(next, &mut new);
finish_race(&args, new);
}
}
next.last_race_time = deserialised.current_race_time;
continue_race(&deserialised, &mut next.writer); continue_race(&deserialised, &mut next.writer);
} }
None => { None => {
@ -131,6 +151,8 @@ fn begin_race(deserialised: &Telemetry) -> NextFile {
NextFile { NextFile {
writer: csv::Writer::from_writer(vec![]), writer: csv::Writer::from_writer(vec![]),
name: Filename::new_filename(deserialised.car_performance_index, deserialised.car_ordinal), name: Filename::new_filename(deserialised.car_performance_index, deserialised.car_ordinal),
initial: deserialised.clone(),
last_race_time: deserialised.current_race_time,
} }
} }