Skip to content

Commit 5ae695a

Browse files
miaokelamiaokela
committed
🚀 正式版本 目前仅支持macos
1 parent 671fedd commit 5ae695a

File tree

12 files changed

+242
-42
lines changed

12 files changed

+242
-42
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"build": "vite build",
99
"preview": "vite preview",
1010
"tauri": "TAURI_ENV=dev tauri dev --no-watch",
11-
"compile": "tauri build",
11+
"compile-mac": "tauri build --target universal-apple-darwin",
1212
"compile-win32": "tauri build --target i686-pc-windows-msvc",
1313
"compile-winarm64": "tauri build --target aarch64-pc-windows-msvc",
1414
"compile-x64": "tauri build --target x86_64-pc-windows-msvc"

‎src-tauri/Cargo.toml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,30 @@ edition = "2021"
1313
tauri-build = { version = "1.5", features = [] }
1414

1515
[dependencies]
16-
tauri = { version = "1.5", features = [ "dialog-message", "dialog-open", "dialog-save", "fs-all", "window-close", "window-hide", "window-minimize", "window-show", "window-unminimize", "window-unmaximize", "window-start-dragging", "window-maximize", "shell-open", "windows7-compat"] }
16+
tauri = { version = "1.5", features = [
17+
"dialog-message",
18+
"dialog-open",
19+
"dialog-save",
20+
"fs-all",
21+
"window-close",
22+
"window-hide",
23+
"window-minimize",
24+
"window-show",
25+
"window-unminimize",
26+
"window-unmaximize",
27+
"window-start-dragging",
28+
"window-maximize",
29+
"shell-open",
30+
"windows7-compat",
31+
# "devtools",
32+
] }
1733
serde = { version = "1.0", features = ["derive"] }
1834
serde_json = "1.0"
1935
lazy_static = "1.4.0"
20-
tokio-modbus = { version = "0.6.1", default-features = false, features = ["sync", "tcp"] }
36+
tokio-modbus = { version = "0.6.1", default-features = false, features = [
37+
"sync",
38+
"tcp",
39+
] }
2140
notify = "4.0.17"
2241
toml = "0.6.0"
2342
log = "0.4"

‎src-tauri/log.txt

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,3 +268,113 @@
268268
08:44:24 [INFO] File changed
269269
08:44:34 [INFO] File changed
270270
08:45:34 [INFO] File changed
271+
07:05:27 [INFO] trigger change
272+
07:05:27 [INFO] trigger change
273+
07:05:27 [INFO] File changed
274+
07:05:37 [INFO] File changed
275+
09:10:21 [INFO] trigger change
276+
09:10:21 [INFO] trigger change
277+
09:10:21 [INFO] File changed
278+
09:10:31 [INFO] File changed
279+
09:29:19 [INFO] trigger change
280+
09:29:19 [INFO] trigger change
281+
09:29:19 [INFO] File changed
282+
09:29:29 [INFO] File changed
283+
10:18:18 [INFO] trigger change
284+
10:18:18 [INFO] trigger change
285+
10:19:01 [INFO] File changed
286+
10:19:11 [INFO] File changed
287+
10:55:45 [INFO] trigger change
288+
10:55:45 [INFO] trigger change
289+
10:55:45 [INFO] File changed
290+
10:56:01 [INFO] File changed
291+
11:35:19 [INFO] trigger change
292+
11:35:19 [INFO] trigger change
293+
11:35:19 [INFO] File changed
294+
11:40:47 [INFO] trigger change
295+
11:40:58 [INFO] File changed
296+
11:56:38 [INFO] trigger change
297+
11:59:38 [INFO] trigger change
298+
11:59:46 [INFO] File changed
299+
12:02:20 [INFO] trigger change
300+
12:09:36 [INFO] trigger change
301+
12:09:42 [INFO] File changed
302+
12:10:34 [INFO] trigger change
303+
12:11:01 [INFO] trigger change
304+
12:21:12 [INFO] trigger change
305+
12:21:12 [INFO] home_dir: "/Users/kela"
306+
12:21:12 [INFO] home_dir: "/Users/kela"
307+
13:14:13 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
308+
13:14:19 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
309+
13:14:19 [INFO] Conversion successful
310+
13:14:29 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
311+
13:14:29 [INFO] Conversion successful
312+
13:19:36 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
313+
13:19:43 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
314+
13:19:43 [INFO] Conversion successful
315+
13:19:43 [INFO] File changed
316+
13:19:43 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.7", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
317+
13:19:53 [INFO] File changed
318+
13:19:53 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.7", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
319+
13:20:38 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
320+
13:20:46 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
321+
13:20:46 [INFO] Conversion successful
322+
13:20:46 [INFO] File changed
323+
13:20:46 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.7", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
324+
13:20:46 [INFO] modbus.toml changed
325+
13:20:56 [INFO] File changed
326+
13:20:56 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.7", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
327+
13:20:56 [INFO] modbus.toml changed
328+
13:24:10 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
329+
13:26:10 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
330+
13:27:13 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
331+
13:27:13 [INFO] Conversion successful
332+
13:27:13 [INFO] File changed
333+
13:27:13 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.7", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
334+
13:27:13 [INFO] modbus.toml changed
335+
13:27:23 [INFO] File changed
336+
13:27:23 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.7", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
337+
13:27:23 [INFO] modbus.toml changed
338+
13:30:09 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
339+
13:30:09 [INFO] Conversion successful
340+
13:30:09 [INFO] File changed
341+
13:30:09 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
342+
13:30:09 [INFO] modbus.toml changed
343+
13:30:19 [INFO] File changed
344+
13:30:19 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 2, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 2, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 2, name: "温度", unit: "℃" }] }
345+
13:30:19 [INFO] modbus.toml changed
346+
13:39:07 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
347+
13:39:07 [INFO] Conversion successful
348+
13:39:07 [INFO] File changed
349+
13:39:07 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
350+
13:39:07 [INFO] modbus.toml changed
351+
13:39:17 [INFO] File changed
352+
13:39:17 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
353+
13:39:17 [INFO] modbus.toml changed
354+
13:49:32 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
355+
13:49:51 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
356+
13:49:51 [INFO] Conversion successful
357+
13:49:51 [INFO] File changed
358+
13:49:51 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
359+
13:49:51 [INFO] modbus.toml changed
360+
13:50:01 [INFO] File changed
361+
13:50:01 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
362+
13:50:01 [INFO] modbus.toml changed
363+
13:59:54 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
364+
14:00:03 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
365+
14:00:03 [INFO] Conversion successful
366+
14:00:03 [INFO] File changed
367+
14:00:03 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
368+
14:00:03 [INFO] modbus.toml changed
369+
14:00:13 [INFO] File changed
370+
14:00:13 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
371+
14:00:13 [INFO] modbus.toml changed
372+
14:09:51 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
373+
14:10:02 [INFO] path: "/Users/kela/.modbus-visualizer/.modbus.toml"
374+
14:10:02 [INFO] Conversion successful
375+
14:10:02 [INFO] File changed
376+
14:10:02 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
377+
14:10:02 [INFO] modbus.toml changed
378+
14:10:12 [INFO] File changed
379+
14:10:12 [INFO] config: Config { connection: Connection { ip_address: "192.168.1.6", port: 502 }, params: [Param { param_id: 1, slave_id: 1, start_address: 0, data_type: 3, operation: 2, register_type: 1, name: "电流", unit: "A" }, Param { param_id: 2, slave_id: 1, start_address: 2, data_type: 3, operation: 2, register_type: 1, name: "电压", unit: "V" }, Param { param_id: 3, slave_id: 1, start_address: 4, data_type: 1, operation: 2, register_type: 1, name: "温度", unit: "℃" }] }
380+
14:10:12 [INFO] modbus.toml changed

