feat: 添加粒度更细的before/after判断 (#48)

HalfSweet · web-flow · commit 0c830f1c7f0b · 2025-11-17T16:41:52.000+08:00
diff --git a/README.md b/README.md
@@ -53,8 +53,8 @@ sftool [选项] 命令 [命令选项]
 - `-m, --memory <MEMORY>`: 存储类型 [nor, nand, sd] (默认: nor)
 - `-p, --port <PORT>`: 串行端口设备路径
 - `-b, --baud <BAUD>`: 闪存/读取时使用的串口波特率 (默认: 1000000)
-- `--before <OPERATION>`: 连接芯片前的操作 [no_reset, soft_reset] (默认: no_reset)
-- `--after <OPERATION>`: 工具完成后的操作 [no_reset, soft_reset] (默认: soft_reset)
+- `--before <OPERATION>`: 连接芯片前的操作 [default_reset, no_reset, no_reset_no_sync] (默认: default_reset)
+- `--after <OPERATION>`: 工具完成后的操作 [soft_reset, no_reset] (默认: soft_reset)
 - `--connect-attempts <ATTEMPTS>`: 连接尝试次数，负数或0表示无限次 (默认: 7)
 - `--compat` : 兼容模式，如果经常出现超时错误或下载后校验失败，则应打开此选项。
 
diff --git a/README_EN.md b/README_EN.md
@@ -55,8 +55,8 @@ sftool [OPTIONS] COMMAND [COMMAND OPTIONS]
 - `-m, --memory <MEMORY>`: Storage type [nor, nand, sd] (default: nor)
 - `-p, --port <PORT>`: Serial port device path
 - `-b, --baud <BAUD>`: Baud rate used for flashing/reading (default: 1000000)
-- `--before <OPERATION>`: Operation before connecting to the chip [no_reset, soft_reset] (default: no_reset)
-- `--after <OPERATION>`: Operation after the tool completes [no_reset, soft_reset] (default: soft_reset)
+- `--before <OPERATION>`: Operation before connecting to the chip [default_reset, no_reset, no_reset_no_sync] (default: default_reset)
+- `--after <OPERATION>`: Operation after the tool completes [soft_reset, no_reset] (default: soft_reset)
 - `--connect-attempts <ATTEMPTS>`: Number of connection attempts, negative or 0 means infinite (default: 7)
 - `--compat` : Compatibility mode, should be turned on if timeout errors or verification failures occur frequently after downloading.
 
diff --git a/sftool-lib/src/lib.rs b/sftool-lib/src/lib.rs
@@ -31,13 +31,38 @@ use std::sync::Arc;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "cli", derive(clap::ValueEnum))]
-pub enum Operation {
+pub enum BeforeOperation {
+    #[cfg_attr(feature = "cli", clap(name = "default_reset"))]
+    DefaultReset,
     #[cfg_attr(feature = "cli", clap(name = "no_reset"))]
-    None,
+    NoReset,
+    #[cfg_attr(feature = "cli", clap(name = "no_reset_no_sync"))]
+    NoResetNoSync,
+}
+
+impl BeforeOperation {
+    pub fn requires_reset(&self) -> bool {
+        matches!(self, Self::DefaultReset)
+    }
+
+    pub fn should_download_stub(&self) -> bool {
+        !matches!(self, Self::NoResetNoSync)
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "cli", derive(clap::ValueEnum))]
+pub enum AfterOperation {
+    #[cfg_attr(feature = "cli", clap(name = "no_reset"))]
+    NoReset,
     #[cfg_attr(feature = "cli", clap(name = "soft_reset"))]
     SoftReset,
-    #[cfg_attr(feature = "cli", clap(name = "default_reset"))]
-    DefaultReset,
+}
+
+impl AfterOperation {
+    pub fn requires_soft_reset(&self) -> bool {
+        matches!(self, Self::SoftReset)
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -54,7 +79,7 @@ pub enum ChipType {
 #[derive(Clone)]
 pub struct SifliToolBase {
     pub port_name: String,
-    pub before: Operation,
+    pub before: BeforeOperation,
     pub memory_type: String,
     pub baud: u32,
     pub connect_attempts: i8,
@@ -67,7 +92,7 @@ impl SifliToolBase {
     /// 创建一个使用默认空进度回调的 SifliToolBase
     pub fn new_with_no_progress(
         port_name: String,
-        before: Operation,
+        before: BeforeOperation,
         memory_type: String,
         baud: u32,
         connect_attempts: i8,
@@ -90,7 +115,7 @@ impl SifliToolBase {
     /// 创建一个使用自定义进度回调的 SifliToolBase
     pub fn new_with_progress(
         port_name: String,
-        before: Operation,
+        before: BeforeOperation,
         memory_type: String,
         baud: u32,
         connect_attempts: i8,
diff --git a/sftool-lib/src/sf32lb52/mod.rs b/sftool-lib/src/sf32lb52/mod.rs
@@ -123,7 +123,6 @@ impl SF32LB52Tool {
     }
 
     fn attempt_connect(&mut self) -> Result<()> {
-        use crate::Operation;
         use crate::common::sifli_debug::{SifliUartCommand, SifliUartResponse};
 
         let infinite_attempts = self.base.connect_attempts <= 0;
@@ -133,7 +132,7 @@ impl SF32LB52Tool {
             Some(self.base.connect_attempts)
         };
         loop {
-            if self.base.before == Operation::DefaultReset {
+            if self.base.before.requires_reset() {
                 // 使用RTS引脚复位
                 self.port.write_request_to_send(true)?;
                 std::thread::sleep(Duration::from_millis(100));
@@ -280,7 +279,9 @@ impl SifliTool for SF32LB52Tool {
         std::thread::sleep(Duration::from_millis(100));
 
         let mut tool = Box::new(Self { base, port });
-        tool.download_stub().expect("Failed to download stub");
+        if tool.base.before.should_download_stub() {
+            tool.download_stub().expect("Failed to download stub");
+        }
         tool
     }
 }
diff --git a/sftool-lib/src/sf32lb56/mod.rs b/sftool-lib/src/sf32lb56/mod.rs
@@ -276,7 +276,6 @@ impl SF32LB56Tool {
     }
 
     pub fn attempt_connect(&mut self) -> Result<()> {
-        use crate::Operation;
         use crate::common::sifli_debug::{SifliUartCommand, SifliUartResponse};
 
         let infinite_attempts = self.base.connect_attempts <= 0;
@@ -286,7 +285,7 @@ impl SF32LB56Tool {
             Some(self.base.connect_attempts)
         };
         loop {
-            if self.base.before == Operation::DefaultReset {
+            if self.base.before.requires_reset() {
                 // 使用RTS引脚复位
                 self.port.write_request_to_send(true)?;
                 std::thread::sleep(Duration::from_millis(100));
@@ -430,7 +429,9 @@ impl SifliTool for SF32LB56Tool {
         std::thread::sleep(Duration::from_millis(100));
 
         let mut tool = Box::new(Self { base, port });
-        tool.download_stub().expect("Failed to download stub");
+        if tool.base.before.should_download_stub() {
+            tool.download_stub().expect("Failed to download stub");
+        }
         tool
     }
 }
diff --git a/sftool-lib/src/sf32lb58/mod.rs b/sftool-lib/src/sf32lb58/mod.rs
@@ -340,7 +340,9 @@ impl SifliTool for SF32LB58Tool {
         std::thread::sleep(Duration::from_millis(100));
 
         let mut tool = Box::new(Self { base, port });
-        tool.download_stub().expect("Failed to download stub");
+        if tool.base.before.should_download_stub() {
+            tool.download_stub().expect("Failed to download stub");
+        }
         tool
     }
 }
diff --git a/sftool/README.md b/sftool/README.md
@@ -63,8 +63,8 @@ sftool [OPTIONS] COMMAND [COMMAND_OPTIONS]
 - `-m, --memory <MEMORY>`: Memory type [nor, nand, sd] (default: nor)
 - `-p, --port <PORT>`: Serial port device path
 - `-b, --baud <BAUD>`: Baud rate for flash/read operations (default: 1000000)
-- `--before <OPERATION>`: Operation before connecting to chip [no_reset, soft_reset] (default: no_reset)
-- `--after <OPERATION>`: Operation after tool completion [no_reset, soft_reset] (default: soft_reset)
+- `--before <OPERATION>`: Operation before connecting to the chip [default_reset, no_reset, no_reset_no_sync] (default: default_reset)
+- `--after <OPERATION>`: Operation after tool completion [soft_reset, no_reset] (default: soft_reset)
 - `--connect-attempts <ATTEMPTS>`: Number of connection attempts, negative or 0 for infinite (default: 7)
 - `--compat`: Compatibility mode, enable if you frequently encounter timeout errors or checksum failures
 
diff --git a/sftool/sftool_param_schema.json b/sftool/sftool_param_schema.json
@@ -26,13 +26,13 @@
     },
     "before": {
       "type": "string",
-      "enum": [ "no_reset", "soft_reset", "default_reset" ],
+      "enum": [ "default_reset", "no_reset", "no_reset_no_sync" ],
       "default": "default_reset",
       "description": "Action before connecting to the chip"
     },
     "after": {
       "type": "string",
-      "enum": [ "no_reset", "soft_reset", "default_reset" ],
+      "enum": [ "no_reset", "soft_reset" ],
       "default": "soft_reset",
       "description": "Action after sftool finishes"
     },
@@ -193,4 +193,4 @@
       "additionalProperties": false
     }
   }
-}
+}
diff --git a/sftool/src/config.rs b/sftool/src/config.rs
@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use sftool_lib::{ChipType, Operation};
+use sftool_lib::{AfterOperation, BeforeOperation, ChipType};
 
 /// 应用程序的默认配置值
 pub struct Defaults;
@@ -162,22 +162,21 @@ impl SfToolConfig {
         }
     }
 
-    /// 将字符串转换为 Operation 枚举
-    pub fn parse_before(&self) -> Result<Operation, String> {
+    /// 将字符串转换为 before 操作枚举
+    pub fn parse_before(&self) -> Result<BeforeOperation, String> {
         match self.before.as_str() {
-            "no_reset" => Ok(Operation::None),
-            "soft_reset" => Ok(Operation::SoftReset),
-            "default_reset" => Ok(Operation::DefaultReset),
+            "default_reset" => Ok(BeforeOperation::DefaultReset),
+            "no_reset" => Ok(BeforeOperation::NoReset),
+            "no_reset_no_sync" => Ok(BeforeOperation::NoResetNoSync),
             _ => Err(format!("Invalid before operation: {}", self.before)),
         }
     }
 
-    /// 将字符串转换为 Operation 枚举
-    pub fn parse_after(&self) -> Result<Operation, String> {
+    /// 将字符串转换为 after 操作枚举
+    pub fn parse_after(&self) -> Result<AfterOperation, String> {
         match self.after.as_str() {
-            "no_reset" => Ok(Operation::None),
-            "soft_reset" => Ok(Operation::SoftReset),
-            "default_reset" => Ok(Operation::DefaultReset),
+            "no_reset" => Ok(AfterOperation::NoReset),
+            "soft_reset" => Ok(AfterOperation::SoftReset),
             _ => Err(format!("Invalid after operation: {}", self.after)),
         }
     }
diff --git a/sftool/src/main.rs b/sftool/src/main.rs
@@ -1,6 +1,6 @@
 use anyhow::{Context, Result, anyhow, bail};
 use clap::{Parser, Subcommand, ValueEnum};
-use sftool_lib::{ChipType, Operation, SifliToolBase, create_sifli_tool};
+use sftool_lib::{AfterOperation, BeforeOperation, ChipType, SifliToolBase, create_sifli_tool};
 use strum::{Display, EnumString};
 
 mod config;
@@ -14,8 +14,8 @@ type MergedConfig = (
     String,
     String,
     u32,
-    Operation,
-    Operation,
+    BeforeOperation,
+    AfterOperation,
     i8,
     bool,
     bool,
@@ -162,11 +162,11 @@ struct Cli {
 
     /// What to do before connecting to the chip (default: default_reset)
     #[arg(long = "before", value_enum)]
-    before: Option<Operation>,
+    before: Option<BeforeOperation>,
 
     /// What to do after siflitool is finished (default: soft_reset)
     #[arg(long = "after", value_enum)]
-    after: Option<Operation>,
+    after: Option<AfterOperation>,
 
     /// Number of attempts to connect, negative or 0 for infinite (default: 3)
     #[arg(long = "connect-attempts")]
@@ -520,7 +520,7 @@ fn main() -> Result<()> {
         }
     }
 
-    if after != Operation::None {
+    if after.requires_soft_reset() {
         siflitool
             .soft_reset()
             .context("Failed to perform post-operation soft reset")?;

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,9 @@ impl SifliTool for SF32LB58Tool {`
`340`	`340`	`std::thread::sleep(Duration::from_millis(100));`
`341`	`341`
`342`	`342`	`let mut tool = Box::new(Self { base, port });`
`343`		`- tool.download_stub().expect("Failed to download stub");`
	`343`	`+ if tool.base.before.should_download_stub() {`
	`344`	`+ tool.download_stub().expect("Failed to download stub");`
	`345`	`+ }`
`344`	`346`	`tool`
`345`	`347`	`}`
`346`	`348`	`}`