luke-else/esp32_gps_display
1
0
Fork 0
generated from luke-else/esp32-std-template
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Chore: Cleaned up code

Browse Source
This commit is contained in:
Luke Else 2023-11-14 09:14:06 +00:00
parent 278444b620
commit 6b1a461e11
2 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/display/mod.rs
View File

@ -1,25 +1,21 @@
use crate::error::Error; use crate::error::Error;
use display_interface_i2c::I2CInterface;
use embedded_graphics::{ use embedded_graphics::{
prelude::*, mono_font::{ascii::FONT_10X20, MonoTextStyle},
mono_font::{ascii::FONT_7X13, ascii::FONT_10X20, MonoTextStyle},
pixelcolor::BinaryColor, pixelcolor::BinaryColor,
text::{Text, Alignment}, prelude::*,
text::{Alignment, Text},
}; };
use esp_idf_hal::{ use esp_idf_hal::i2c::I2cDriver;
self,
prelude::Peripherals, use ssd1306::{
units::Hertz, prelude::*, rotation::DisplayRotation, size::DisplaySize, I2CDisplayInterface, Ssd1306,
i2c::{I2cConfig, I2cDriver, I2c}
}; };
use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306}; // clear the stage of failure of the display
use display_interface_i2c;
/// Enum to make clear the stage of failure of the display
#[derive(Debug)] #[derive(Debug)]
pub enum DisplayError { pub enum DisplayError {
SetupError(display_interface::DisplayError), SetupError(display_interface::DisplayError),
@ -28,20 +24,24 @@ pub enum DisplayError {
} }
pub struct Display<'a, SIZE: DisplaySize> { pub struct Display<'a, SIZE: DisplaySize> {
display: Ssd1306<I2CInterface<I2cDriver<'a>>, SIZE, ssd1306::mode::BufferedGraphicsMode<SIZE>> display: Ssd1306<I2CInterface<I2cDriver<'a>>, SIZE, ssd1306::mode::BufferedGraphicsMode<SIZE>>,
} }
impl<'a, SIZE: DisplaySize> Display<'a, SIZE> impl<'a, SIZE: DisplaySize> Display<'a, SIZE> {
{
/// Function to create a new display interface abstraction /// Function to create a new display interface abstraction
pub fn new(i2c: I2cDriver<'a>, size: SIZE, rotation: DisplayRotation) -> Result<Display<'a, SIZE>, Error> { pub fn new(
i2c: I2cDriver<'a>,
size: SIZE,
rotation: DisplayRotation,
) -> Result<Display<'a, SIZE>, Error> {
// Construct the I2C driver into a display interface // Construct the I2C driver into a display interface
let interface = I2CDisplayInterface::new(i2c); let interface = I2CDisplayInterface::new(i2c);
// Construct display with new anew driver // Construct display with new anew driver
let mut display = Ssd1306::new(interface, size, rotation) let mut display = Ssd1306::new(interface, size, rotation).into_buffered_graphics_mode();
.into_buffered_graphics_mode(); display
display.init().map_err(|err| Error::DisplayError(DisplayError::SetupError(err)))?; .init()
.map_err(|err| Error::DisplayError(DisplayError::SetupError(err)))?;
Ok(Display { display }) Ok(Display { display })
} }
@ -50,21 +50,18 @@ impl<'a, SIZE: DisplaySize> Display<'a, SIZE>
pub fn draw(&mut self, text: &str) -> Result<(), Error> { pub fn draw(&mut self, text: &str) -> Result<(), Error> {
// Clear display ready for next write // Clear display ready for next write
let style = MonoTextStyle::new(&FONT_10X20, BinaryColor::On); let style = MonoTextStyle::new(&FONT_10X20, BinaryColor::On);
self.display.clear(BinaryColor::Off) self.display
.clear(BinaryColor::Off)
.map_err(|_| Error::DisplayError(DisplayError::DrawingError))?; .map_err(|_| Error::DisplayError(DisplayError::DrawingError))?;
// Draw text to Display // Draw text to Display
Text::with_alignment( Text::with_alignment(text, Point::new(64, 20), style, Alignment::Center)
text,
Point::new(64, 20),
style,
Alignment::Center,
)
.draw(&mut self.display) .draw(&mut self.display)
.map_err(|_| Error::DisplayError(DisplayError::DrawingError))?; .map_err(|_| Error::DisplayError(DisplayError::DrawingError))?;
//Flush data to the display //Flush data to the display
self.display.flush() self.display
.flush()
.map_err(|_| Error::DisplayError(DisplayError::FlushError))?; .map_err(|_| Error::DisplayError(DisplayError::FlushError))?;
Ok(()) Ok(())

12
src/main.rs
View File

@ -14,10 +14,10 @@ use error::Error;
mod appstate; mod appstate;
mod gps; mod gps;
use gps::{gpsdata, GPS}; use gps::GPS;
mod display; mod display;
use display::{Display, DisplayError}; use display::Display;
use ssd1306::prelude::*; use ssd1306::prelude::*;
fn main() -> Result<(), Error> { fn main() -> Result<(), Error> {
@ -42,19 +42,19 @@ fn main() -> Result<(), Error> {
let i2c = let i2c =
I2cDriver::new(peripherals.i2c0, sda, scl, &config).map_err(|err| Error::EspError(err))?; I2cDriver::new(peripherals.i2c0, sda, scl, &config).map_err(|err| Error::EspError(err))?;
// Prepare components for processing
let mut gps: GPS = GPS::new(peripherals.uart0, gps_rx)?; let mut gps: GPS = GPS::new(peripherals.uart0, gps_rx)?;
let mut display: Display<DisplaySize128x64> = let mut display: Display<DisplaySize128x64> =
Display::new(i2c, DisplaySize128x64, DisplayRotation::Rotate0)?; Display::new(i2c, DisplaySize128x64, DisplayRotation::Rotate0)?;
let mut app_state = appstate::AppState::default(); let mut _app_state = appstate::AppState::default();
loop { loop {
let text: &str;
// Get the latest data from GPS module and flush to Display // Get the latest data from GPS module and flush to Display
match gps.poll() { match gps.poll() {
Ok(res) => display.draw(&res.get_speed().as_str())?, Ok(res) => display.draw(&res.get_speed().as_str())?,
Err(e) => { Err(e) => {
display.draw("NO\nGPS\nDATA"); display.draw("NO\nGPS\nDATA")?;
eprintln!("{:?}", e);
} }
} }
} }