jie/wisun_download
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

软件包名可配

Browse Source
This commit is contained in:
JIe 2025-04-21 10:55:21 +08:00
parent 8b1532d213
commit 906648bf93
2 changed files with 105 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/download_wrapper.rs
View File

@ -1,9 +1,9 @@
use std::fmt::Display;
use crate::download_wrapper::DownloadError::JlinkNotFindError;
use std::fmt::Display;
use std::fs;
use std::io::Write;
use std::path::PathBuf;
use std::process::Command;
use std::io::Write;
pub struct DownloadWrapper {
commander_path: PathBuf,
@ -44,13 +44,27 @@ pub enum DownloadError {
impl Default for DownloadWrapper {
fn default() -> Self {
let config_str = fs::read_to_string("config.json").unwrap();
let config: serde_json::Value = serde_json::from_str(&config_str).unwrap();
let bootloader_name = config["bootloader_name"]
.as_str()
.unwrap_or("RAWM00-2-0-0_silicon-wisun_bootloader_D20241008.s37")
.to_string();
let app_name = config["app_name"]
.as_str()
.unwrap_or("RAWM00-2-0-0_silicon-combine-V1-D20241230-BZ.hex")
.to_string();
let rail_name = config["rail_name"]
.as_str()
.unwrap_or("rail_soc_railtest_sisdk(silabs).hex")
.to_string();
Self {
commander_path: PathBuf::from(std::env::current_dir().unwrap())
.join("commander/Simplicity Commander/commander.exe"),
bin_path: PathBuf::from(std::env::current_dir().unwrap()).join("bin/"),
bootloader_name: String::from("RAWM00-2-0-0_silicon-wisun_bootloader_D20241008.s37"),
app_name: String::from("RAWM00-2-0-0_silicon-combine-V1-D20241230-BZ.hex"),
rail_name: String::from("rail_soc_railtest_sisdk(silabs).hex"),
bootloader_name,
app_name,
rail_name
}
}
}
@ -141,19 +155,21 @@ impl DownloadWrapper {
{
Err(DownloadError::EraseError)
} else {
let Some(label) = label else { return Err(DownloadError::NoLabel) };
let Some(label) = label else {
return Err(DownloadError::NoLabel);
};
match self.save_log(label, result_str.clone()) {
Ok(_) => {
Ok(result_str)
}
Err(_) => {
Err(DownloadError::DownloadBootloaderError)
}
Ok(_) => Ok(result_str),
Err(_) => Err(DownloadError::DownloadBootloaderError),
}
}
}
pub fn download(&self, download_type: DownloadType, label: Option<String>) -> Result<String, DownloadError> {
pub fn download(
&self,
download_type: DownloadType,
label: Option<String>,
) -> Result<String, DownloadError> {
let mut binding: PathBuf;
match download_type {
DownloadType::Bootloader => {
@ -192,14 +208,12 @@ impl DownloadWrapper {
{
Err(DownloadError::DownloadBootloaderError)
} else {
let Some(label) = label else { return Err(DownloadError::NoLabel) };
let Some(label) = label else {
return Err(DownloadError::NoLabel);
};
match self.save_log(label, result_str.clone()) {
Ok(_) => {
Ok(result_str)
}
Err(_) => {
Err(DownloadError::DownloadBootloaderError)
}
Ok(_) => Ok(result_str),
Err(_) => Err(DownloadError::DownloadBootloaderError),
}
}
}

22
src/main.rs
View File

@ -324,17 +324,17 @@ impl MainWindow {
}
}
add_log("连接成功".to_string());
match mes_service.get_order_number(mes_config.work_order.clone()){
Ok(batch) => {
label = batch + &label[label.len() - 6..];
add_log("获取订单号成功".to_string());
},
Err(e) =>{
add_log(e.to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
}
}
// match mes_service.get_order_number(mes_config.work_order.clone()){
// Ok(batch) => {
// label = batch + &label[label.len() - 6..];
// add_log("获取订单号成功".to_string());
// },
// Err(e) =>{
// add_log(e.to_string());
// sender.send(Message::DownloadEnd((label, false))).unwrap();
// return;
// }
// }
add_log("正在过站检测".to_string());
let check_result = mes_service.check_station(
mes_config.work_order.clone(),