‎src-tauri/modbus.toml

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[connection]
2-
ip_address = "192.168.1.138"
2+
ip_address = "192.168.1.7"
33
port = 502
44

55
[[params]]
@@ -8,7 +8,7 @@ slave_id = 1
88
start_address = 0
99
data_type = 3
1010
operation = 2
11-
register_type = 1
11+
register_type = 2
1212
name = "电流"
1313
unit = "A"
1414

@@ -18,7 +18,7 @@ slave_id = 1
1818
start_address = 2
1919
data_type = 3
2020
operation = 2
21-
register_type = 1
21+
register_type = 2
2222
name = "电压"
2323
unit = "V"
2424

@@ -28,6 +28,6 @@ slave_id = 1
2828
start_address = 4
2929
data_type = 1
3030
operation = 2
31-
register_type = 1
31+
register_type = 2
3232
name = "温度"
3333
unit = "℃"

‎src-tauri/src/main.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ mod utils;
55

66
use log::info;
77
use utils::common::*;
8-
use utils::file_handler::{download_file, init_log, trigger_file_change, watch_param_config, convert_json_to_toml};
8+
use utils::file_handler::{download_file, init_log, create_dir_with_permissions, watch_param_config, convert_json_to_toml};
99

1010
fn main() {
1111
info!("Start up app!");
1212
init_log();
1313

14-
trigger_file_change();
14+
_ = create_dir_with_permissions();
15+
// trigger_file_change();
1516

1617
set_into_read_task();
1718

@@ -20,7 +21,7 @@ fn main() {
2021
task_thread();
2122

2223
// 触发保存文件
23-
trigger_file_change();
24+
// trigger_file_change();
2425
tauri::Builder::default()
2526
.invoke_handler(tauri::generate_handler![
2627
get_result,

‎src-tauri/src/utils/common.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub fn execute_task(task: &Task, rt: &mut Runtime) -> Vec<u16> {
169169
}
170170
match result {
171171
Ok(data) => {
172-
println!("读取的数据: {:?}", data);
172+
// println!("读取的数据: {:?}", data);
173173
return data;
174174
}
175175
Err(e) => {
@@ -278,7 +278,7 @@ pub fn task_thread() {
278278
}
279279
}
280280

281-
println!("消耗任务: {:?}", task);
281+
// println!("消耗任务: {:?}", task);
282282
// 执行任务
283283
let result = execute_task(&task, &mut rt);
284284

@@ -357,7 +357,7 @@ pub fn set_into_read_task() {
357357
.push(param.clone());
358358
}
359359

360-
println!("组的数量: {}", groups.len());
360+
// println!("组的数量: {}", groups.len());
361361

362362
// 遍历所有组，生成任务
363363
for (slave_and_type, _params) in groups {

0 commit comments

Comments
 (0)