9 Commits

Author SHA1 Message Date
lenn
83832139a8 Merge branch 'display'
# Conflicts:
#	.gitignore
#	package-lock.json
#	package.json
#	src-tauri/Cargo.lock
#	src-tauri/Cargo.toml
#	src-tauri/tauri.conf.json
#	src/routes/+page.svelte
2026-04-29 16:08:46 +08:00
lenn
50700e73df update .gitignore 2026-04-20 09:32:43 +08:00
lenn
7e047daf00 remove log file 2026-04-15 09:50:29 +08:00
lenn
842d4980d9 remove target dirs 2026-04-15 09:49:33 +08:00
lenn
04a0c3e46b remove unnecessary dotfiles 2026-04-15 09:46:19 +08:00
lenn
d4e1da6219 更新软件版本号 2026-04-15 09:44:54 +08:00
lenn
d1c9be56ec Merge branch 'main' of https://gitea.e-skin.top/E-Skin/JE-Skin 2026-04-15 09:28:09 +08:00
lenn
2e30fa388a 导出数据添加summary列 2026-04-15 09:20:56 +08:00
Lenn
4b2203e008 合并请求 #2
feat:增加点和数字切换,减小点最大尺寸,增加range配色方案
2026-04-09 01:18:56 +00:00
2 changed files with 6 additions and 1 deletions

View File

@@ -1,7 +1,9 @@
# Generated by Cargo # Generated by Cargo
# will have compiled files and executables # will have compiled files and executables
/target/ /target/
/target-*/
# Generated by Tauri # Generated by Tauri
# will have schema files for capabilities auto-completion # will have schema files for capabilities auto-completion
/gen/schemas /gen/schemas
*log*

View File

@@ -221,7 +221,7 @@ impl Codec<TactileAFrame> for TactileACodec {
req_bytes.push(f.meta.device_addr); req_bytes.push(f.meta.device_addr);
req_bytes.push(f.meta.extend_code); req_bytes.push(f.meta.extend_code);
req_bytes.push(f.meta.func_code); req_bytes.push(f.meta.func_code);
req_bytes.extend_from_slice(f.meta.start_addr.to_le_bytes().as_slice()); req_bytes.extend_from_slice(f.meta.start_addr.to_le_bytes().as_slice());
req_bytes.extend_from_slice((f.meta.except_data_len as u16).to_le_bytes().as_slice()); req_bytes.extend_from_slice((f.meta.except_data_len as u16).to_le_bytes().as_slice());
let checksum = calc_crc8_itu(req_bytes.as_slice()); let checksum = calc_crc8_itu(req_bytes.as_slice());
@@ -263,6 +263,7 @@ impl CsvExporter<TactileARepFrame> for TactileACsvExporter {
} }
header.push("dts".to_string()); header.push("dts".to_string());
header.push("summary".to_string());
header header
} }
@@ -271,8 +272,10 @@ impl CsvExporter<TactileARepFrame> for TactileACsvExporter {
item: &RecordedFrame<TactileARepFrame>, item: &RecordedFrame<TactileARepFrame>,
) -> anyhow::Result<Vec<String>> { ) -> anyhow::Result<Vec<String>> {
let packet = TactileADataPacket::try_from(&item.frame)?; let packet = TactileADataPacket::try_from(&item.frame)?;
let summary: i32 = packet.data.iter().sum();
let mut row: Vec<String> = packet.data.iter().map(|x| x.to_string()).collect(); let mut row: Vec<String> = packet.data.iter().map(|x| x.to_string()).collect();
row.push(packet.dts_ms.to_string()); row.push(packet.dts_ms.to_string());
row.push(summary.to_string());
Ok(row) Ok(row)
} }
} }