feat:增加点和数字切换,减小点最大尺寸,增加range配色方案
This commit is contained in:
@@ -77,6 +77,40 @@ pub struct SerialConnectionState {
|
||||
last_record: Mutex<Option<SharedTactileRecording>>
|
||||
}
|
||||
|
||||
pub async fn shutdown_active_session(
|
||||
state: &SerialConnectionState,
|
||||
) -> Result<Option<(String, SharedTactileRecording)>, SerialError> {
|
||||
let session = {
|
||||
let mut guard = state.session.lock().map_err(|_| SerialError::StateError)?;
|
||||
guard.take()
|
||||
};
|
||||
|
||||
let Some(SerialSession {
|
||||
port,
|
||||
cancel,
|
||||
task,
|
||||
current_record,
|
||||
}) = session else {
|
||||
return Ok(None);
|
||||
};
|
||||
|
||||
cancel.cancel();
|
||||
let _ = task.await;
|
||||
|
||||
let frame_count = current_record
|
||||
.lock()
|
||||
.map(|record| record.frames.len())
|
||||
.unwrap_or(0);
|
||||
|
||||
info!("last_record has {} frames", frame_count);
|
||||
|
||||
if let Ok(mut last_record) = state.last_record.lock() {
|
||||
*last_record = Some(current_record.clone());
|
||||
}
|
||||
|
||||
Ok(Some((port, current_record)))
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn serial_enum() -> Result<Vec<String>, SerialError> {
|
||||
let ports = available_ports()
|
||||
@@ -190,17 +224,7 @@ pub async fn serial_connect(
|
||||
pub async fn serial_disconnect(
|
||||
state: State<'_, SerialConnectionState>,
|
||||
) -> Result<SerialConnectResponse, SerialError> {
|
||||
let session = {
|
||||
let mut guard = state.session.lock().map_err(|_| SerialError::StateError)?;
|
||||
guard.take()
|
||||
};
|
||||
|
||||
let Some(SerialSession {
|
||||
port,
|
||||
cancel,
|
||||
task,
|
||||
current_record,
|
||||
}) = session
|
||||
let Some((port, _current_record)) = shutdown_active_session(&state).await?
|
||||
else {
|
||||
return Ok(SerialConnectResponse {
|
||||
port: String::new(),
|
||||
@@ -209,19 +233,6 @@ pub async fn serial_disconnect(
|
||||
});
|
||||
};
|
||||
|
||||
cancel.cancel();
|
||||
let _ = task.await;
|
||||
let frame_count = current_record.lock().map(|record| {
|
||||
record.frames.len()
|
||||
}).unwrap_or(0);
|
||||
|
||||
info!("last_record has {} frames", frame_count);
|
||||
|
||||
if let Ok(mut last_record) = state.last_record.lock() {
|
||||
*last_record = Some(current_record);
|
||||
}
|
||||
|
||||
|
||||
Ok(SerialConnectResponse {
|
||||
port,
|
||||
connected: false,
|
||||
|
||||
Reference in New Issue
Block a user