11use std:: time:: Duration ;
2+ use komsi:: vehicle:: VehicleState ;
23use the_bus_telemetry:: api:: { get_current_vehicle_name, get_vehicle, RequestConfig } ;
34use the_bus_telemetry:: api2vehicle:: get_vehicle_state_from_api;
4- use the_bus_telemetry:: vehicle:: { init_vehicle_state, print_vehicle_state} ;
5- use the_bus_telemetry:: vehicle_diff:: compare_vehicle_states;
5+
66use tokio:: time:: sleep;
77
88#[ tokio:: main]
@@ -19,7 +19,7 @@ async fn main() {
1919 let mut config = RequestConfig :: new ( ) ;
2020 // config.debugging=true;
2121
22- let mut vehicle_state = init_vehicle_state ( ) ;
22+ let mut vehicle_state = VehicleState :: default ( ) ;
2323
2424 let mut zaehler = 0 ;
2525
@@ -32,7 +32,7 @@ async fn main() {
3232
3333 if vehicle_name. is_empty ( ) {
3434 println ! ( "No vehicle found, not in bus." ) ;
35- vehicle_state = init_vehicle_state ( ) ;
35+ vehicle_state = VehicleState :: default ( ) ;
3636 old_vehicle_name = "" . to_string ( ) ;
3737 sleep ( interval_error) . await ;
3838 continue ;
@@ -68,10 +68,10 @@ async fn main() {
6868
6969 let new_vehicle_state = get_vehicle_state_from_api ( vehicle) ;
7070 if config. debugging {
71- print_vehicle_state ( & new_vehicle_state) ;
71+ new_vehicle_state. print ( ) ;
7272 }
7373
74- compare_vehicle_states ( & vehicle_state , & new_vehicle_state, false ) ;
74+ vehicle_state . compare ( & new_vehicle_state, false , None ) ;
7575
7676 vehicle_state = new_vehicle_state;
7777
0 commit comments