diff --git a/src/main.rs b/src/main.rs index add051f..ef0313a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -58,6 +58,7 @@ mod io; mod screen; #[cfg(feature = "gnss_ubx")] mod ubx; +mod util; const WIFI_CHANNEL: radio::Channel = 180; const WIFI_TXPOWER: i8 = 10; // dBm, 2..20 diff --git a/src/screen.rs b/src/screen.rs index bd3d11b..ea7c675 100644 --- a/src/screen.rs +++ b/src/screen.rs @@ -614,41 +614,48 @@ where self.clear_all()?; - let sig_width = i32::from(self.size.width) / 3; - let circle_dia = 50; - let circle_margin = (sig_width - circle_dia) / 2; - - for (idx, style) in [Self::RD_STYLE, Self::YE_STYLE, Self::GN_STYLE] - .iter() - .enumerate() + #[cfg(feature = "spat")] { - #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)] - let offset = (idx as i32) * sig_width; + let sig_width = i32::from(self.size.width) / 3; + let circle_dia = 50; + let circle_margin = (sig_width - circle_dia) / 2; - primitives::Circle::new( - geometry::Point::new(offset + circle_margin, 15 + self.size.offset_top), - circle_dia.cast_unsigned(), + for (idx, style) in [Self::RD_STYLE, Self::YE_STYLE, Self::GN_STYLE] + .iter() + .enumerate() + { + #[allow(clippy::cast_possible_truncation, clippy::cast_possible_wrap)] + let offset = (idx as i32) * sig_width; + + primitives::Circle::new( + geometry::Point::new(offset + circle_margin, 15 + self.size.offset_top), + circle_dia.cast_unsigned(), + ) + .into_styled(*style) + .draw(&mut self.target)?; + } + + // draw welcome text + let centerline = i32::from(self.size.width) / 2; + + embedded_graphics::image::Image::new( + &self.bike_image, + geometry::Point::new(centerline - (45 / 2) + 1, 75 + self.size.offset_top), + ) + .draw(&mut self.target)?; + + text::Text::with_alignment( + "C-ITS Signal Phase\nWaiting for GNSS...", + geometry::Point::new(centerline, 130 + self.size.offset_top), + text_style, + text::Alignment::Center, ) - .into_styled(*style) .draw(&mut self.target)?; } - // draw welcome text - let centerline = i32::from(self.size.width) / 2; - - embedded_graphics::image::Image::new( - &self.bike_image, - geometry::Point::new(centerline - (45 / 2) + 1, 75 + self.size.offset_top), - ) - .draw(&mut self.target)?; - - text::Text::with_alignment( - "C-ITS Signal Phase\nWaiting for GNSS...", - geometry::Point::new(centerline, 130 + self.size.offset_top), - text_style, - text::Alignment::Center, - ) - .draw(&mut self.target)?; + // show features + let enabled_features = crate::util::get_rx_feature_list(); + let enabled_tx_features = crate::util::get_tx_feature_list(); Ok(()) }