Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
profile: minimal
toolchain: stable
override: true
- run: sudo apt-get install libudev-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
- uses: actions-rs/cargo@v1
with:
command: check
Expand Down Expand Up @@ -50,7 +51,7 @@ jobs:
profile: minimal
toolchain: stable
override: true
- run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
- run: sudo apt-get install libudev-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
- uses: actions-rs/cargo@v1
with:
command: test
Expand Down Expand Up @@ -78,6 +79,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: sudo apt-get install libudev-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
- run: cargo clippy -- -D warnings

# trunk:
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# CHANGELOG

## 0.4.7
## 0.5.0

- WIP
- add support for Victor (RuoShui) 86B/C/D/E handheld DMMs (read only)

This release adds a whole new device class to Rusty Meter.
These Victor DMMs can be read out, but due to their nature
with a twist knob for the modes they can only be read out
and not remote controlled.

## 0.4.6

Expand Down
27 changes: 15 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rusty_meter"
version = "0.4.6"
version = "0.5.0"
authors = ["Markus Krause <Krause.Markus@gmx.com>"]
edition = "2024"
rust-version = "1.92" # when updating here, also update release.yml and rust-toolchain file
Expand All @@ -25,7 +25,6 @@ egui_plot = "0.35.0"
log = "0.4.30"
reqwest = { version = "0.13.4", features = ["blocking"] }
urlencoding = "2.1.3"
subprocess = "1.1.0"
serde_json = "1.0.150"
regex = "1.12.3"
indexmap = "2.14.0"
Expand All @@ -48,11 +47,16 @@ rfd = "0.17.2" # For file dialogs
# native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
env_logger = "0.11.10"
hidapi = "2.6.3"

# web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen-futures = "0.4.72"

[[bin]]
name = "victor-86bcd-explore"
path = "src/bin/victor_86bcd_explore.rs"

[build-dependencies]
# for windows icon embedding
winres = "0.1"
Expand Down
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,23 @@ If you like this, a small donation is appreciated:
[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/R6R8DQO8C)

RustyMeter is a GUI application written in Rust powered by the awesome egui framework and builds
on the work of @TheHWCave to turn your OWON XDM multimeter into a PC-based powerhouse
on the work of @TheHWCave to turn your OWON XDM or Victor multimeter into a PC-based powerhouse
with neat graphing, recording, using it on stream etc.

Meters which have been confirmed working already:

- XDM1041
- XDM1241
- XDM2041 (except 4W resistance, not yet implemented)
- Owon XDM1041
- Owon XDM1241
- Owon XDM2041 (except 4W resistance, not yet implemented)
- Victor 86 series

Looking for testers for the XDM3000 series!

![screenshot](assets/screenshot.png)

![recorder](assets/recorder.png)

Eventually, as this is all SCPI based, it could also be extended to other meters that have SCPI interfaces.
Eventually, as this is all SCPI based (except the Victor driver), it could also be extended to other meters that have SCPI interfaces.
Maybe some stuff even works out of the box.

**NOTE:** This is work and progress and I have more features for this in mind. what works right now is connecting to the multimeter, switching modes and ranges as well as sampling rates. You also get nice graphing for a configureable amount of last samples and you can record samples to CSV, XLSX and JSON.
Expand Down
Binary file added data/victor_serial/Victor86D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/victor_serial/ht1621b.PDF
Binary file not shown.
Loading
Loading