rusefi
/
ultimate_nag52
mirror of https://github.com/rusefi/ultimate_nag52.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add FW type to updater

This commit is contained in:
Ashcon Mohseninia 2022-09-27 20:08:36 +01:00
parent 6a0712ba11
commit 4fb1b1a092
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config_app/src/ui/firmware_update.rs
View File

@ -118,11 +118,14 @@ impl InterfacePage for FwUpdateUI {
ui.label(RichText::new(format!(
"Firmware size: {} bytes
Firmware type: {}
Version: {}
IDF Version: {}
Compile time: {} on {}
",
firmware.raw.len(),
firmware.header.get_fw_name(),
firmware.header.get_version(),
firmware.header.get_idf_version(),
firmware.header.get_time(),

6
config_app/src/usb_hw/flasher/bin.rs
View File

@ -31,6 +31,9 @@ impl FirmwareHeader {
pub fn get_time(&self) -> String {
String::from_utf8_lossy(&self.time).to_string()
}
pub fn get_fw_name(&self) -> String {
String::from_utf8_lossy(&self.project_name).to_string()
}
}
#[derive(Debug, Clone)]
@ -59,7 +62,7 @@ impl std::fmt::Display for FirmwareLoadError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
FirmwareLoadError::InvalidHeader => write!(f, "Invalid firmware header"),
FirmwareLoadError::NotValid(r) => write!(f, "Invalid firwmare: {}", r),
FirmwareLoadError::NotValid(r) => write!(f, "Invalid firmware: {}", r),
FirmwareLoadError::IoError(io) => write!(f, "IO Error {}", io),
}
}
@ -91,7 +94,6 @@ pub fn load_binary(path: String) -> FirwmareLoadResult<Firmware> {
}
// Ok, read the header
let header: FirmwareHeader = unsafe { std::ptr::read(buf[header_start_idx..].as_ptr() as *const _ ) };
println!("BUF {:02X?}", &buf[0..24]);
Ok(
Firmware {
raw: buf,