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: code cleaning

Browse Source
This commit is contained in:
Luke Else 2023-11-14 09:43:31 +00:00
parent 6b1a461e11
commit a2a9abc4b3
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gps/gpsdata.rs
View File

@ -16,12 +16,13 @@ pub struct GpsData {
/// Altitude reported from GPS location /// Altitude reported from GPS location
altitude: Option<f64>, altitude: Option<f64>,
/// Timestamp of the last report /// Timestamp of the last report
timestamp: Option<DateTime<Utc>> timestamp: Option<DateTime<Utc>>,
} }
impl ToString for GpsData { impl ToString for GpsData {
fn to_string(&self) -> String { fn to_string(&self) -> String {
format!("Latitude: {:.4?} \nLongitude: {:.4?} \nSpeed: {:.1?}mph \nAltitude: {:.1?}m", format!(
"Latitude: {:.4?} \nLongitude: {:.4?} \nSpeed: {:.1?}mph \nAltitude: {:.1?}m",
self.latitude.unwrap_or_default(), self.latitude.unwrap_or_default(),
self.longitude.unwrap_or_default(), self.longitude.unwrap_or_default(),
self.speed.unwrap_or_default(), self.speed.unwrap_or_default(),
@ -40,7 +41,8 @@ impl GpsData {
// Format the nmea buffer into a usable string // Format the nmea buffer into a usable string
let nmea_raw = String::from_utf8(buf.to_owned()) let nmea_raw = String::from_utf8(buf.to_owned())
.map_err(|_| GpsError::ReadError()).unwrap_or_default(); .map_err(|_| GpsError::ReadError())
.unwrap_or_default();
let nmea_vec: Vec<&str> = nmea_raw.split('$').collect(); let nmea_vec: Vec<&str> = nmea_raw.split('$').collect();
// Loop through each sentence and use the information to update GPS data // Loop through each sentence and use the information to update GPS data
@ -57,7 +59,9 @@ impl GpsData {
let nmea = match nmea_parser.parse_sentence(sentence.as_str()) { let nmea = match nmea_parser.parse_sentence(sentence.as_str()) {
Ok(nmea) => nmea, Ok(nmea) => nmea,
// Don't continue processing a sentence if we know that it isn't supported // Don't continue processing a sentence if we know that it isn't supported
Err(_) => { continue; } Err(_) => {
continue;
}
}; };
// print decoded gps data to serial // print decoded gps data to serial
@ -67,7 +71,7 @@ impl GpsData {
// Update Altitude above ground level // Update Altitude above ground level
self.altitude = match gga.altitude { self.altitude = match gga.altitude {
Some(_) => gga.altitude, Some(_) => gga.altitude,
None => self.altitude None => self.altitude,
}; };
} }
nmea_parser::ParsedMessage::Gll(gll) => { nmea_parser::ParsedMessage::Gll(gll) => {
@ -88,14 +92,16 @@ impl GpsData {
None => {} None => {}
} }
} }
}, }
nmea_parser::ParsedMessage::Rmc(rms) => { nmea_parser::ParsedMessage::Rmc(rms) => {
// Update Ground Speed // Update Ground Speed
match rms.sog_knots { match rms.sog_knots {
Some(_) => self.speed = Some(knots_to_mph(rms.sog_knots.unwrap_or_default())), Some(_) => {
self.speed = Some(knots_to_mph(rms.sog_knots.unwrap_or_default()))
}
None => {} None => {}
} }
}, }
_ => {} _ => {}
} }
} }
@ -104,11 +110,8 @@ impl GpsData {
} }
/// Function to get a &str of the current speed reported by the GPS module /// Function to get a &str of the current speed reported by the GPS module
pub fn get_speed(&self) -> String { pub fn get_speed(&self) -> Option<f64> {
match self.speed { self.speed
Some(speed) => format!("{:.2?}mph\n", speed),
None => format!("AWAITING\nGPS\nDATA")
}
} }
} }

18
src/main.rs
View File

@ -14,7 +14,7 @@ use error::Error;
mod appstate; mod appstate;
mod gps; mod gps;
use gps::GPS; use gps::{gpsdata::GpsData, GPS};
mod display; mod display;
use display::Display; use display::Display;
@ -47,15 +47,21 @@ fn main() -> Result<(), Error> {
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();
const NO_DATA: &str = "NO\nGPS\nDATA";
loop { loop {
let text: String;
// 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() { text = match gps.poll() {
Ok(res) => display.draw(&res.get_speed().as_str())?, Ok(res) => match res.get_speed() {
Some(s) => format!("{:.2} MPH", s),
None => NO_DATA.to_string(),
},
Err(e) => { Err(e) => {
display.draw("NO\nGPS\nDATA")?;
eprintln!("{:?}", e); eprintln!("{:?}", e);
} NO_DATA.to_string()
} }
};
display.draw(text.as_str())?
} }
} }