Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3a06d682f | ||
|
|
4d530721dc | ||
|
|
0b691ca943 | ||
|
|
ed0f781851 | ||
|
|
613132035a | ||
|
|
b3dc5a336e | ||
|
|
a4d0cb65f0 | ||
|
|
29b9b17c67 | ||
|
|
8deecf3558 | ||
|
|
3a6a190ce1 | ||
|
|
1f0a4cbe76 | ||
|
|
fbc43216fb | ||
|
|
a4fcb6e763 | ||
|
|
76409b0d3b | ||
|
|
4aec6d40ad | ||
|
|
33a116d9fd | ||
|
|
45d9632590 | ||
|
|
0265370be2 |
@@ -0,0 +1,45 @@
|
||||
name: next-build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [next]
|
||||
|
||||
jobs:
|
||||
candidate:
|
||||
runs-on: alkane-ci
|
||||
env:
|
||||
WX_PREFIX: /root/.cache/wx-3.3.3-linux
|
||||
WX_RS_WXCONFIG: /root/.cache/wx-3.3.3-linux/bin/wx-config
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install build dependencies
|
||||
run: |
|
||||
apt-get update -qq
|
||||
apt-get install -y -qq --no-install-recommends libssl-dev pkg-config ca-certificates
|
||||
- uses: actions/cache@v4
|
||||
with:
|
||||
path: /root/.cache/wx-3.3.3-linux
|
||||
key: wx-3.3.3-${{ runner.os }}-${{ hashFiles('thirdparty/wx-rs/VERSION') }}
|
||||
- name: Build wxWidgets
|
||||
run: |
|
||||
if [ ! -x "$WX_PREFIX/bin/wx-config" ]; then
|
||||
bash scripts/build-wx-linux.sh
|
||||
fi
|
||||
- name: Build release candidate
|
||||
run: cargo build --release -p alkane-gui --offline
|
||||
- name: Select candidate version
|
||||
id: version
|
||||
run: bash ci/compute-rc-version.sh >> "$GITHUB_OUTPUT"
|
||||
- name: Package candidate
|
||||
if: steps.version.outputs.release == 'true'
|
||||
run: |
|
||||
mkdir -p dist
|
||||
cp target/release/alkane-toolkit dist/
|
||||
tar -C dist -czf "dist/alkane-toolkit-${{ steps.version.outputs.version }}-linux-x86_64.tar.gz" alkane-toolkit
|
||||
- name: Create private prerelease
|
||||
if: steps.version.outputs.release == 'true'
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: python3 ci/release-rc.py "${{ steps.version.outputs.tag }}" true "dist/alkane-toolkit-${{ steps.version.outputs.version }}-linux-x86_64.tar.gz"
|
||||
@@ -25,11 +25,9 @@ jobs:
|
||||
run: bash ci/compute-version.sh | tee -a "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Test version logic
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: bash ci/test-compute-version.sh
|
||||
|
||||
- name: Install build dependencies
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
apt-get update -qq
|
||||
apt-get install -y -qq --no-install-recommends \
|
||||
@@ -37,14 +35,12 @@ jobs:
|
||||
echo "libssl-dev + pkg-config installed (openssl-sys needs them)"
|
||||
|
||||
- name: Cache vendored wxWidgets build
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: /root/.cache/wx-3.3.3-linux
|
||||
key: wx-3.3.3-${{ runner.os }}-${{ hashFiles('thirdparty/wx-rs/VERSION') }}
|
||||
|
||||
- name: Build wxWidgets (once, then cached)
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
if [ ! -x "$WX_PREFIX/bin/wx-config" ]; then
|
||||
bash scripts/build-wx-linux.sh
|
||||
@@ -53,7 +49,6 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Clippy (our crate, warnings are errors)
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
rustup component add clippy >/dev/null 2>&1 || true
|
||||
cargo clippy -p alkane-gui --no-deps --release --bins --offline -- -D warnings
|
||||
@@ -65,17 +60,14 @@ jobs:
|
||||
grep -m1 '^version' Cargo.toml
|
||||
|
||||
- name: Build release
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
cargo build --release -p alkane-gui --offline
|
||||
|
||||
- name: Unit tests
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
cargo test -p alkane-gui --offline
|
||||
|
||||
- name: Microbenchmarks
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
# Capture the bench stdout for the weighted-average delta badge (round 19
|
||||
# #1) while keeping the step a hard gate: pipefail preserves cargo's exit
|
||||
@@ -85,7 +77,6 @@ jobs:
|
||||
| tee bench-current.txt
|
||||
|
||||
- name: Headless UI self-test
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
run: |
|
||||
apt-get update -qq && apt-get install -y -qq --no-install-recommends \
|
||||
xvfb xauth dbus-x11 fonts-dejavu-core >/dev/null
|
||||
@@ -93,7 +84,6 @@ jobs:
|
||||
xvfb-run -a env GDK_BACKEND=x11 ALKANE_SELFTEST=1 "$BIN"
|
||||
|
||||
- name: Dependency audit (best-effort)
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
continue-on-error: true
|
||||
run: |
|
||||
if command -v cargo-audit >/dev/null 2>&1; then
|
||||
@@ -111,7 +101,6 @@ jobs:
|
||||
# already installed by the self-test step above.
|
||||
- name: Coverage (best-effort)
|
||||
id: cov
|
||||
if: steps.ver.outputs.release == 'true'
|
||||
continue-on-error: true
|
||||
run: |
|
||||
rustup component add llvm-tools-preview >/dev/null 2>&1 || true
|
||||
@@ -136,6 +125,16 @@ jobs:
|
||||
echo "cargo-llvm-cov unavailable; coverage badge left as committed"
|
||||
fi
|
||||
|
||||
- name: Microbenchmark coverage
|
||||
id: benchcov
|
||||
run: |
|
||||
command -v cargo-llvm-cov >/dev/null
|
||||
PCT=$(bash ci/bench-coverage.sh --summary-only \
|
||||
| awk '/^TOTAL/{gsub(/%/,"",$10); print $10}')
|
||||
[ -n "$PCT" ] || { echo "microbenchmark coverage unavailable" >&2; exit 1; }
|
||||
echo "pct=${PCT}" >> "$GITHUB_OUTPUT"
|
||||
echo "microbenchmark line coverage: ${PCT}%"
|
||||
|
||||
# Refresh the committed README badges from live metrics and push any change
|
||||
# back to main. Best-effort: a locked-down runner that can't push must not
|
||||
# fail the release. A badges-only push does not bump the version (see
|
||||
@@ -151,6 +150,7 @@ jobs:
|
||||
# Update the coverage badge only when the coverage step produced a number;
|
||||
# otherwise leave the committed coverage.svg untouched.
|
||||
COV="${{ steps.cov.outputs.pct }}"
|
||||
BENCH_COV="${{ steps.benchcov.outputs.pct }}"
|
||||
COV_ARG=""
|
||||
[ -n "$COV" ] && COV_ARG="--coverage $COV"
|
||||
# Weighted-average microbench delta vs the previous release (round 19 #1).
|
||||
@@ -159,6 +159,7 @@ jobs:
|
||||
BENCH_DELTA=$(python3 ci/bench-badge.py --current bench-current.txt \
|
||||
--baseline badges/bench-baseline.json 2>/dev/null || echo NEW)
|
||||
python3 ci/gen-badges.py --tests "${PASS:-0}" $COV_ARG \
|
||||
--bench-coverage "$BENCH_COV" \
|
||||
--bench-delta "${BENCH_DELTA:-NEW}" --bench "row-render + scan-parse"
|
||||
if [ -n "$(git status --porcelain badges)" ]; then
|
||||
git config user.name "alkane-ci"
|
||||
|
||||
@@ -6,8 +6,9 @@ name: verify
|
||||
# these checks before it cuts a release -- so no work is duplicated on main).
|
||||
on:
|
||||
pull_request:
|
||||
branches-ignore: [next]
|
||||
push:
|
||||
branches-ignore: [main]
|
||||
branches-ignore: [main, next]
|
||||
|
||||
jobs:
|
||||
verify:
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/target
|
||||
**/target
|
||||
.claude/
|
||||
__pycache__/
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
# alkane-toolkit
|
||||
|
||||
[](https://gitea.bluefla.re/blueflare/alkane-toolkit/actions)
|
||||
[](https://gitea.bluefla.re/blueflare/alkane-toolkit/actions)
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
@@ -82,11 +83,12 @@ xvfb-run -a env ALKANE_SELFTEST=1 \
|
||||
ci/coverage.sh --summary-only # coverage (tests + self-test)
|
||||
```
|
||||
|
||||
CI mirrors these: `verify.yml` runs the lint, tests, benchmarks, self-test, and
|
||||
a best-effort dependency audit on every pull request and branch push;
|
||||
`release.yml` repeats them on `main` and cuts an `X.Y.Z` release with the built
|
||||
binary attached when the change warrants it. Dependencies are vendored under
|
||||
`vendor/`, so builds never touch the network.
|
||||
CI mirrors these: `verify.yml` runs lint, tests, benchmarks, the self-test, and
|
||||
a dependency audit on development branches. `release.yml` runs the full gate
|
||||
on every `main` push and cuts an `X.Y.Z` release when the change warrants it.
|
||||
`next.yml` builds release candidates with little testing and publishes `-rc`
|
||||
releases. Dependencies are vendored under `vendor/`, so builds never touch the
|
||||
network.
|
||||
|
||||
## Architecture
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"bench_parse_line_near_max_addrs": 3356800.0,
|
||||
"bench_parse_targets_many_ranges_near_cap": 169232137.0,
|
||||
"bench_render_cells": 15101462.0,
|
||||
"bench_sort_by_each_column": 2530926.0,
|
||||
"bench_targets_to_cidrs_large_range": 1971478.0,
|
||||
"bench_upsert_cold_start_population": 53646037.0,
|
||||
"bench_view_pipeline": 473927.0,
|
||||
"bench_view_pipeline_default_sort": 1258383.0,
|
||||
"bench_view_pipeline_with_filter": 880919.0
|
||||
"bench_parse_line_near_max_addrs": 644187.0,
|
||||
"bench_parse_targets_many_ranges_near_cap": 49565223.0,
|
||||
"bench_render_cells": 3037944.0,
|
||||
"bench_sort_by_each_column": 816884.0,
|
||||
"bench_targets_to_cidrs_large_range": 443875.0,
|
||||
"bench_upsert_cold_start_population": 8871040.0,
|
||||
"bench_view_pipeline": 177652.0,
|
||||
"bench_view_pipeline_default_sort": 203830.0,
|
||||
"bench_view_pipeline_with_filter": 187371.0
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="160.5" height="20" role="img" aria-label="bench coverage: pending">
|
||||
<title>bench coverage: pending</title>
|
||||
<linearGradient id="s" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
</linearGradient>
|
||||
<clipPath id="r"><rect width="160.5" height="20" rx="3" fill="#fff"/></clipPath>
|
||||
<g clip-path="url(#r)">
|
||||
<rect width="103.0" height="20" fill="#555"/>
|
||||
<rect x="103.0" width="57.5" height="20" fill="#9f9f9f"/>
|
||||
<rect width="160.5" height="20" fill="url(#s)"/>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
|
||||
<text x="51.5" y="15" fill="#010101" fill-opacity=".3">bench coverage</text>
|
||||
<text x="51.5" y="14">bench coverage</text>
|
||||
<text x="131.8" y="15" fill="#010101" fill-opacity=".3">pending</text>
|
||||
<text x="131.8" y="14">pending</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 966 B |
@@ -1,5 +1,5 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="147.5" height="20" role="img" aria-label="bench: -24.4% vs prev">
|
||||
<title>bench: -24.4% vs prev</title>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="147.5" height="20" role="img" aria-label="bench: -79.9% vs prev">
|
||||
<title>bench: -79.9% vs prev</title>
|
||||
<linearGradient id="s" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
@@ -13,7 +13,7 @@
|
||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
|
||||
<text x="22.2" y="15" fill="#010101" fill-opacity=".3">bench</text>
|
||||
<text x="22.2" y="14">bench</text>
|
||||
<text x="96.0" y="15" fill="#010101" fill-opacity=".3">-24.4% vs prev</text>
|
||||
<text x="96.0" y="14">-24.4% vs prev</text>
|
||||
<text x="96.0" y="15" fill="#010101" fill-opacity=".3">-79.9% vs prev</text>
|
||||
<text x="96.0" y="14">-79.9% vs prev</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 952 B After Width: | Height: | Size: 952 B |
@@ -1,5 +1,5 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="141.0" height="20" role="img" aria-label="lines of code: 13.5k">
|
||||
<title>lines of code: 13.5k</title>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="141.0" height="20" role="img" aria-label="lines of code: 13.7k">
|
||||
<title>lines of code: 13.7k</title>
|
||||
<linearGradient id="s" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
@@ -13,7 +13,7 @@
|
||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
|
||||
<text x="48.2" y="15" fill="#010101" fill-opacity=".3">lines of code</text>
|
||||
<text x="48.2" y="14">lines of code</text>
|
||||
<text x="118.8" y="15" fill="#010101" fill-opacity=".3">13.5k</text>
|
||||
<text x="118.8" y="14">13.5k</text>
|
||||
<text x="118.8" y="15" fill="#010101" fill-opacity=".3">13.7k</text>
|
||||
<text x="118.8" y="14">13.7k</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 952 B After Width: | Height: | Size: 952 B |
@@ -1,19 +1,19 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="95.5" height="20" role="img" aria-label="clippy: clean">
|
||||
<title>clippy: clean</title>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="108.5" height="20" role="img" aria-label="code quality: A">
|
||||
<title>code quality: A</title>
|
||||
<linearGradient id="s" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
</linearGradient>
|
||||
<clipPath id="r"><rect width="95.5" height="20" rx="3" fill="#fff"/></clipPath>
|
||||
<clipPath id="r"><rect width="108.5" height="20" rx="3" fill="#fff"/></clipPath>
|
||||
<g clip-path="url(#r)">
|
||||
<rect width="51.0" height="20" fill="#555"/>
|
||||
<rect x="51.0" width="44.5" height="20" fill="#4c1"/>
|
||||
<rect width="95.5" height="20" fill="url(#s)"/>
|
||||
<rect width="90.0" height="20" fill="#555"/>
|
||||
<rect x="90.0" width="18.5" height="20" fill="#4c1"/>
|
||||
<rect width="108.5" height="20" fill="url(#s)"/>
|
||||
</g>
|
||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
|
||||
<text x="25.5" y="15" fill="#010101" fill-opacity=".3">clippy</text>
|
||||
<text x="25.5" y="14">clippy</text>
|
||||
<text x="73.2" y="15" fill="#010101" fill-opacity=".3">clean</text>
|
||||
<text x="73.2" y="14">clean</text>
|
||||
<text x="45.0" y="15" fill="#010101" fill-opacity=".3">code quality</text>
|
||||
<text x="45.0" y="14">code quality</text>
|
||||
<text x="99.2" y="15" fill="#010101" fill-opacity=".3">A</text>
|
||||
<text x="99.2" y="14">A</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 916 B After Width: | Height: | Size: 927 B |
@@ -1,5 +1,5 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="121.5" height="20" role="img" aria-label="tests: 93 passing">
|
||||
<title>tests: 93 passing</title>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="121.5" height="20" role="img" aria-label="tests: 95 passing">
|
||||
<title>tests: 95 passing</title>
|
||||
<linearGradient id="s" x2="0" y2="100%">
|
||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||
<stop offset="1" stop-opacity=".1"/>
|
||||
@@ -13,7 +13,7 @@
|
||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
|
||||
<text x="22.2" y="15" fill="#010101" fill-opacity=".3">tests</text>
|
||||
<text x="22.2" y="14">tests</text>
|
||||
<text x="83.0" y="15" fill="#010101" fill-opacity=".3">93 passing</text>
|
||||
<text x="83.0" y="14">93 passing</text>
|
||||
<text x="83.0" y="15" fill="#010101" fill-opacity=".3">95 passing</text>
|
||||
<text x="83.0" y="14">95 passing</text>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 935 B After Width: | Height: | Size: 935 B |
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
# Measure only instrumented microbenchmarks, excluding unit and UI tests.
|
||||
set -euo pipefail
|
||||
export WX_RS_WXCONFIG="${WX_RS_WXCONFIG:-$HOME/.cache/wx-3.3.3-linux/bin/wx-config}"
|
||||
cargo llvm-cov clean --workspace
|
||||
cargo llvm-cov --no-report --offline --release -p alkane-gui -- \
|
||||
--ignored --nocapture bench_
|
||||
cargo llvm-cov report --release --ignore-filename-regex '(thirdparty|vendor)/' "$@"
|
||||
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
# Convert the next final version into a monotonically numbered prerelease.
|
||||
set -euo pipefail
|
||||
result="$(bash ci/compute-version.sh)"
|
||||
release="$(printf '%s\n' "$result" | sed -n 's/^release=//p')"
|
||||
if [ "$release" != true ]; then
|
||||
echo "release=false"
|
||||
exit 0
|
||||
fi
|
||||
version="$(printf '%s\n' "$result" | sed -n 's/^version=//p')"
|
||||
last="$(git tag -l "v${version}-rc.*" | sed -n "s/^v${version//./\.}-rc\.\([0-9][0-9]*\)$/\1/p" | sort -n | tail -1)"
|
||||
next=$(( ${last:-0} + 1 ))
|
||||
echo "release=true"
|
||||
echo "version=${version}-rc.${next}"
|
||||
echo "tag=v${version}-rc.${next}"
|
||||
@@ -18,7 +18,7 @@ X=0
|
||||
[ -f "$x_file" ] && X=$(tr -dc '0-9' < "$x_file")
|
||||
X=${X:-0}
|
||||
|
||||
last=$(git tag -l 'v*.*.*' | sort -V | tail -1 || true)
|
||||
last=$(git tag -l 'v*.*.*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1 || true)
|
||||
if [ -n "$last" ]; then
|
||||
v=${last#v}; lx=${v%%.*}; rest=${v#*.}; ly=${rest%%.*}; lz=${rest##*.}
|
||||
changed=$(git diff --name-only "$last"..HEAD)
|
||||
|
||||
@@ -133,9 +133,19 @@ def cov_color(pct: float) -> str:
|
||||
|
||||
|
||||
def human(n: int) -> str:
|
||||
if n >= 1000:
|
||||
return f"{n / 1000:.1f}k".replace(".0k", "k")
|
||||
return str(n)
|
||||
suffixes = ("", "K", "M", "G")
|
||||
value = float(n)
|
||||
index = 0
|
||||
while value >= 999.5 and index < len(suffixes) - 1:
|
||||
value /= 1000
|
||||
index += 1
|
||||
if value >= 100:
|
||||
number = f"{value:.0f}"
|
||||
elif value >= 10:
|
||||
number = f"{value:.1f}".rstrip("0").rstrip(".")
|
||||
else:
|
||||
number = f"{value:.2f}".rstrip("0").rstrip(".")
|
||||
return number + suffixes[index]
|
||||
|
||||
|
||||
def main() -> int:
|
||||
@@ -144,6 +154,7 @@ def main() -> int:
|
||||
ap.add_argument("--root", default=".")
|
||||
ap.add_argument("--tests", type=int, default=None)
|
||||
ap.add_argument("--coverage", type=float, default=None)
|
||||
ap.add_argument("--bench-coverage", type=float, default=None)
|
||||
ap.add_argument("--bench", default=None)
|
||||
# Weighted-average microbench delta vs the previous release, as a signed
|
||||
# percentage string (e.g. "-3.2"), or "NEW"/"" when there is no baseline yet
|
||||
@@ -167,11 +178,15 @@ def main() -> int:
|
||||
write("loc", "lines of code", human(loc), loc_color(loc))
|
||||
write("license", "license", lic, "blue")
|
||||
write("dependencies", "dependencies", str(deps), "blue")
|
||||
write("quality", "clippy", args.clippy, "brightgreen" if args.clippy == "clean" else "orange")
|
||||
grade = "A" if args.clippy == "clean" else "F"
|
||||
write("quality", "code quality", grade, "brightgreen" if grade == "A" else "red")
|
||||
if args.tests is not None:
|
||||
write("tests", "tests", f"{args.tests} passing", "brightgreen")
|
||||
if args.coverage is not None:
|
||||
write("coverage", "coverage", f"{args.coverage:.0f}%", cov_color(args.coverage))
|
||||
write("bench-coverage", "bench coverage",
|
||||
f"{args.bench_coverage:.0f}%" if args.bench_coverage is not None else "pending",
|
||||
cov_color(args.bench_coverage) if args.bench_coverage is not None else "lightgrey")
|
||||
# Bench badge: prefer the weighted-average delta vs the previous release; fall
|
||||
# back to the static label (first run, or when the delta could not be computed).
|
||||
delta = None
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create one Gitea release and attach files using the runner's scoped token."""
|
||||
|
||||
import json
|
||||
import os
|
||||
import pathlib
|
||||
import sys
|
||||
import urllib.error
|
||||
import urllib.parse
|
||||
import urllib.request
|
||||
|
||||
|
||||
def request(url, payload, content_type):
|
||||
headers = {
|
||||
"Authorization": "token " + os.environ["GITEA_TOKEN"],
|
||||
"Content-Type": content_type,
|
||||
}
|
||||
req = urllib.request.Request(url, data=payload, headers=headers, method="POST")
|
||||
with urllib.request.urlopen(req, timeout=60) as response:
|
||||
return json.load(response)
|
||||
|
||||
|
||||
def main():
|
||||
if len(sys.argv) < 4:
|
||||
sys.exit("usage: release.py TAG PRERELEASE FILE [FILE ...]")
|
||||
tag, prerelease, *files = sys.argv[1:]
|
||||
api = os.environ.get("GITHUB_API_URL", "https://gitea.bluefla.re/api/v1").rstrip("/")
|
||||
repo = os.environ["GITHUB_REPOSITORY"]
|
||||
sha = os.environ["GITHUB_SHA"]
|
||||
body = f"Automated Alkane OS build from {sha}. Conformance results are in the repository."
|
||||
metadata = {
|
||||
"tag_name": tag,
|
||||
"target_commitish": sha,
|
||||
"name": tag,
|
||||
"body": body,
|
||||
"prerelease": prerelease.lower() == "true",
|
||||
}
|
||||
try:
|
||||
release = request(f"{api}/repos/{repo}/releases", json.dumps(metadata).encode(), "application/json")
|
||||
except urllib.error.HTTPError as exc:
|
||||
sys.exit(f"release creation failed: HTTP {exc.code}")
|
||||
release_id = release["id"]
|
||||
for name in files:
|
||||
path = pathlib.Path(name)
|
||||
query = urllib.parse.urlencode({"name": path.name})
|
||||
try:
|
||||
request(f"{api}/repos/{repo}/releases/{release_id}/assets?{query}",
|
||||
path.read_bytes(), "application/octet-stream")
|
||||
except urllib.error.HTTPError as exc:
|
||||
sys.exit(f"asset upload failed for {path.name}: HTTP {exc.code}")
|
||||
print(f"Created {tag} with {len(files)} assets")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -305,7 +305,7 @@ async fn msgs(ip_s: &str) {
|
||||
println!(" fans(rpm)={fans:?} psu_fans={}", d.psu_fans.len());
|
||||
for b in d.hashboards.iter() {
|
||||
println!(
|
||||
" board pos={} hr={:?}TH chips={:?}/{:?} board_temp={:?} outlet_temp={:?} freq={:?}MHz volt={:?}V",
|
||||
" board pos={} hr={:?}TH chips={:?}/{:?} board_temp={:?} outlet_temp={:?} freq={:?}MHz volt={:?}V chip_type={:?} hb_model={:?}",
|
||||
b.position,
|
||||
th(&b.hashrate),
|
||||
b.working_chips,
|
||||
@@ -314,6 +314,8 @@ async fn msgs(ip_s: &str) {
|
||||
b.outlet_chip_temperature.as_ref().map(|t| t.as_celsius()),
|
||||
b.frequency.as_ref().map(|f| f.as_megahertz()),
|
||||
b.voltage.as_ref().map(|v| v.as_volts()),
|
||||
b.chip_type,
|
||||
b.hashboard_model,
|
||||
);
|
||||
}
|
||||
if d.messages.is_empty() {
|
||||
|
||||
@@ -128,6 +128,10 @@ impl Board {
|
||||
cpu,
|
||||
board_code,
|
||||
hashrate_ths: self.hashrate,
|
||||
// A miner that is mining or paused reported a current hashrate (a paused
|
||||
// one reports 0 -> "0.00T"); the blank stock demo miner reports none, so
|
||||
// it keeps the "-" dash (round 19 follow-up).
|
||||
hashrate_known: self.mining || self.paused,
|
||||
expected_ths: self.expected,
|
||||
board_hashrates,
|
||||
board_voltages,
|
||||
|
||||
@@ -82,6 +82,17 @@ pub fn format_hashrate_ths(ths: f64) -> Option<String> {
|
||||
si_mantissa_and_prefix(ths * 1e12).map(|(num, prefix)| format!("{num}{prefix}"))
|
||||
}
|
||||
|
||||
/// The current-hashrate reading for the combined Hashrate cell, distinguishing a
|
||||
/// reported zero from an unreadable one: `Some("0.00T")` when the firmware reported
|
||||
/// a hashrate that rounds to zero, `Some("<n>T")` for a positive reading, and
|
||||
/// `None` (renders as the "-" dash) only when the hashrate is unreadable/absent.
|
||||
pub fn format_hashrate_actual(ths: f64, known: bool) -> Option<String> {
|
||||
if !known {
|
||||
return None;
|
||||
}
|
||||
Some(format_hashrate_ths(ths).unwrap_or_else(|| "0.00T".to_string()))
|
||||
}
|
||||
|
||||
/// A hashrate number (no unit) for a given mining algorithm (round 18 #7). asic-rs
|
||||
/// stores every hashrate normalised to "TH/s", but for Equihash the underlying
|
||||
/// count is Sol/s that it reinterprets through the base H unit, so `ths * 1e12`
|
||||
@@ -140,8 +151,8 @@ fn join_board(vals: &[f64], f: impl Fn(f64) -> String) -> String {
|
||||
/// slash, prefix-only unit): blank when neither is known, the bare actual when
|
||||
/// only it is known, "-/<expected>" when only the expected is known, and
|
||||
/// "<actual>/<expected>" when both are (e.g. "80.5T/95.0T").
|
||||
fn combined_si(actual_ths: f64, expected_ths: f64) -> String {
|
||||
match (format_hashrate_ths(actual_ths), format_hashrate_ths(expected_ths)) {
|
||||
fn combined_si(actual_ths: f64, actual_known: bool, expected_ths: f64) -> String {
|
||||
match (format_hashrate_actual(actual_ths, actual_known), format_hashrate_ths(expected_ths)) {
|
||||
(None, None) => String::new(),
|
||||
(Some(a), None) => a,
|
||||
(None, Some(e)) => format!("-/{e}"),
|
||||
@@ -496,6 +507,10 @@ pub struct MinerRow {
|
||||
pub faults: Vec<Fault>,
|
||||
// performance
|
||||
pub hashrate_ths: f64,
|
||||
/// Whether the firmware actually reported a current hashrate. A reported 0
|
||||
/// renders as "0.00T"; only an unreadable/absent reading (this is false) shows
|
||||
/// the "-" dash. `hashrate_ths` alone can't distinguish the two (both are 0.0).
|
||||
pub hashrate_known: bool,
|
||||
/// Rolling average hashrate windows in TH/s (round 19 #10, T2): 1m/5m/15m/24h.
|
||||
/// 0.0 means the firmware does not report that window.
|
||||
pub hashrate_1m_ths: f64,
|
||||
@@ -535,6 +550,11 @@ pub struct MinerRow {
|
||||
/// Current structured tuning target, rendered for display (e.g. "2832 W",
|
||||
/// "96 TH/s", "preset 3550"), or None (round 17 C).
|
||||
pub tuning_target_label: Option<String>,
|
||||
/// The configured power-limit setpoint in watts, when the firmware's tuning
|
||||
/// target is a power target (round 21 #2). Its own numeric Power-limit column,
|
||||
/// distinct from the mixed `tuning_target_label`. None when the target is a
|
||||
/// mode/preset/hashrate target or unreported.
|
||||
pub power_limit_w: Option<f64>,
|
||||
/// The firmware's selectable named presets/profiles, read live at scan time
|
||||
/// when `caps.supports_presets` (round 18 / roadmap G3). Empty otherwise.
|
||||
pub presets: Vec<MinerPreset>,
|
||||
@@ -563,6 +583,11 @@ pub struct MinerRow {
|
||||
/// (round 11 #17).
|
||||
pub env_temp_c: f64,
|
||||
pub outlet_temp_c: f64,
|
||||
/// Board temperature safety thresholds in Celsius (round 19 #10, T3): target /
|
||||
/// hot / dangerous. `None` per field when the firmware does not report it.
|
||||
pub temp_target_c: Option<f64>,
|
||||
pub temp_hot_c: Option<f64>,
|
||||
pub temp_dangerous_c: Option<f64>,
|
||||
/// Individual cooling-fan RPMs (empty if unknown). PSU fan is tracked
|
||||
/// separately below since it is not part of the cooling-fan set.
|
||||
pub fan_rpms: Vec<f64>,
|
||||
@@ -604,6 +629,8 @@ pub struct MinerRow {
|
||||
pub uptime_secs: u64,
|
||||
pub light_flashing: Option<bool>,
|
||||
pub operating_state: String,
|
||||
/// Auto-tuner status label (round 19 #10, T3); empty when not reported.
|
||||
pub tuner_status: String,
|
||||
pub is_mining: bool,
|
||||
pub slow: bool,
|
||||
/// Not-mining because an operator paused it (distinct from simply idle);
|
||||
@@ -736,28 +763,41 @@ impl MinerRow {
|
||||
if base.is_empty() {
|
||||
return base;
|
||||
}
|
||||
// 2. Board-specific faults are authoritative: red the named boards. A board
|
||||
// is grey ONLY when it is genuinely not detected (base Missing); a board
|
||||
// that is running stays green and a faulted board is red, even when the
|
||||
// PSU also reports a fault (round 18 #4b -- WhatsMiner codes 540/560 must
|
||||
// show red, not grey, and boards still hashing during a PSU fault stay
|
||||
// green). A whole-miner stall reds every board's base, so exonerate the
|
||||
// boards the fault codes did NOT name back to healthy.
|
||||
// 2. Board-specific faults layer onto the base, most-authoritative last. A
|
||||
// board is grey ONLY when it is genuinely not detected (base Missing).
|
||||
// An ERROR-severity fault reds a detected board (round 18 #4b --
|
||||
// WhatsMiner codes 540/560 must show red; boards still hashing during a
|
||||
// PSU fault stay green). A WARNING-severity fault means the board is
|
||||
// still working but sub-optimal (e.g. a few dead chips while it keeps
|
||||
// hashing near its target) -> yellow, never red (round 20 #1b: a miner at
|
||||
// ~83% with some failed chips is degraded, not broken). A whole-miner
|
||||
// stall reds every board's base, so when error codes name specific boards,
|
||||
// exonerate the boards they did NOT name back to healthy.
|
||||
let board_faulted = |i: usize| self.faults_for(FaultComponent::Board(i)).next().is_some();
|
||||
if (0..base.len()).any(board_faulted) {
|
||||
let board_warned = |i: usize| {
|
||||
self.faults
|
||||
.iter()
|
||||
.any(|f| !f.is_error && f.component == FaultComponent::Board(i))
|
||||
};
|
||||
let any_error = (0..base.len()).any(board_faulted);
|
||||
if any_error || (0..base.len()).any(board_warned) {
|
||||
for (i, h) in base.iter_mut().enumerate() {
|
||||
// A genuinely-undetected board stays grey ("not detected") even when a
|
||||
// fault text names it ("chain N not found" describes that missing
|
||||
// board); grey-vs-red is the documented distinction (round 18 #12).
|
||||
if *h == CompHealth::Unreachable {
|
||||
continue;
|
||||
}
|
||||
if board_faulted(i) {
|
||||
// A genuinely-undetected board stays grey ("not detected") even
|
||||
// when a fault text names it: a message like "chain N not found"
|
||||
// describes exactly that missing board, and grey-vs-red is the
|
||||
// documented distinction (round 18 #12). Only detected boards go red.
|
||||
if *h != CompHealth::Unreachable {
|
||||
*h = CompHealth::Down;
|
||||
}
|
||||
} else if *h == CompHealth::Down {
|
||||
*h = ok; // stall-reddened but not named by the fault codes
|
||||
*h = CompHealth::Down; // red: an error fault on a detected board
|
||||
} else if any_error && *h == CompHealth::Down {
|
||||
*h = ok; // stall-reddened but not named by the error codes
|
||||
}
|
||||
// A warning (no error) degrades a still-running board to yellow, but
|
||||
// never upgrades a board already red.
|
||||
if !board_faulted(i) && board_warned(i) && *h != CompHealth::Down {
|
||||
*h = CompHealth::Degraded;
|
||||
}
|
||||
// else keep the base (green Ok / grey Missing).
|
||||
}
|
||||
}
|
||||
base
|
||||
@@ -1039,8 +1079,20 @@ impl MinerRow {
|
||||
/// counted as operator-paused when it is not currently mining and its raw
|
||||
/// operating-state string says so (case-insensitively), shared by the live
|
||||
/// scan (`scan::to_row`) and the fixtures/tests.
|
||||
///
|
||||
/// "Paused" covers every intentional, resumable halt -- operator- or
|
||||
/// firmware-initiated -- not just the literal "Paused" state: a miner an operator
|
||||
/// stopped is halted on purpose, not broken, so it must read blue in Health and
|
||||
/// count under the Paused KPI rather than "not hashing". Firmwares spell it
|
||||
/// differently: VNish reports "stopped", Braiins uses Paused/Stopped/Suspended,
|
||||
/// others "paused". A failure is a distinct Error state (never matched here) and
|
||||
/// still reads as broken (round 19 #19).
|
||||
pub fn is_paused(operating_state: &str, is_mining: bool) -> bool {
|
||||
!is_mining && operating_state.to_lowercase().contains("pause")
|
||||
if is_mining {
|
||||
return false;
|
||||
}
|
||||
let s = operating_state.to_lowercase();
|
||||
s.contains("pause") || s.contains("stop") || s.contains("suspend")
|
||||
}
|
||||
|
||||
/// The typed-confirmation gate for the irreversible firmware-flash action: the
|
||||
@@ -1109,6 +1161,12 @@ pub enum Column {
|
||||
FluidTemp,
|
||||
EnvTemp,
|
||||
OutletTemp,
|
||||
/// Board temperature safety thresholds (round 19 #10, T3): target / hot /
|
||||
/// dangerous. Populated where the firmware reports them (LuxOS full set, ePIC
|
||||
/// hot+dangerous, Braiins defaults, VNish target+dangerous); auto-hidden empty.
|
||||
TargetTemp,
|
||||
HotTemp,
|
||||
DangerousTemp,
|
||||
PsuFan,
|
||||
/// PSU identity + rated voltage envelope (round 17 R5). Populated where the
|
||||
/// firmware exposes PSU info (ePIC today).
|
||||
@@ -1134,12 +1192,17 @@ pub enum Column {
|
||||
Uptime,
|
||||
Light,
|
||||
OperatingState,
|
||||
/// Auto-tuner status label (round 19 #10, T3); Braiins/ePIC today.
|
||||
Tuner,
|
||||
BestShare,
|
||||
SessionBestShare,
|
||||
TuningPercent,
|
||||
// Round 19 #10: more scanned values surfaced as columns.
|
||||
/// Current tuning target (power or hashrate), e.g. "3200 W" or "100 TH".
|
||||
Target,
|
||||
/// Configured power-limit setpoint in watts (round 21 #2), e.g. WhatsMiner
|
||||
/// "Power Limit". A dedicated numeric column, distinct from the mixed Target.
|
||||
PowerLimit,
|
||||
/// Accepted / rejected share counts and the rejection ratio.
|
||||
Accepted,
|
||||
Rejected,
|
||||
@@ -1167,7 +1230,7 @@ pub enum Column {
|
||||
|
||||
/// Every column, in registry order. Ip first, then the default-visible set
|
||||
/// (UI-SPEC order), then all remaining metrics.
|
||||
pub const ALL_COLUMNS: [Column; 68] = [
|
||||
pub const ALL_COLUMNS: [Column; 73] = [
|
||||
Column::Ip,
|
||||
Column::Hashrate,
|
||||
Column::Hashrate1m,
|
||||
@@ -1195,6 +1258,9 @@ pub const ALL_COLUMNS: [Column; 68] = [
|
||||
Column::FluidTemp,
|
||||
Column::EnvTemp,
|
||||
Column::OutletTemp,
|
||||
Column::TargetTemp,
|
||||
Column::HotTemp,
|
||||
Column::DangerousTemp,
|
||||
Column::PsuFan,
|
||||
Column::PsuVersion,
|
||||
Column::PsuSerial,
|
||||
@@ -1217,10 +1283,12 @@ pub const ALL_COLUMNS: [Column; 68] = [
|
||||
Column::Uptime,
|
||||
Column::Light,
|
||||
Column::OperatingState,
|
||||
Column::Tuner,
|
||||
Column::BestShare,
|
||||
Column::SessionBestShare,
|
||||
Column::TuningPercent,
|
||||
Column::Target,
|
||||
Column::PowerLimit,
|
||||
Column::Accepted,
|
||||
Column::Rejected,
|
||||
Column::RejectRatio,
|
||||
@@ -1275,6 +1343,7 @@ impl Column {
|
||||
Column::Fan4 => "Fan 4 (RPM)",
|
||||
Column::FanSpeedPercent => "Fan %",
|
||||
Column::Target => "Target",
|
||||
Column::PowerLimit => "Power limit",
|
||||
Column::Accepted => "Accepted",
|
||||
Column::Rejected => "Rejected",
|
||||
Column::RejectRatio => "Reject %",
|
||||
@@ -1301,6 +1370,9 @@ impl Column {
|
||||
Column::FluidTemp => "Fluid temp",
|
||||
Column::EnvTemp => "Env temp",
|
||||
Column::OutletTemp => "Outlet temp",
|
||||
Column::TargetTemp => "Target temp",
|
||||
Column::HotTemp => "Hot temp",
|
||||
Column::DangerousTemp => "Dangerous temp",
|
||||
Column::PsuFan => "PSU fan (RPM)",
|
||||
Column::PsuVersion => "PSU version",
|
||||
Column::PsuSerial => "PSU serial",
|
||||
@@ -1324,6 +1396,7 @@ impl Column {
|
||||
Column::Uptime => "Uptime",
|
||||
Column::Light => "Light",
|
||||
Column::OperatingState => "State",
|
||||
Column::Tuner => "Tuner",
|
||||
Column::BestShare => "Best share",
|
||||
Column::SessionBestShare => "Session best",
|
||||
Column::TuningPercent => "Tuning %",
|
||||
@@ -1347,9 +1420,11 @@ impl Column {
|
||||
}
|
||||
Column::Power => 90,
|
||||
Column::ChipTemp | Column::FluidTemp | Column::EnvTemp | Column::OutletTemp => 95,
|
||||
Column::TargetTemp | Column::HotTemp | Column::DangerousTemp => 105,
|
||||
Column::Fan1 | Column::Fan2 | Column::Fan3 | Column::Fan4 | Column::PsuFan => 90,
|
||||
Column::FanSpeedPercent => 80,
|
||||
Column::Target => 110,
|
||||
Column::PowerLimit => 95,
|
||||
Column::Accepted | Column::Rejected => 100,
|
||||
Column::RejectRatio => 90,
|
||||
Column::DiffAccepted | Column::DiffRejected => 110,
|
||||
@@ -1385,6 +1460,7 @@ impl Column {
|
||||
Column::Error => 160,
|
||||
Column::Uptime => 100,
|
||||
Column::OperatingState => 100,
|
||||
Column::Tuner => 100,
|
||||
Column::BestShare | Column::SessionBestShare => 110,
|
||||
Column::PoolUrl | Column::Pool1Url | Column::Pool2Url | Column::Pool3Url => 200,
|
||||
Column::Pool1Worker | Column::Pool2Worker | Column::Pool3Worker => 150,
|
||||
@@ -1409,6 +1485,9 @@ impl Column {
|
||||
| Column::FluidTemp
|
||||
| Column::EnvTemp
|
||||
| Column::OutletTemp
|
||||
| Column::TargetTemp
|
||||
| Column::HotTemp
|
||||
| Column::DangerousTemp
|
||||
| Column::Fan1
|
||||
| Column::Fan2
|
||||
| Column::Fan3
|
||||
@@ -1434,6 +1513,7 @@ impl Column {
|
||||
| Column::BestShare
|
||||
| Column::SessionBestShare
|
||||
| Column::TuningPercent
|
||||
| Column::PowerLimit
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1449,7 +1529,10 @@ impl Column {
|
||||
// renders "- / <expected>" (non-empty) in that case, so the generic
|
||||
// blank check below is not enough on its own.
|
||||
match self {
|
||||
Column::Hashrate if r.hashrate_ths <= 0.0 => return None,
|
||||
// An unreadable hashrate has no numeric value; a reported 0 does (0.0),
|
||||
// so a filter like "hashrate > 0" excludes a stopped miner but "<= 50"
|
||||
// still matches it.
|
||||
Column::Hashrate if !r.hashrate_known => return None,
|
||||
Column::TotalChips if r.total_chips.is_none() => return None,
|
||||
_ => {}
|
||||
}
|
||||
@@ -1496,6 +1579,9 @@ impl Column {
|
||||
Column::FluidTemp => SortKey::Num(r.fluid_temp_c),
|
||||
Column::EnvTemp => SortKey::Num(r.env_temp_c),
|
||||
Column::OutletTemp => SortKey::Num(r.outlet_temp_c),
|
||||
Column::TargetTemp => SortKey::Num(r.temp_target_c.unwrap_or(none)),
|
||||
Column::HotTemp => SortKey::Num(r.temp_hot_c.unwrap_or(none)),
|
||||
Column::DangerousTemp => SortKey::Num(r.temp_dangerous_c.unwrap_or(none)),
|
||||
Column::Fan1 => SortKey::Num(r.fan_rpms.first().copied().unwrap_or(none)),
|
||||
Column::Fan2 => SortKey::Num(r.fan_rpms.get(1).copied().unwrap_or(none)),
|
||||
Column::Fan3 => SortKey::Num(r.fan_rpms.get(2).copied().unwrap_or(none)),
|
||||
@@ -1514,6 +1600,7 @@ impl Column {
|
||||
Column::BoardVoltage => SortKey::Num(avg_positive(&r.board_voltages, none)),
|
||||
Column::BoardFrequency => SortKey::Num(avg_positive(&r.board_frequencies, none)),
|
||||
Column::PsuFan => SortKey::Num(r.psu_fan_rpm),
|
||||
Column::PowerLimit => SortKey::Num(r.power_limit_w.unwrap_or(none)),
|
||||
Column::PsuVMin => SortKey::Num(r.psu_voltage_min_v.unwrap_or(none)),
|
||||
Column::PsuVMax => SortKey::Num(r.psu_voltage_max_v.unwrap_or(none)),
|
||||
Column::FanCount => SortKey::Num(r.fan_count.map(|v| v as f64).unwrap_or(none)),
|
||||
@@ -1553,7 +1640,7 @@ impl Column {
|
||||
let pool_worker = |i: usize| r.pools.get(i).map(|(_, w)| w.clone()).unwrap_or_default();
|
||||
match self {
|
||||
Column::Ip => r.ip.clone(),
|
||||
Column::Hashrate => combined_si(r.hashrate_ths, r.expected_ths),
|
||||
Column::Hashrate => combined_si(r.hashrate_ths, r.hashrate_known, r.expected_ths),
|
||||
// Rolling average windows: a single TH/s value, blank when not reported
|
||||
// (round 19 #10, T2).
|
||||
Column::Hashrate1m => format_hashrate_ths(r.hashrate_1m_ths).unwrap_or_default(),
|
||||
@@ -1595,6 +1682,9 @@ impl Column {
|
||||
Column::FluidTemp => num(r.fluid_temp_c, 1, " C"),
|
||||
Column::EnvTemp => num(r.env_temp_c, 1, " C"),
|
||||
Column::OutletTemp => num(r.outlet_temp_c, 1, " C"),
|
||||
Column::TargetTemp => r.temp_target_c.map(|v| num(v, 0, " C")).unwrap_or_default(),
|
||||
Column::HotTemp => r.temp_hot_c.map(|v| num(v, 0, " C")).unwrap_or_default(),
|
||||
Column::DangerousTemp => r.temp_dangerous_c.map(|v| num(v, 0, " C")).unwrap_or_default(),
|
||||
// Per-fan RPM: blank (not "-") when the fan index is absent, so a miner
|
||||
// with fewer fans leaves the extra Fan columns empty and auto-hide can
|
||||
// drop them (round 19 #8).
|
||||
@@ -1606,6 +1696,7 @@ impl Column {
|
||||
r.fan_speed_percent.map(|v| format!("{v:.0}%")).unwrap_or_default()
|
||||
}
|
||||
Column::Target => r.tuning_target_label.clone().unwrap_or_default(),
|
||||
Column::PowerLimit => r.power_limit_w.map(|w| format!("{w:.0} W")).unwrap_or_default(),
|
||||
Column::Accepted => r.accepted_shares.map(|v| v.to_string()).unwrap_or_default(),
|
||||
Column::Rejected => r.rejected_shares.map(|v| v.to_string()).unwrap_or_default(),
|
||||
Column::RejectRatio => r.reject_ratio().map(|v| format!("{v:.2}%")).unwrap_or_default(),
|
||||
@@ -1684,6 +1775,7 @@ impl Column {
|
||||
None => String::new(),
|
||||
},
|
||||
Column::OperatingState => r.operating_state.clone(),
|
||||
Column::Tuner => r.tuner_status.clone(),
|
||||
Column::BestShare => r.best_share.map(|v| format_si(v, "")).unwrap_or_default(),
|
||||
Column::SessionBestShare => {
|
||||
r.session_best_share.map(|v| format_si(v, "")).unwrap_or_default()
|
||||
@@ -1710,13 +1802,14 @@ impl Column {
|
||||
| Column::HbType => (1, "Firmware & board"),
|
||||
Column::Health | Column::HealthPower | Column::HealthFans | Column::HealthBoards
|
||||
| Column::Status | Column::Error | Column::Locked | Column::Light
|
||||
| Column::OperatingState => (2, "Health & status"),
|
||||
| Column::OperatingState | Column::Tuner => (2, "Health & status"),
|
||||
Column::Hashrate | Column::HashrateRel | Column::Hashrate1m | Column::Hashrate5m
|
||||
| Column::Hashrate15m | Column::Hashrate24h | Column::Power | Column::Efficiency
|
||||
| Column::TuningPercent | Column::BestShare | Column::SessionBestShare
|
||||
| Column::Uptime | Column::Target | Column::BoardHashrate | Column::BoardVoltage
|
||||
| Column::BoardFrequency => (3, "Performance"),
|
||||
Column::ChipTemp | Column::FluidTemp | Column::EnvTemp | Column::OutletTemp => {
|
||||
| Column::Uptime | Column::Target | Column::PowerLimit | Column::BoardHashrate
|
||||
| Column::BoardVoltage | Column::BoardFrequency => (3, "Performance"),
|
||||
Column::ChipTemp | Column::FluidTemp | Column::EnvTemp | Column::OutletTemp
|
||||
| Column::TargetTemp | Column::HotTemp | Column::DangerousTemp => {
|
||||
(4, "Temperature")
|
||||
}
|
||||
Column::Fan1 | Column::Fan2 | Column::Fan3 | Column::Fan4 | Column::PsuFan
|
||||
@@ -2171,6 +2264,51 @@ mod tests {
|
||||
assert_eq!(mb[2], CompHealth::Unreachable, "undetected board named by a fault stays grey");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn warning_fault_degrades_board_to_yellow_not_red() {
|
||||
// Round 21 #1: a board still mining near full hashrate with some failed/
|
||||
// degraded chips reports a WARNING-severity fault. It must render yellow
|
||||
// (Degraded), not red (Down) -- red is reserved for an error (down board).
|
||||
let warn = |c: FaultComponent, m: &str| Fault {
|
||||
component: c,
|
||||
message: m.to_string(),
|
||||
code: 0,
|
||||
is_error: false,
|
||||
};
|
||||
let err = |c: FaultComponent, m: &str| Fault {
|
||||
component: c,
|
||||
message: m.to_string(),
|
||||
code: 0,
|
||||
is_error: true,
|
||||
};
|
||||
// Three mining boards; board 0 has a warning (dead chips), board 2 an error.
|
||||
let r = MinerRow {
|
||||
is_mining: true,
|
||||
board_status: vec![BoardHealth::Ok, BoardHealth::Ok, BoardHealth::Ok],
|
||||
faults: vec![
|
||||
warn(FaultComponent::Board(0), "Hashboard 1: 10 failed chip(s)"),
|
||||
err(FaultComponent::Board(2), "Hashboard 3: stopped"),
|
||||
],
|
||||
..Default::default()
|
||||
};
|
||||
let b = r.board_healths();
|
||||
assert_eq!(b[0], CompHealth::Degraded, "warning -> yellow");
|
||||
assert_eq!(b[1], CompHealth::Ok, "no fault -> green");
|
||||
assert_eq!(b[2], CompHealth::Down, "error -> red");
|
||||
|
||||
// A warning never upgrades a board already red from an error on the same board.
|
||||
let both = MinerRow {
|
||||
is_mining: true,
|
||||
board_status: vec![BoardHealth::Ok],
|
||||
faults: vec![
|
||||
warn(FaultComponent::Board(0), "degraded chips"),
|
||||
err(FaultComponent::Board(0), "stopped"),
|
||||
],
|
||||
..Default::default()
|
||||
};
|
||||
assert_eq!(both.board_healths()[0], CompHealth::Down, "error wins over warning");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn equihash_hashrate_units_round18() {
|
||||
// SHA256 shows the TH/s value directly; Equihash shows the Sol/s count
|
||||
@@ -2778,7 +2916,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn numeric_filter_operators() {
|
||||
let r = MinerRow { hashrate_ths: 100.0, is_mining: true, ..Default::default() };
|
||||
let r = MinerRow { hashrate_ths: 100.0, hashrate_known: true, is_mining: true, ..Default::default() };
|
||||
let c = Column::Hashrate;
|
||||
let n = |op, a: f64, b: f64| ColFilter::Num { op, a, b }.matches(c, &r);
|
||||
assert!(n(NumOp::Gt, 50.0, 0.0));
|
||||
@@ -2799,7 +2937,7 @@ mod tests {
|
||||
assert_eq!(Column::Firmware.num_value(&r), None, "text column");
|
||||
assert_eq!(Column::Ip.num_value(&r), None, "IP is text, not numeric");
|
||||
assert_eq!(Column::Efficiency.num_value(&r), None, "blank numeric -> None");
|
||||
let r2 = MinerRow { hashrate_ths: 42.0, ..Default::default() };
|
||||
let r2 = MinerRow { hashrate_ths: 42.0, hashrate_known: true, ..Default::default() };
|
||||
assert_eq!(Column::Hashrate.num_value(&r2), Some(42.0));
|
||||
}
|
||||
|
||||
@@ -2872,6 +3010,7 @@ mod tests {
|
||||
|
||||
let actual_only = MinerRow {
|
||||
hashrate_ths: 60.0,
|
||||
hashrate_known: true,
|
||||
total_chips: Some(210),
|
||||
..Default::default()
|
||||
};
|
||||
@@ -2883,11 +3022,24 @@ mod tests {
|
||||
expected_chips: Some(228),
|
||||
..Default::default()
|
||||
};
|
||||
assert_eq!(Column::Hashrate.cell(&expected_only), "-/200T", "only expected -> '-/<expected>'");
|
||||
assert_eq!(Column::Hashrate.cell(&expected_only), "-/200T", "only expected (actual unreadable) -> '-/<expected>'");
|
||||
assert_eq!(Column::TotalChips.cell(&expected_only), "- / 228");
|
||||
|
||||
// A reported zero is a real reading -> "0.00T", never the dash. The dash
|
||||
// (expected_only above) is reserved for an unreadable actual.
|
||||
let reported_zero = MinerRow {
|
||||
hashrate_ths: 0.0,
|
||||
hashrate_known: true,
|
||||
expected_ths: 200.0,
|
||||
..Default::default()
|
||||
};
|
||||
assert_eq!(Column::Hashrate.cell(&reported_zero), "0.00T/200T", "reported 0 -> 0.00T, not a dash");
|
||||
let reported_zero_no_expected = MinerRow { hashrate_ths: 0.0, hashrate_known: true, ..Default::default() };
|
||||
assert_eq!(Column::Hashrate.cell(&reported_zero_no_expected), "0.00T");
|
||||
|
||||
let both = MinerRow {
|
||||
hashrate_ths: 60.0,
|
||||
hashrate_known: true,
|
||||
expected_ths: 200.0,
|
||||
total_chips: Some(190),
|
||||
expected_chips: Some(228),
|
||||
@@ -2911,6 +3063,7 @@ mod tests {
|
||||
|
||||
let both = MinerRow {
|
||||
hashrate_ths: 60.0,
|
||||
hashrate_known: true,
|
||||
expected_ths: 200.0,
|
||||
total_chips: Some(190),
|
||||
expected_chips: Some(228),
|
||||
@@ -2984,8 +3137,16 @@ mod tests {
|
||||
fn is_paused_detection() {
|
||||
assert!(is_paused("Paused", false));
|
||||
assert!(is_paused("PAUSED (manual)", false));
|
||||
assert!(!is_paused("Paused", true), "mining overrides an even stale 'paused' state string");
|
||||
// Intentional halts other firmwares report: VNish "Stopped" (miner_state
|
||||
// "stopped"), Braiins "Suspended", a "Stopping" transition (round 19 #19 /
|
||||
// 10.4.1.122 read as broken before this).
|
||||
assert!(is_paused("Stopped", false), "an operator-stopped miner is paused, not broken");
|
||||
assert!(is_paused("Stopping", false));
|
||||
assert!(is_paused("Suspended", false));
|
||||
assert!(!is_paused("Stopped", true), "mining overrides a stale 'stopped' state string");
|
||||
assert!(!is_paused("Mining", false));
|
||||
assert!(!is_paused("Error", false), "a failure is broken, not paused");
|
||||
assert!(!is_paused("Idling", false), "plain idle is not an explicit halt");
|
||||
assert!(!is_paused("", false));
|
||||
}
|
||||
|
||||
|
||||
@@ -95,6 +95,44 @@ pub fn clean_model(make: &str, model_id: &str) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
/// Best-effort ASIC chip model for a miner, used ONLY as a fallback when the
|
||||
/// firmware did not report a chip type on the wire (round 21 #3). Most firmwares
|
||||
/// on Antminer hardware (stock Antminer, VNish, LuxOS, Braiins, UMC) never put the
|
||||
/// chip string in their API, but the chip is a fixed per-model hardware fact, so
|
||||
/// it can be derived from the detected model. Only high-confidence, widely
|
||||
/// documented Antminer mappings are returned; everything else (and WhatsMiner,
|
||||
/// whose chips are not cleanly named) returns None so the column stays blank
|
||||
/// rather than show a guess. `model_id` is the raw asic-rs model id.
|
||||
pub fn chip_type_for_model(make: &str, model_id: &str) -> Option<&'static str> {
|
||||
if !is_antminer(make) {
|
||||
return None;
|
||||
}
|
||||
// Normalize: drop a leading "ANTMINER ", cut any trailing parenthetical
|
||||
// ("S19 (88)" -> "S19"), uppercase, and strip every non-alphanumeric char.
|
||||
let base = model_id.trim();
|
||||
let base = base
|
||||
.strip_prefix("ANTMINER ")
|
||||
.or_else(|| base.strip_prefix("Antminer "))
|
||||
.unwrap_or(base);
|
||||
let base = base.split('(').next().unwrap_or(base);
|
||||
let key: String = base
|
||||
.chars()
|
||||
.filter(|c| c.is_ascii_alphanumeric())
|
||||
.map(|c| c.to_ascii_uppercase())
|
||||
.collect();
|
||||
// Bitmain chip per model (SHA-256 air/hydro). Sources: Bitmain shop specs +
|
||||
// repair-guide chip markings. Keep conservative -- omit uncertain variants.
|
||||
let chip = match key.as_str() {
|
||||
"S19" | "S19PRO" | "S19A" | "S19APRO" | "T19" => "BM1398",
|
||||
"S19PROPLUSHYD" | "S19PROPLUSHYDRO" | "S19PROHYD" | "S19PROHYDRO" => "BM1398",
|
||||
"S19J" | "S19JPRO" | "S19JPROPLUS" | "S19JPRONOPIC" => "BM1362",
|
||||
"S19XP" | "S19XPHYD" | "S19XPHYDRO" | "S19KPRO" | "S19KPRONOPIC" => "BM1366",
|
||||
"S21" | "S21PRO" | "S21PLUS" | "S21HYD" | "S21HYDRO" | "T21" => "BM1370",
|
||||
_ => return None,
|
||||
};
|
||||
Some(chip)
|
||||
}
|
||||
|
||||
/// The Submodel column value. WhatsMiner: the version block ("VE40"). Antminer:
|
||||
/// empty -- the hashboard type is not reported over the network by asic-rs.
|
||||
pub fn submodel(make: &str, model_id: &str) -> String {
|
||||
@@ -313,6 +351,23 @@ pub fn equihash_expected_sols(clean_model: &str) -> Option<f64> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn chip_type_derivation() {
|
||||
// Fleet models (round 21 #3): derived from the detected model for Antminer
|
||||
// hardware where the firmware does not report a chip string on the wire.
|
||||
assert_eq!(chip_type_for_model("Antminer", "S21Pro"), Some("BM1370"));
|
||||
assert_eq!(chip_type_for_model("Antminer", "S19jPro"), Some("BM1362"));
|
||||
assert_eq!(chip_type_for_model("Antminer", "S19KPro"), Some("BM1366"));
|
||||
assert_eq!(chip_type_for_model("Antminer", "S19"), Some("BM1398"));
|
||||
assert_eq!(chip_type_for_model("Antminer", "T19"), Some("BM1398"));
|
||||
// Raw "Unknown" passthrough with brand + parenthetical normalizes to S19.
|
||||
assert_eq!(chip_type_for_model("Antminer", "ANTMINER S19 (88)"), Some("BM1398"));
|
||||
// WhatsMiner chips are not cleanly named -> never derived.
|
||||
assert_eq!(chip_type_for_model("Whatsminer", "M30S+VE40"), None);
|
||||
// Unknown Antminer model -> None (no guess).
|
||||
assert_eq!(chip_type_for_model("Antminer", "L7"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn brand_normalises_case() {
|
||||
assert_eq!(brand("Antminer"), "Antminer");
|
||||
|
||||
@@ -747,6 +747,9 @@ fn partial_row(miner: &dyn Miner, ip: std::net::IpAddr) -> MinerRow {
|
||||
|
||||
async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
let data = miner.get_data().await;
|
||||
// Whether the firmware reported a current hashrate at all: a reported 0 renders
|
||||
// "0.00T", an absent one the "-" dash (round 19 follow-up).
|
||||
let hashrate_known = data.hashrate.is_some();
|
||||
let hashrate_ths = data
|
||||
.hashrate
|
||||
.as_ref()
|
||||
@@ -990,6 +993,10 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
TuningTarget::Preset(s) => format!("preset {s}"),
|
||||
TuningTarget::Manual { .. } => "manual".to_string(),
|
||||
});
|
||||
// The configured power-limit setpoint in watts, when the target is a power
|
||||
// target (WhatsMiner "Power Limit", VNish/Braiins power targets). Its own
|
||||
// numeric column (round 21 #2), distinct from the mixed Target label.
|
||||
let power_limit_w = data.tuning_target.as_ref().and_then(&target_watts);
|
||||
// A hashrate target is offerable only where the firmware actively tunes by
|
||||
// hashrate through set_tuning_config (ePIC); Braiins advertises a hashrate
|
||||
// envelope but has no set_tuning_config wired, so it is excluded.
|
||||
@@ -1071,8 +1078,15 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
algorithm,
|
||||
// ASIC chip type + hashboard model, from the first board that reports them
|
||||
// (uniform across boards); empty where the firmware doesn't expose them
|
||||
// (round 19 #10).
|
||||
chip_type: data.hashboards.iter().find_map(|b| b.chip_type.clone()).unwrap_or_default(),
|
||||
// (round 19 #10). When no board reports a chip type (VNish/stock
|
||||
// Antminer/LuxOS never do), fall back to the fixed per-model chip for
|
||||
// Antminer hardware (round 21 #3).
|
||||
chip_type: data
|
||||
.hashboards
|
||||
.iter()
|
||||
.find_map(|b| b.chip_type.clone())
|
||||
.or_else(|| crate::naming::chip_type_for_model(&make, &model_id).map(str::to_string))
|
||||
.unwrap_or_default(),
|
||||
hashboard_model: data
|
||||
.hashboards
|
||||
.iter()
|
||||
@@ -1111,6 +1125,7 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
cpu,
|
||||
board_code,
|
||||
hashrate_ths,
|
||||
hashrate_known,
|
||||
hashrate_1m_ths,
|
||||
hashrate_5m_ths,
|
||||
hashrate_15m_ths,
|
||||
@@ -1141,6 +1156,7 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
psu_voltage_min_v: data.psu.as_ref().and_then(|p| p.voltage_min),
|
||||
psu_voltage_max_v: data.psu.as_ref().and_then(|p| p.voltage_max),
|
||||
tuning_target_label,
|
||||
power_limit_w,
|
||||
power_target_min_w,
|
||||
power_target_max_w,
|
||||
hashrate_target_min_ths,
|
||||
@@ -1151,6 +1167,9 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
fluid_temp_c,
|
||||
env_temp_c,
|
||||
outlet_temp_c,
|
||||
temp_target_c: data.temp_target,
|
||||
temp_hot_c: data.temp_hot,
|
||||
temp_dangerous_c: data.temp_dangerous,
|
||||
fan_rpms,
|
||||
fan_speed_percent: data.fan_speed_percent,
|
||||
psu_fan_rpm,
|
||||
@@ -1198,6 +1217,7 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
|
||||
uptime_secs: data.uptime.map(|d| d.as_secs()).unwrap_or(0),
|
||||
light_flashing: data.light_flashing,
|
||||
operating_state,
|
||||
tuner_status: data.tuner_status.clone().unwrap_or_default(),
|
||||
is_mining,
|
||||
slow,
|
||||
paused,
|
||||
|
||||
@@ -438,28 +438,44 @@ fn encode_component_health(
|
||||
max_fans: usize,
|
||||
max_boards: usize,
|
||||
) -> String {
|
||||
use crate::model::CompHealth;
|
||||
let mut segs: Vec<Segment> = Vec::new();
|
||||
// On a paused/stopped miner, a component that is off *because* the miner is
|
||||
// halted is expected, not a fault, so it reads blue (paused) instead of red.
|
||||
// But this only applies where "not working" is a consequence of the pause:
|
||||
// - Hashboards: idle (not hashing) is exactly what pausing does -> blue when
|
||||
// paused (any detected board; an undetected one stays grey). Round 19 #19.
|
||||
// - Fans: blue ONLY when actually stopped (0 RPM -> Down); a fan still
|
||||
// spinning stays green/amber -- pausing doesn't necessarily stop the fans.
|
||||
// - Control board + PSU: still running / powered, so they keep their true
|
||||
// health (green when fine) even while paused -- never forced blue.
|
||||
let paused = r.paused;
|
||||
let board_col = |h: CompHealth| {
|
||||
if paused && h != CompHealth::Unreachable {
|
||||
pal.accent
|
||||
} else {
|
||||
health_color(pal, h)
|
||||
}
|
||||
};
|
||||
let fan_col = |h: CompHealth| {
|
||||
if paused && h == CompHealth::Down {
|
||||
pal.accent
|
||||
} else {
|
||||
health_color(pal, h)
|
||||
}
|
||||
};
|
||||
segs.push((Some(health_color(pal, r.power_health())), SHAPE_BOLT.to_string()));
|
||||
segs.push((Some(health_color(pal, r.control_health())), SHAPE_BRAIN.to_string()));
|
||||
let fans = r.fan_healths();
|
||||
for h in &fans {
|
||||
segs.push((Some(health_color(pal, *h)), SHAPE_FAN.to_string()));
|
||||
segs.push((Some(fan_col(*h)), SHAPE_FAN.to_string()));
|
||||
}
|
||||
for _ in fans.len()..max_fans {
|
||||
segs.push((None, SHAPE_GAP.to_string()));
|
||||
}
|
||||
let boards = r.board_healths();
|
||||
for h in &boards {
|
||||
// A paused miner's boards are intentionally idle, not faulty: show every
|
||||
// detected board blue instead of its (red) health colour, while every
|
||||
// other component keeps its normal colour. A genuinely undetected board
|
||||
// stays grey (round 19 #19).
|
||||
let color = if r.paused && *h != crate::model::CompHealth::Unreachable {
|
||||
pal.accent
|
||||
} else {
|
||||
health_color(pal, *h)
|
||||
};
|
||||
segs.push((Some(color), SHAPE_CHIP.to_string()));
|
||||
segs.push((Some(board_col(*h)), SHAPE_CHIP.to_string()));
|
||||
}
|
||||
for _ in boards.len()..max_boards {
|
||||
segs.push((None, SHAPE_GAP.to_string()));
|
||||
@@ -1269,7 +1285,9 @@ impl App {
|
||||
// on the ACTUAL being known, so an unknown actual renders as
|
||||
// "-/<expected>" in the default colour rather than a red 0%.
|
||||
Column::Hashrate => {
|
||||
let actual = format_hashrate_ths(r.hashrate_ths);
|
||||
// A reported 0 shows "0.00T" (not a dash); the dash is only for
|
||||
// an unreadable reading (hashrate_known == false).
|
||||
let actual = format_hashrate_actual(r.hashrate_ths, r.hashrate_known);
|
||||
let expected = format_hashrate_ths(r.expected_ths);
|
||||
let ratio = (r.hashrate_ths > 0.0)
|
||||
.then(|| actual_expected_ratio(r.hashrate_ths, r.expected_ths))
|
||||
|
||||
@@ -0,0 +1,136 @@
|
||||
Subject: [PATCH 0028] telemetry: board temperature thresholds (critical / shutdown)
|
||||
|
||||
Round 19 #10 telemetry extension, tier 3. Exposes the board temperature safety
|
||||
thresholds ("board dangerous temp" from item #10).
|
||||
|
||||
- New DataField::TemperatureLimits; MinerData gains temp_critical and temp_shutdown
|
||||
(Celsius). Rides the EXISTING GetFluidTemperature trait via a defaulted
|
||||
parse_temperature_limits method returning (critical, shutdown), so no new
|
||||
supertrait bound; only backends that expose the thresholds override it.
|
||||
- ePIC: summary /Misc Critical Temp + Shutdown Temp (already-fetched summary).
|
||||
Antminer/WhatsMiner do not expose thresholds; LuxOS needs an unwired tempctrl
|
||||
command (no fixture) and VNish/Braiins need live verification -> left for a
|
||||
live-verified pass, all inherit (None, None).
|
||||
|
||||
Fixture test for epic asserts the parsed thresholds.
|
||||
|
||||
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
|
||||
index 07d9d571..1e6e7e9d 100644
|
||||
--- a/vendor/asic-rs-core/src/data/collector.rs
|
||||
+++ b/vendor/asic-rs-core/src/data/collector.rs
|
||||
@@ -65,6 +65,9 @@ pub enum DataField {
|
||||
/// Miner-level fan duty cycle as a percentage (0-100).
|
||||
#[cfg_attr(feature = "python", pydantic(value = "FanSpeedPercent"))]
|
||||
FanSpeedPercent,
|
||||
+ /// Board temperature safety thresholds (critical / shutdown), in Celsius.
|
||||
+ #[cfg_attr(feature = "python", pydantic(value = "TemperatureLimits"))]
|
||||
+ TemperatureLimits,
|
||||
/// PSU fan speed or configuration.
|
||||
#[cfg_attr(feature = "python", pydantic(value = "PsuFans"))]
|
||||
PsuFans,
|
||||
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
|
||||
index 6dc73d26..08782856 100644
|
||||
--- a/vendor/asic-rs-core/src/data/miner.rs
|
||||
+++ b/vendor/asic-rs-core/src/data/miner.rs
|
||||
@@ -181,6 +181,10 @@ pub struct MinerData {
|
||||
/// Miner-level fan duty cycle as a percentage (0-100), when reported. Firmware
|
||||
/// exposes no maximum RPM, so this duty cycle is the normalized fan indicator.
|
||||
pub fan_speed_percent: Option<f64>,
|
||||
+ /// Board critical temperature threshold in Celsius, when reported (round 19 #10).
|
||||
+ pub temp_critical: Option<f64>,
|
||||
+ /// Board shutdown temperature threshold in Celsius, when reported (round 19 #10).
|
||||
+ pub temp_shutdown: Option<f64>,
|
||||
/// The current PDU fan information for the miner
|
||||
pub psu_fans: Vec<FanData>,
|
||||
/// The average temperature across all chips in the miner
|
||||
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
|
||||
index baac9387..9de51761 100644
|
||||
--- a/vendor/asic-rs-core/src/traits/miner.rs
|
||||
+++ b/vendor/asic-rs-core/src/traits/miner.rs
|
||||
@@ -282,6 +282,7 @@ impl<
|
||||
let tuning_capabilities = self.parse_tuning_capabilities(&data);
|
||||
let fluid_temperature = self.parse_fluid_temperature(&data);
|
||||
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
|
||||
+ let (temp_critical, temp_shutdown) = self.parse_temperature_limits(&data);
|
||||
let fans = self.parse_fans(&data);
|
||||
let fan_speed_percent = self.parse_fan_speed_percent(&data);
|
||||
let psu_fans = self.parse_psu_fans(&data);
|
||||
@@ -368,6 +369,8 @@ impl<
|
||||
expected_fans: device_info.hardware.fans,
|
||||
fans,
|
||||
fan_speed_percent,
|
||||
+ temp_critical,
|
||||
+ temp_shutdown,
|
||||
psu_fans,
|
||||
average_temperature,
|
||||
fluid_temperature,
|
||||
@@ -741,6 +744,15 @@ pub trait GetFluidTemperature: CollectData {
|
||||
) -> Option<Temperature> {
|
||||
None
|
||||
}
|
||||
+ /// Board temperature safety thresholds as (critical, shutdown) in Celsius.
|
||||
+ /// Backends that expose them override this; others return (None, None).
|
||||
+ #[allow(unused_variables)]
|
||||
+ fn parse_temperature_limits(
|
||||
+ &self,
|
||||
+ data: &HashMap<DataField, Value>,
|
||||
+ ) -> (Option<f64>, Option<f64>) {
|
||||
+ (None, None)
|
||||
+ }
|
||||
}
|
||||
|
||||
// Wattage
|
||||
diff --git a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
index 16c7872b..0c9a851b 100644
|
||||
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
@@ -482,6 +482,16 @@ impl GetDataLocations for PowerPlayV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Board temperature thresholds (round 19 #10, T3); summary /Misc carries
|
||||
+ // Critical Temp and Shutdown Temp. Already fetched.
|
||||
+ DataField::TemperatureLimits => vec![(
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/Misc"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
DataField::Hashboards => vec![
|
||||
(
|
||||
WEB_TEMPS,
|
||||
@@ -1139,7 +1149,21 @@ impl GetFans for PowerPlayV1 {
|
||||
impl GetPsuFans for PowerPlayV1 {}
|
||||
impl GetTuningCapabilities for PowerPlayV1 {}
|
||||
|
||||
-impl GetFluidTemperature for PowerPlayV1 {}
|
||||
+impl GetFluidTemperature for PowerPlayV1 {
|
||||
+ fn parse_temperature_limits(
|
||||
+ &self,
|
||||
+ data: &HashMap<DataField, Value>,
|
||||
+ ) -> (Option<f64>, Option<f64>) {
|
||||
+ // ePIC summary /Misc: Critical Temp + Shutdown Temp (round 19 #10, T3).
|
||||
+ let d = data.get(&DataField::TemperatureLimits);
|
||||
+ let f = |k: &str| {
|
||||
+ d.and_then(|v| v.pointer(k))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0)
|
||||
+ };
|
||||
+ (f("/Critical Temp"), f("/Shutdown Temp"))
|
||||
+ }
|
||||
+}
|
||||
|
||||
impl GetWattage for PowerPlayV1 {
|
||||
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
|
||||
@@ -2205,6 +2229,9 @@ mod tests {
|
||||
assert_eq!(miner_data.wattage, Some(Power::from_watts(2166.6174)));
|
||||
// Miner-level fan duty cycle from summary /Fans/Fans Speed (round 19 #10, T3).
|
||||
assert_eq!(miner_data.fan_speed_percent, Some(100.0));
|
||||
+ // Board temp thresholds from summary /Misc (round 19 #10, T3).
|
||||
+ assert_eq!(miner_data.temp_critical, Some(100.0));
|
||||
+ assert_eq!(miner_data.temp_shutdown, Some(85.0));
|
||||
assert_eq!(miner_data.hashboards.len(), 3);
|
||||
assert_eq!(miner_data.hashboards[0].active, Some(false));
|
||||
assert_eq!(miner_data.hashboards[1].chips.len(), 110);
|
||||
@@ -0,0 +1,378 @@
|
||||
Subject: [PATCH 0029] telemetry: board temp thresholds -> target/hot/dangerous (LuxOS, Braiins; remap ePIC)
|
||||
|
||||
Round 19 #10, tier 3. Remodels the board temperature thresholds to the
|
||||
target/hot/dangerous scheme from item #10 and adds the LuxOS and Braiins backends.
|
||||
Supersedes the ePIC-only critical/shutdown model from patch 0028.
|
||||
|
||||
- MinerData: temp_critical/temp_shutdown -> temp_target/temp_hot/temp_dangerous.
|
||||
parse_temperature_limits (on the existing GetFluidTemperature trait) now returns
|
||||
(target, hot, dangerous).
|
||||
- LuxOS: new tempctrl RPC command; ChipTarget/ChipHot/ChipDangerous
|
||||
(live-verified 83/93/100, fixture tempctrl.json).
|
||||
- Braiins v25_07 + v26_04: configuration/constraints cooling_constraints defaults
|
||||
target/hot/dangerous (live-verified 60/80/90, fixture configuration_constraints.json;
|
||||
WEB_CONSTRAINTS already fetched).
|
||||
- ePIC remap: Shutdown Temp -> hot, Critical Temp -> dangerous, no target.
|
||||
- Antminer/WhatsMiner expose no thresholds; VNish handled separately (settings auth).
|
||||
|
||||
Fixture tests for epic, luxminer, braiins v26_04 assert the parsed thresholds.
|
||||
|
||||
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
|
||||
index 08782856..9f74fc43 100644
|
||||
--- a/vendor/asic-rs-core/src/data/miner.rs
|
||||
+++ b/vendor/asic-rs-core/src/data/miner.rs
|
||||
@@ -181,10 +181,12 @@ pub struct MinerData {
|
||||
/// Miner-level fan duty cycle as a percentage (0-100), when reported. Firmware
|
||||
/// exposes no maximum RPM, so this duty cycle is the normalized fan indicator.
|
||||
pub fan_speed_percent: Option<f64>,
|
||||
- /// Board critical temperature threshold in Celsius, when reported (round 19 #10).
|
||||
- pub temp_critical: Option<f64>,
|
||||
- /// Board shutdown temperature threshold in Celsius, when reported (round 19 #10).
|
||||
- pub temp_shutdown: Option<f64>,
|
||||
+ /// Board target temperature threshold in Celsius, when reported (round 19 #10).
|
||||
+ pub temp_target: Option<f64>,
|
||||
+ /// Board hot temperature threshold in Celsius, when reported (round 19 #10).
|
||||
+ pub temp_hot: Option<f64>,
|
||||
+ /// Board dangerous temperature threshold in Celsius, when reported (round 19 #10).
|
||||
+ pub temp_dangerous: Option<f64>,
|
||||
/// The current PDU fan information for the miner
|
||||
pub psu_fans: Vec<FanData>,
|
||||
/// The average temperature across all chips in the miner
|
||||
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
|
||||
index 9de51761..25ea6168 100644
|
||||
--- a/vendor/asic-rs-core/src/traits/miner.rs
|
||||
+++ b/vendor/asic-rs-core/src/traits/miner.rs
|
||||
@@ -282,7 +282,7 @@ impl<
|
||||
let tuning_capabilities = self.parse_tuning_capabilities(&data);
|
||||
let fluid_temperature = self.parse_fluid_temperature(&data);
|
||||
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
|
||||
- let (temp_critical, temp_shutdown) = self.parse_temperature_limits(&data);
|
||||
+ let (temp_target, temp_hot, temp_dangerous) = self.parse_temperature_limits(&data);
|
||||
let fans = self.parse_fans(&data);
|
||||
let fan_speed_percent = self.parse_fan_speed_percent(&data);
|
||||
let psu_fans = self.parse_psu_fans(&data);
|
||||
@@ -369,8 +369,9 @@ impl<
|
||||
expected_fans: device_info.hardware.fans,
|
||||
fans,
|
||||
fan_speed_percent,
|
||||
- temp_critical,
|
||||
- temp_shutdown,
|
||||
+ temp_target,
|
||||
+ temp_hot,
|
||||
+ temp_dangerous,
|
||||
psu_fans,
|
||||
average_temperature,
|
||||
fluid_temperature,
|
||||
@@ -744,14 +745,14 @@ pub trait GetFluidTemperature: CollectData {
|
||||
) -> Option<Temperature> {
|
||||
None
|
||||
}
|
||||
- /// Board temperature safety thresholds as (critical, shutdown) in Celsius.
|
||||
- /// Backends that expose them override this; others return (None, None).
|
||||
+ /// Board temperature safety thresholds as (target, hot, dangerous) in Celsius.
|
||||
+ /// Backends that expose them override this; others return (None, None, None).
|
||||
#[allow(unused_variables)]
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
- ) -> (Option<f64>, Option<f64>) {
|
||||
- (None, None)
|
||||
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
+ (None, None, None)
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
|
||||
index 86e84d8c..0dec8d38 100644
|
||||
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
|
||||
@@ -372,6 +372,16 @@ impl GetDataLocations for BraiinsV2507 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
|
||||
+ // (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
|
||||
+ DataField::TemperatureLimits => vec![(
|
||||
+ WEB_CONSTRAINTS,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/cooling_constraints"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -725,7 +735,26 @@ impl GetScaledTuningTarget for BraiinsV2507 {
|
||||
}
|
||||
}
|
||||
|
||||
-impl GetFluidTemperature for BraiinsV2507 {}
|
||||
+impl GetFluidTemperature for BraiinsV2507 {
|
||||
+ fn parse_temperature_limits(
|
||||
+ &self,
|
||||
+ data: &HashMap<DataField, Value>,
|
||||
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
+ // Braiins cooling_constraints target/hot/dangerous default thresholds in
|
||||
+ // degree_c (round 19 #10, T3).
|
||||
+ let d = data.get(&DataField::TemperatureLimits);
|
||||
+ let f = |k: &str| {
|
||||
+ d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0)
|
||||
+ };
|
||||
+ (
|
||||
+ f("target_temperature"),
|
||||
+ f("hot_temperature"),
|
||||
+ f("dangerous_temperature"),
|
||||
+ )
|
||||
+ }
|
||||
+}
|
||||
impl GetTuningCapabilities for BraiinsV2507 {
|
||||
fn parse_tuning_capabilities(
|
||||
&self,
|
||||
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
|
||||
index 303fca49..4e423e5b 100644
|
||||
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
|
||||
@@ -393,6 +393,16 @@ impl GetDataLocations for BraiinsV2604 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
|
||||
+ // (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
|
||||
+ DataField::TemperatureLimits => vec![(
|
||||
+ WEB_CONSTRAINTS,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/cooling_constraints"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -775,7 +785,26 @@ impl GetScaledTuningTarget for BraiinsV2604 {
|
||||
}
|
||||
}
|
||||
|
||||
-impl GetFluidTemperature for BraiinsV2604 {}
|
||||
+impl GetFluidTemperature for BraiinsV2604 {
|
||||
+ fn parse_temperature_limits(
|
||||
+ &self,
|
||||
+ data: &HashMap<DataField, Value>,
|
||||
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
+ // Braiins cooling_constraints target/hot/dangerous default thresholds in
|
||||
+ // degree_c (round 19 #10, T3).
|
||||
+ let d = data.get(&DataField::TemperatureLimits);
|
||||
+ let f = |k: &str| {
|
||||
+ d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0)
|
||||
+ };
|
||||
+ (
|
||||
+ f("target_temperature"),
|
||||
+ f("hot_temperature"),
|
||||
+ f("dangerous_temperature"),
|
||||
+ )
|
||||
+ }
|
||||
+}
|
||||
impl GetTuningCapabilities for BraiinsV2604 {
|
||||
fn parse_tuning_capabilities(
|
||||
&self,
|
||||
@@ -1167,10 +1196,10 @@ mod tests {
|
||||
|
||||
use super::*;
|
||||
use crate::test::json::v26_04::{
|
||||
- WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND, WEB_LOCATE_COMMAND,
|
||||
- WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND, WEB_MINER_STATS_COMMAND,
|
||||
- WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND, WEB_POOLS_COMMAND,
|
||||
- WEB_VERSION_COMMAND,
|
||||
+ WEB_CONSTRAINTS_COMMAND, WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND,
|
||||
+ WEB_LOCATE_COMMAND, WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND,
|
||||
+ WEB_MINER_STATS_COMMAND, WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND,
|
||||
+ WEB_POOLS_COMMAND, WEB_VERSION_COMMAND,
|
||||
};
|
||||
|
||||
#[tokio::test]
|
||||
@@ -1251,6 +1280,13 @@ mod tests {
|
||||
},
|
||||
Value::from_str(WEB_HASHBOARDS_COMMAND).unwrap(),
|
||||
);
|
||||
+ results.insert(
|
||||
+ MinerCommand::WebAPI {
|
||||
+ command: "configuration/constraints",
|
||||
+ parameters: None,
|
||||
+ },
|
||||
+ Value::from_str(WEB_CONSTRAINTS_COMMAND).unwrap(),
|
||||
+ );
|
||||
results.insert(
|
||||
MinerCommand::WebAPI {
|
||||
command: "actions/locate",
|
||||
@@ -1313,6 +1349,10 @@ mod tests {
|
||||
// 19 #10, T3).
|
||||
let fan_pct = miner_data.fan_speed_percent.expect("braiins fan duty");
|
||||
assert!((fan_pct - 92.0).abs() < 1e-6);
|
||||
+ // Board temp thresholds from cooling_constraints defaults (round 19 #10, T3).
|
||||
+ assert_eq!(miner_data.temp_target, Some(60.0));
|
||||
+ assert_eq!(miner_data.temp_hot, Some(80.0));
|
||||
+ assert_eq!(miner_data.temp_dangerous, Some(90.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
diff --git a/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs b/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs
|
||||
index 06b35fef..3904b012 100644
|
||||
--- a/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-braiins/src/test/json/v26_04/mod.rs
|
||||
@@ -12,3 +12,4 @@ pub(crate) const WEB_POOLS_COMMAND: &str = include_str!("pools.json");
|
||||
pub(crate) const WEB_COOLING_STATE_COMMAND: &str = include_str!("cooling_state.json");
|
||||
pub(crate) const WEB_HASHBOARDS_COMMAND: &str = include_str!("miner_hw_hashboards.json");
|
||||
pub(crate) const WEB_LOCATE_COMMAND: &str = include_str!("actions_locate.json");
|
||||
+pub(crate) const WEB_CONSTRAINTS_COMMAND: &str = include_str!("configuration_constraints.json");
|
||||
diff --git a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
index 0c9a851b..2e12e07a 100644
|
||||
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
@@ -1153,15 +1153,16 @@ impl GetFluidTemperature for PowerPlayV1 {
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
- ) -> (Option<f64>, Option<f64>) {
|
||||
- // ePIC summary /Misc: Critical Temp + Shutdown Temp (round 19 #10, T3).
|
||||
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
+ // ePIC summary /Misc: Shutdown Temp (hot) + Critical Temp (dangerous); no
|
||||
+ // target threshold reported (round 19 #10, T3).
|
||||
let d = data.get(&DataField::TemperatureLimits);
|
||||
let f = |k: &str| {
|
||||
d.and_then(|v| v.pointer(k))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0)
|
||||
};
|
||||
- (f("/Critical Temp"), f("/Shutdown Temp"))
|
||||
+ (None, f("/Shutdown Temp"), f("/Critical Temp"))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2229,9 +2230,11 @@ mod tests {
|
||||
assert_eq!(miner_data.wattage, Some(Power::from_watts(2166.6174)));
|
||||
// Miner-level fan duty cycle from summary /Fans/Fans Speed (round 19 #10, T3).
|
||||
assert_eq!(miner_data.fan_speed_percent, Some(100.0));
|
||||
- // Board temp thresholds from summary /Misc (round 19 #10, T3).
|
||||
- assert_eq!(miner_data.temp_critical, Some(100.0));
|
||||
- assert_eq!(miner_data.temp_shutdown, Some(85.0));
|
||||
+ // Board temp thresholds from summary /Misc (round 19 #10, T3): Shutdown->hot,
|
||||
+ // Critical->dangerous, no target.
|
||||
+ assert_eq!(miner_data.temp_target, None);
|
||||
+ assert_eq!(miner_data.temp_hot, Some(85.0));
|
||||
+ assert_eq!(miner_data.temp_dangerous, Some(100.0));
|
||||
assert_eq!(miner_data.hashboards.len(), 3);
|
||||
assert_eq!(miner_data.hashboards[0].active, Some(false));
|
||||
assert_eq!(miner_data.hashboards[1].chips.len(), 110);
|
||||
diff --git a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
index edab7c4c..de9c2d35 100644
|
||||
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
|
||||
@@ -278,6 +278,11 @@ impl GetDataLocations for LuxMinerV1 {
|
||||
parameters: None,
|
||||
};
|
||||
|
||||
+ const RPC_TEMPCTRL: MinerCommand = MinerCommand::RPC {
|
||||
+ command: "tempctrl",
|
||||
+ parameters: None,
|
||||
+ };
|
||||
+
|
||||
match data_field {
|
||||
DataField::Mac => vec![(
|
||||
RPC_CONFIG,
|
||||
@@ -305,6 +310,16 @@ impl GetDataLocations for LuxMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Board temp thresholds (round 19 #10, T3): LuxOS tempctrl reports
|
||||
+ // ChipTarget / ChipHot / ChipDangerous.
|
||||
+ DataField::TemperatureLimits => vec![(
|
||||
+ RPC_TEMPCTRL,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/TEMPCTRL/0"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
DataField::ApiVersion => vec![(
|
||||
RPC_VERSION,
|
||||
DataExtractor {
|
||||
@@ -690,6 +705,20 @@ impl GetFluidTemperature for LuxMinerV1 {
|
||||
(None, None) => None,
|
||||
}
|
||||
}
|
||||
+ fn parse_temperature_limits(
|
||||
+ &self,
|
||||
+ data: &HashMap<DataField, Value>,
|
||||
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
+ // LuxOS tempctrl chip thresholds ChipTarget / ChipHot / ChipDangerous
|
||||
+ // (round 19 #10, T3).
|
||||
+ let d = data.get(&DataField::TemperatureLimits);
|
||||
+ let f = |k: &str| {
|
||||
+ d.and_then(|v| v.get(k))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0)
|
||||
+ };
|
||||
+ (f("ChipTarget"), f("ChipHot"), f("ChipDangerous"))
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetFirmwareVersion for LuxMinerV1 {
|
||||
@@ -1465,7 +1494,8 @@ mod tests {
|
||||
use super::*;
|
||||
use crate::test::json::v1::{
|
||||
CONFIG, DEVS, EVENTS, FANS, HEALTHCHIPGET_0, HEALTHCHIPGET_1, HEALTHCHIPGET_2, POOLS,
|
||||
- POWER, PROFILES, STATS, SUMMARY, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1, VOLTAGEGET_2,
|
||||
+ POWER, PROFILES, STATS, SUMMARY, TEMPCTRL, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1,
|
||||
+ VOLTAGEGET_2,
|
||||
};
|
||||
|
||||
#[test]
|
||||
@@ -1582,6 +1612,11 @@ mod tests {
|
||||
parameters: None,
|
||||
};
|
||||
|
||||
+ let tempctrl_cmd = MinerCommand::RPC {
|
||||
+ command: "tempctrl",
|
||||
+ parameters: None,
|
||||
+ };
|
||||
+
|
||||
results.insert(version_cmd, Value::from_str(VERSION)?);
|
||||
results.insert(stats_cmd, Value::from_str(STATS)?);
|
||||
results.insert(summary_cmd, Value::from_str(SUMMARY)?);
|
||||
@@ -1591,6 +1626,7 @@ mod tests {
|
||||
results.insert(power_cmd, Value::from_str(POWER)?);
|
||||
results.insert(profiles_cmd, Value::from_str(PROFILES)?);
|
||||
results.insert(temps_cmd, Value::from_str(TEMPS)?);
|
||||
+ results.insert(tempctrl_cmd, Value::from_str(TEMPCTRL)?);
|
||||
results.insert(devs_cmd, Value::from_str(DEVS)?);
|
||||
results.insert(
|
||||
MinerCommand::RPC {
|
||||
@@ -1704,6 +1740,11 @@ mod tests {
|
||||
// Miner-level fan duty cycle = max of per-fan Speed (all 20 here); round 19
|
||||
// #10, T3.
|
||||
assert_eq!(miner_data.fan_speed_percent, Some(20.0));
|
||||
+ // Board temp thresholds from tempctrl ChipTarget/ChipHot/ChipDangerous
|
||||
+ // (round 19 #10, T3).
|
||||
+ assert_eq!(miner_data.temp_target, Some(83.0));
|
||||
+ assert_eq!(miner_data.temp_hot, Some(93.0));
|
||||
+ assert_eq!(miner_data.temp_dangerous, Some(100.0));
|
||||
assert_eq!(miner_data.hashboards[0].chips.len(), 77);
|
||||
assert_eq!(miner_data.pools.len(), 2);
|
||||
assert_eq!(miner_data.pools[0].len(), 2);
|
||||
diff --git a/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs b/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs
|
||||
index 7f328a47..02500ccb 100644
|
||||
--- a/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-luxminer/src/test/json/v1/mod.rs
|
||||
@@ -10,6 +10,7 @@ pub(crate) const PROFILES: &str = include_str!("profiles.json");
|
||||
pub(crate) const STATS: &str = include_str!("stats.json");
|
||||
pub(crate) const SUMMARY: &str = include_str!("summary.json");
|
||||
pub(crate) const TEMPS: &str = include_str!("temps.json");
|
||||
+pub(crate) const TEMPCTRL: &str = include_str!("tempctrl.json");
|
||||
pub(crate) const VERSION: &str = include_str!("version.json");
|
||||
pub(crate) const EVENTS: &str = include_str!("events.json");
|
||||
|
||||
@@ -0,0 +1,364 @@
|
||||
Subject: [PATCH 0030] telemetry: VNish fan% + temp thresholds; WhatsMiner chip type
|
||||
|
||||
Round 19 #10, tier 3 live-verified follow-up. Populates existing columns for more
|
||||
firmwares; no core or GUI change.
|
||||
|
||||
- VNish (v1_2_0 + v1_3_0): fan duty % from summary /miner/cooling/fan_duty; board
|
||||
temp thresholds from settings (restart_temp -> dangerous, auto cooling mode param
|
||||
-> target; no hot). Both commands already fetched. Live-verified on 10.4.1.50
|
||||
(fan_duty 81, restart_temp 90, auto param 65). VNish exposes no PSU serial
|
||||
(factory-info absent) so it stays None.
|
||||
- WhatsMiner chip type (per noah, do not drop): v1/v2 summary "Chip Data" merged
|
||||
into the hashboards data -> BoardData.chip_type (first token, e.g. "HP5A01-19101436");
|
||||
v3 get.device.info chipdataN -> chip_type and hash-board ("K40") -> hashboard_model.
|
||||
Live WhatsMiner summaries often omit "Chip Data" (populates where present); v3
|
||||
chip data is live on newer units.
|
||||
|
||||
Fixture tests: whatsminer v1/v3 assert chip_type/hashboard_model; vnish asserts the
|
||||
parsed fan % and temp thresholds.
|
||||
|
||||
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
index e734a03e..ad2779b6 100644
|
||||
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
@@ -369,6 +369,25 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Miner-level fan duty cycle (round 19 #10, T3); summary already fetched.
|
||||
+ DataField::FanSpeedPercent => vec![(
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner/cooling/fan_duty"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
+ // Board temp thresholds (round 19 #10, T3): settings restart_temp
|
||||
+ // (dangerous) + auto cooling target. Settings already fetched.
|
||||
+ DataField::TemperatureLimits => vec![(
|
||||
+ WEB_SETTINGS,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -678,6 +697,12 @@ impl GetFans for VnishV120 {
|
||||
|
||||
fans
|
||||
}
|
||||
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
+ // VNish summary /miner/cooling/fan_duty is a miner-level duty % (round 19 #10).
|
||||
+ data.get(&DataField::FanSpeedPercent)
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v >= 0.0)
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetPsuFans for VnishV120 {}
|
||||
@@ -766,6 +791,26 @@ impl GetFluidTemperature for VnishV120 {
|
||||
.max()
|
||||
.map(|t| Temperature::from_celsius(t as f64))
|
||||
}
|
||||
+ fn parse_temperature_limits(
|
||||
+ &self,
|
||||
+ data: &HashMap<DataField, Value>,
|
||||
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
+ // VNish settings: restart_temp is the dangerous threshold; the auto cooling
|
||||
+ // mode "param" is the target temperature. No hot threshold (round 19 #10, T3).
|
||||
+ let m = data.get(&DataField::TemperatureLimits);
|
||||
+ let dangerous = m
|
||||
+ .and_then(|v| v.pointer("/misc/restart_temp"))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0);
|
||||
+ let target = m
|
||||
+ .filter(|v| {
|
||||
+ v.pointer("/cooling/settings/mode/name").and_then(|n| n.as_str()) == Some("auto")
|
||||
+ })
|
||||
+ .and_then(|v| v.pointer("/cooling/settings/mode/param"))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0);
|
||||
+ (target, None, dangerous)
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetWattage for VnishV120 {
|
||||
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
index 0a5d694e..4f0453a1 100644
|
||||
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
@@ -375,6 +375,26 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Miner-level fan duty cycle (round 19 #10, T3); summary already fetched.
|
||||
+ DataField::FanSpeedPercent => vec![(
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner/cooling/fan_duty"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
+ // Board temp thresholds (round 19 #10, T3): settings /miner/misc/restart_temp
|
||||
+ // (dangerous) + auto cooling target (/miner/cooling/settings/mode/param).
|
||||
+ // Settings already fetched for the tuning preset.
|
||||
+ DataField::TemperatureLimits => vec![(
|
||||
+ WEB_SETTINGS,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -683,6 +703,12 @@ impl GetFans for VnishV130 {
|
||||
|
||||
fans
|
||||
}
|
||||
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
+ // VNish summary /miner/cooling/fan_duty is a miner-level duty % (round 19 #10).
|
||||
+ data.get(&DataField::FanSpeedPercent)
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v >= 0.0)
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetPsuFans for VnishV130 {}
|
||||
@@ -716,6 +742,26 @@ impl GetFluidTemperature for VnishV130 {
|
||||
.max()
|
||||
.map(|t| Temperature::from_celsius(t as f64))
|
||||
}
|
||||
+ fn parse_temperature_limits(
|
||||
+ &self,
|
||||
+ data: &HashMap<DataField, Value>,
|
||||
+ ) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
+ // VNish settings: restart_temp is the dangerous threshold; the auto cooling
|
||||
+ // mode "param" is the target temperature. No hot threshold (round 19 #10, T3).
|
||||
+ let m = data.get(&DataField::TemperatureLimits);
|
||||
+ let dangerous = m
|
||||
+ .and_then(|v| v.pointer("/misc/restart_temp"))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0);
|
||||
+ let target = m
|
||||
+ .filter(|v| {
|
||||
+ v.pointer("/cooling/settings/mode/name").and_then(|n| n.as_str()) == Some("auto")
|
||||
+ })
|
||||
+ .and_then(|v| v.pointer("/cooling/settings/mode/param"))
|
||||
+ .and_then(|v| v.as_f64())
|
||||
+ .filter(|v| v.is_finite() && *v > 0.0);
|
||||
+ (target, None, dangerous)
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetWattage for VnishV130 {
|
||||
@@ -1354,6 +1400,28 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
+ /// Fan duty cycle (summary /miner/cooling/fan_duty) and board temp thresholds
|
||||
+ /// (settings restart_temp -> dangerous, auto cooling param -> target); round 19
|
||||
+ /// #10, T3. Values match the live 10.4.1.50 fleet unit.
|
||||
+ #[test]
|
||||
+ fn fan_duty_and_temp_thresholds() {
|
||||
+ let miner = VnishV130::new(IpAddr::from([127, 0, 0, 1]), AntMinerModel::S19jPro);
|
||||
+ let mut data: HashMap<DataField, Value> = HashMap::new();
|
||||
+ data.insert(DataField::FanSpeedPercent, json!(81));
|
||||
+ data.insert(
|
||||
+ DataField::TemperatureLimits,
|
||||
+ json!({
|
||||
+ "misc": { "restart_temp": 90 },
|
||||
+ "cooling": { "settings": { "mode": { "name": "auto", "param": 65 } } }
|
||||
+ }),
|
||||
+ );
|
||||
+ assert_eq!(miner.parse_fan_speed_percent(&data), Some(81.0));
|
||||
+ assert_eq!(
|
||||
+ miner.parse_temperature_limits(&data),
|
||||
+ (Some(65.0), None, Some(90.0))
|
||||
+ );
|
||||
+ }
|
||||
+
|
||||
/// An L9 is a Scrypt miner and VNish says so in `/info`, both in
|
||||
/// `algorithm` and by reporting `hr_measure: MH/s`. Before this was wired
|
||||
/// up it came back as a SHA-256 miner and every figure was read as GH/s,
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
index aacd1077..4025a931 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
@@ -205,14 +205,26 @@ impl GetDataLocations for WhatsMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
- DataField::Hashboards => vec![(
|
||||
- RPC_DEVS,
|
||||
- DataExtractor {
|
||||
- func: get_by_pointer,
|
||||
- key: Some(""),
|
||||
- tag: None,
|
||||
- },
|
||||
- )],
|
||||
+ DataField::Hashboards => vec![
|
||||
+ (
|
||||
+ RPC_DEVS,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some(""),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ ),
|
||||
+ // Merge in summary so "Chip Data" (miner-wide chip marking) is
|
||||
+ // available per board (round 19 #10); RPC_SUMMARY already fetched.
|
||||
+ (
|
||||
+ RPC_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/SUMMARY/0"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ ),
|
||||
+ ],
|
||||
DataField::Pools => vec![(
|
||||
RPC_POOLS,
|
||||
DataExtractor {
|
||||
@@ -436,6 +448,20 @@ impl GetHashboards for WhatsMinerV1 {
|
||||
);
|
||||
}
|
||||
|
||||
+ // Chip marking from the merged summary "Chip Data" (miner-wide, first
|
||||
+ // token), applied to every board (round 19 #10).
|
||||
+ let chip_type = hashboard_data
|
||||
+ .pointer("/Chip Data")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .and_then(|s| s.split_whitespace().next())
|
||||
+ .filter(|s| !s.is_empty())
|
||||
+ .map(str::to_string);
|
||||
+ if chip_type.is_some() {
|
||||
+ for board in hashboards.iter_mut() {
|
||||
+ board.chip_type = chip_type.clone();
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
hashboards
|
||||
}
|
||||
}
|
||||
@@ -992,6 +1018,12 @@ mod integration_tests {
|
||||
assert_eq!(shares.difficulty_rejected, Some(0.0));
|
||||
assert_eq!(shares.stale_shares, Some(0));
|
||||
assert_eq!(shares.found_blocks, Some(0));
|
||||
+ // Chip marking from summary "Chip Data" first token (round 19 #10).
|
||||
+ assert!(!miner_data.hashboards.is_empty());
|
||||
+ assert_eq!(
|
||||
+ miner_data.hashboards[0].chip_type.as_deref(),
|
||||
+ Some("HP5A01-19101436")
|
||||
+ );
|
||||
assert_eq!(miner_data.wattage, Some(Power::from_watts(3417f64)));
|
||||
assert_eq!(
|
||||
miner_data.tuning_target,
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
index 4cfcee19..2b340e28 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
@@ -216,14 +216,26 @@ impl GetDataLocations for WhatsMinerV2 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
- DataField::Hashboards => vec![(
|
||||
- RPC_DEVS,
|
||||
- DataExtractor {
|
||||
- func: get_by_pointer,
|
||||
- key: Some(""),
|
||||
- tag: None,
|
||||
- },
|
||||
- )],
|
||||
+ DataField::Hashboards => vec![
|
||||
+ (
|
||||
+ RPC_DEVS,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some(""),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ ),
|
||||
+ // Merge in summary so "Chip Data" (miner-wide chip marking) is
|
||||
+ // available per board (round 19 #10); RPC_SUMMARY already fetched.
|
||||
+ (
|
||||
+ RPC_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/SUMMARY/0"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ ),
|
||||
+ ],
|
||||
DataField::Pools => vec![(
|
||||
RPC_POOLS,
|
||||
DataExtractor {
|
||||
@@ -433,6 +445,20 @@ impl GetHashboards for WhatsMinerV2 {
|
||||
);
|
||||
}
|
||||
|
||||
+ // Chip marking from the merged summary "Chip Data" (miner-wide, first
|
||||
+ // token), applied to every board (round 19 #10).
|
||||
+ let chip_type = hashboard_data
|
||||
+ .pointer("/Chip Data")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .and_then(|s| s.split_whitespace().next())
|
||||
+ .filter(|s| !s.is_empty())
|
||||
+ .map(str::to_string);
|
||||
+ if chip_type.is_some() {
|
||||
+ for board in hashboards.iter_mut() {
|
||||
+ board.chip_type = chip_type.clone();
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
hashboards
|
||||
}
|
||||
}
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
|
||||
index 04608936..77a1c6ec 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v3/mod.rs
|
||||
@@ -459,6 +459,19 @@ impl GetHashboards for WhatsMinerV3 {
|
||||
.map(|h| h.value > 0.0)
|
||||
.unwrap_or(false),
|
||||
);
|
||||
+ // Chip marking (per-board chipdataN, first token) + hashboard model
|
||||
+ // (miner-wide hash-board, e.g. "K40") from get.device.info (round 19 #10).
|
||||
+ board.chip_type = hashboard_data
|
||||
+ .pointer(&format!("/chipdata{idx}"))
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .and_then(|s| s.split_whitespace().next())
|
||||
+ .filter(|s| !s.is_empty())
|
||||
+ .map(str::to_string);
|
||||
+ board.hashboard_model = hashboard_data
|
||||
+ .pointer("/hash-board")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .filter(|s| !s.is_empty())
|
||||
+ .map(str::to_string);
|
||||
}
|
||||
|
||||
hashboards
|
||||
@@ -1241,6 +1254,17 @@ mod integration_tests {
|
||||
assert!(miner_data.is_mining);
|
||||
assert_eq!(miner_data.fans.len(), 2);
|
||||
assert_eq!(miner_data.pools[0].len(), 3);
|
||||
+ // Chip marking (chipdataN first token) + hashboard model (hash-board);
|
||||
+ // round 19 #10.
|
||||
+ assert!(!miner_data.hashboards.is_empty());
|
||||
+ assert_eq!(
|
||||
+ miner_data.hashboards[0].chip_type.as_deref(),
|
||||
+ Some("K8EC374-2426")
|
||||
+ );
|
||||
+ assert_eq!(
|
||||
+ miner_data.hashboards[0].hashboard_model.as_deref(),
|
||||
+ Some("K40")
|
||||
+ );
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -0,0 +1,237 @@
|
||||
Subject: [PATCH 0031] telemetry: auto-tuner status (Braiins, ePIC)
|
||||
|
||||
Round 19 #10, tier 3. Exposes the auto-tuner status as a human-readable label.
|
||||
|
||||
- New DataField::TunerStatus; MinerData gains tuner_status (Option<String>).
|
||||
Rides the existing GetOperatingState trait via a defaulted parse_tuner_status
|
||||
method (no supertrait bound); parse_data wires it in.
|
||||
- Braiins v25_07 + v26_04: performance/tuner-state overall_tuner_state, mapped
|
||||
through the BOS+ TunerState enum (bos-plus-api performance.proto: 1 Disabled,
|
||||
2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat). Command already fetched.
|
||||
- ePIC: summary PerpetualTune -> "Off" (not running), "Optimized" (settled) or
|
||||
"Tuning" (running, not yet optimized). Summary already fetched.
|
||||
- WhatsMiner/Antminer/LuxOS/VNish report no distinct tuner status -> None.
|
||||
|
||||
Fixture tests: braiins v26_04 asserts "Continuous" (state 5), epic asserts "Tuning".
|
||||
|
||||
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
|
||||
index 1e6e7e9d..8f9b4c9c 100644
|
||||
--- a/vendor/asic-rs-core/src/data/collector.rs
|
||||
+++ b/vendor/asic-rs-core/src/data/collector.rs
|
||||
@@ -68,6 +68,9 @@ pub enum DataField {
|
||||
/// Board temperature safety thresholds (critical / shutdown), in Celsius.
|
||||
#[cfg_attr(feature = "python", pydantic(value = "TemperatureLimits"))]
|
||||
TemperatureLimits,
|
||||
+ /// Auto-tuner status (a human-readable label, e.g. "Stable", "Tuning").
|
||||
+ #[cfg_attr(feature = "python", pydantic(value = "TunerStatus"))]
|
||||
+ TunerStatus,
|
||||
/// PSU fan speed or configuration.
|
||||
#[cfg_attr(feature = "python", pydantic(value = "PsuFans"))]
|
||||
PsuFans,
|
||||
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
|
||||
index 9f74fc43..8832a049 100644
|
||||
--- a/vendor/asic-rs-core/src/data/miner.rs
|
||||
+++ b/vendor/asic-rs-core/src/data/miner.rs
|
||||
@@ -236,6 +236,9 @@ pub struct MinerData {
|
||||
#[serde(default)]
|
||||
#[cfg_attr(feature = "python", pydantic(default = None))]
|
||||
pub operating_state: Option<OperatingState>,
|
||||
+ /// Auto-tuner status as a human-readable label (round 19 #10), when reported:
|
||||
+ /// e.g. "Stable"/"Tuning" (Braiins), "Optimized"/"Tuning"/"Off" (ePIC).
|
||||
+ pub tuner_status: Option<String>,
|
||||
/// The current pools configured on the miner
|
||||
pub pools: Vec<PoolGroupData>,
|
||||
/// Difficulty of the best share found over the miner's lifetime, when reported.
|
||||
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
|
||||
index 25ea6168..397b2e8c 100644
|
||||
--- a/vendor/asic-rs-core/src/traits/miner.rs
|
||||
+++ b/vendor/asic-rs-core/src/traits/miner.rs
|
||||
@@ -290,6 +290,7 @@ impl<
|
||||
let light_flashing = self.parse_light_flashing(&data);
|
||||
let is_mining = self.parse_is_mining(&data);
|
||||
let operating_state = self.parse_operating_state(&data);
|
||||
+ let tuner_status = self.parse_tuner_status(&data);
|
||||
let messages = self.parse_messages(&data);
|
||||
let pools = self.parse_pools(&data);
|
||||
let best_share = self.parse_best_share(&data);
|
||||
@@ -392,6 +393,7 @@ impl<
|
||||
uptime,
|
||||
is_mining,
|
||||
operating_state,
|
||||
+ tuner_status,
|
||||
|
||||
pools,
|
||||
best_share,
|
||||
@@ -914,6 +916,18 @@ pub trait GetOperatingState: CollectData {
|
||||
fn parse_operating_state(&self, data: &HashMap<DataField, Value>) -> Option<OperatingState> {
|
||||
None
|
||||
}
|
||||
+ #[tracing::instrument(level = "debug")]
|
||||
+ async fn get_tuner_status(&self) -> Option<String> {
|
||||
+ let mut collector = self.get_collector();
|
||||
+ let data = collector.collect(&[DataField::TunerStatus]).await;
|
||||
+ self.parse_tuner_status(&data)
|
||||
+ }
|
||||
+ /// Auto-tuner status as a human-readable label. Backends that expose it override
|
||||
+ /// this; others return None.
|
||||
+ #[allow(unused_variables)]
|
||||
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
+ None
|
||||
+ }
|
||||
}
|
||||
|
||||
// Pools
|
||||
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
|
||||
index 0dec8d38..f5937521 100644
|
||||
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v25_07/mod.rs
|
||||
@@ -272,6 +272,16 @@ impl GetDataLocations for BraiinsV2507 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Auto-tuner status (round 19 #10, T3): performance/tuner-state
|
||||
+ // overall_tuner_state enum; command already fetched.
|
||||
+ DataField::TunerStatus => vec![(
|
||||
+ WEB_PERFORMANCE_TUNER_STATE,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/overall_tuner_state"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
DataField::Uptime => vec![(
|
||||
WEB_MINER_DETAILS,
|
||||
DataExtractor {
|
||||
@@ -630,6 +640,21 @@ impl GetOperatingState for BraiinsV2507 {
|
||||
},
|
||||
})
|
||||
}
|
||||
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
+ // BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
|
||||
+ // 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
|
||||
+ Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
|
||||
+ 0 => return None,
|
||||
+ 1 => "Disabled",
|
||||
+ 2 => "Stable",
|
||||
+ 3 => "Tuning",
|
||||
+ 4 => "Error",
|
||||
+ 5 => "Continuous",
|
||||
+ 6 => "Preheat",
|
||||
+ _ => return None,
|
||||
+ })
|
||||
+ .map(str::to_string)
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetIsMining for BraiinsV2507 {
|
||||
diff --git a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
|
||||
index 4e423e5b..07afc871 100644
|
||||
--- a/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-braiins/src/backends/v26_04/mod.rs
|
||||
@@ -275,6 +275,16 @@ impl GetDataLocations for BraiinsV2604 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Auto-tuner status (round 19 #10, T3): performance/tuner-state
|
||||
+ // overall_tuner_state enum; command already fetched.
|
||||
+ DataField::TunerStatus => vec![(
|
||||
+ WEB_PERFORMANCE_TUNER_STATE,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/overall_tuner_state"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
DataField::Uptime => vec![(
|
||||
WEB_MINER_DETAILS,
|
||||
DataExtractor {
|
||||
@@ -667,6 +677,21 @@ impl GetOperatingState for BraiinsV2604 {
|
||||
},
|
||||
})
|
||||
}
|
||||
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
+ // BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
|
||||
+ // 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
|
||||
+ Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
|
||||
+ 0 => return None,
|
||||
+ 1 => "Disabled",
|
||||
+ 2 => "Stable",
|
||||
+ 3 => "Tuning",
|
||||
+ 4 => "Error",
|
||||
+ 5 => "Continuous",
|
||||
+ 6 => "Preheat",
|
||||
+ _ => return None,
|
||||
+ })
|
||||
+ .map(str::to_string)
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetIsMining for BraiinsV2604 {
|
||||
@@ -1353,6 +1378,8 @@ mod tests {
|
||||
assert_eq!(miner_data.temp_target, Some(60.0));
|
||||
assert_eq!(miner_data.temp_hot, Some(80.0));
|
||||
assert_eq!(miner_data.temp_dangerous, Some(90.0));
|
||||
+ // Auto-tuner status: overall_tuner_state 5 -> Continuous (round 19 #10, T3).
|
||||
+ assert_eq!(miner_data.tuner_status.as_deref(), Some("Continuous"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
diff --git a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
index 2e12e07a..e0df43e3 100644
|
||||
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
|
||||
@@ -594,6 +594,16 @@ impl GetDataLocations for PowerPlayV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
+ // Auto-tuner status (round 19 #10, T3): PowerPlay PerpetualTune; summary
|
||||
+ // already fetched.
|
||||
+ DataField::TunerStatus => vec![(
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/PerpetualTune"),
|
||||
+ tag: None,
|
||||
+ },
|
||||
+ )],
|
||||
DataField::LightFlashing => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
@@ -1408,6 +1418,28 @@ impl GetOperatingState for PowerPlayV1 {
|
||||
.and_then(Value::as_str)
|
||||
.and_then(OperatingState::from_label)
|
||||
}
|
||||
+ fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
+ // ePIC PerpetualTune: Running gates it; the per-algorithm Optimized flag
|
||||
+ // distinguishes a settled tune from an in-progress one (round 19 #10, T3).
|
||||
+ let pt = data.get(&DataField::TunerStatus)?;
|
||||
+ if !pt.pointer("/Running").and_then(|v| v.as_bool()).unwrap_or(false) {
|
||||
+ return Some("Off".to_string());
|
||||
+ }
|
||||
+ let optimized = pt
|
||||
+ .pointer("/Algorithm")
|
||||
+ .and_then(|v| v.as_object())
|
||||
+ .and_then(|algos| {
|
||||
+ algos
|
||||
+ .values()
|
||||
+ .filter_map(|a| a.pointer("/Optimized").and_then(|v| v.as_bool()))
|
||||
+ .next()
|
||||
+ });
|
||||
+ Some(match optimized {
|
||||
+ Some(true) => "Optimized",
|
||||
+ _ => "Tuning",
|
||||
+ })
|
||||
+ .map(str::to_string)
|
||||
+ }
|
||||
}
|
||||
|
||||
impl GetIsMining for PowerPlayV1 {
|
||||
@@ -2235,6 +2267,8 @@ mod tests {
|
||||
assert_eq!(miner_data.temp_target, None);
|
||||
assert_eq!(miner_data.temp_hot, Some(85.0));
|
||||
assert_eq!(miner_data.temp_dangerous, Some(100.0));
|
||||
+ // Auto-tuner: PerpetualTune Running=true, Optimized=false -> Tuning (T3).
|
||||
+ assert_eq!(miner_data.tuner_status.as_deref(), Some("Tuning"));
|
||||
assert_eq!(miner_data.hashboards.len(), 3);
|
||||
assert_eq!(miner_data.hashboards[0].active, Some(false));
|
||||
assert_eq!(miner_data.hashboards[1].chips.len(), 110);
|
||||
@@ -0,0 +1,283 @@
|
||||
Subject: [PATCH 0032] telemetry: vnish per-hashboard fault messages
|
||||
|
||||
Round 20 #1. VNish previously surfaced only a single miner-level state message
|
||||
(board 0, no component), so per-hashboard faults landed on the control-board
|
||||
(brain) tooltip instead of the board they name, and the Health column could not
|
||||
red the specific faulted hashboard.
|
||||
|
||||
- DataField::Messages now also collects /miner/chains from the summary (tagged),
|
||||
alongside /miner/miner_status (now tagged "miner_status"). The summary chains
|
||||
carry per-chain diagnostics the /chains endpoint omits: chip_statuses
|
||||
{red,orange,grey} and status.state.
|
||||
- parse_messages emits one MinerMessage per faulted board, attributed to
|
||||
MinerComponent::HashBoard { idx } (chain ids are 1-based; board positions
|
||||
0-based): red chip(s) -> Error, a non-normal chain state with no failed chips
|
||||
-> Error (state text), orange chip(s) -> Warning. Healthy boards (all grey,
|
||||
state "mining") produce no message, so no false faults on good miners.
|
||||
- Applied to both v1_3_0 and v1_2_0 backends. Verified live against healthy
|
||||
WildRose/VNish S21 miners (10.7.1.x): all chains grey/mining -> zero messages.
|
||||
|
||||
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
index ad2779b6..85011853 100644
|
||||
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
@@ -20,7 +20,7 @@ use asic_rs_core::{
|
||||
device::DeviceInfo,
|
||||
fan::FanData,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
- message::{MessageSeverity, MinerMessage},
|
||||
+ message::{MessageSeverity, MinerComponent, MinerMessage},
|
||||
miner::TuningTarget,
|
||||
operating_state::OperatingState,
|
||||
pool::{PoolData, PoolGroupData, PoolURL},
|
||||
@@ -353,14 +353,26 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
- DataField::Messages => vec![(
|
||||
- WEB_SUMMARY,
|
||||
- DataExtractor {
|
||||
- func: get_by_pointer,
|
||||
- key: Some("/miner/miner_status"),
|
||||
- tag: None,
|
||||
- },
|
||||
- )],
|
||||
+ DataField::Messages => vec![
|
||||
+ (
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner/miner_status"),
|
||||
+ tag: Some("miner_status"),
|
||||
+ },
|
||||
+ ),
|
||||
+ // Per-hashboard diagnostics (chip status buckets + per-chain state)
|
||||
+ // for per-board fault messages in parse_messages.
|
||||
+ (
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner/chains"),
|
||||
+ tag: Some("chains"),
|
||||
+ },
|
||||
+ ),
|
||||
+ ],
|
||||
DataField::TuningTarget => vec![(
|
||||
WEB_SETTINGS,
|
||||
DataExtractor {
|
||||
@@ -850,9 +862,12 @@ impl GetMessages for VnishV120 {
|
||||
/// reported here rather than computed from invented thresholds.
|
||||
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
|
||||
let mut messages = Vec::new();
|
||||
+ let msg = data.get(&DataField::Messages);
|
||||
|
||||
- if let Some(status) = data.get(&DataField::Messages)
|
||||
- && let Some(state) = status.pointer("/miner_state").and_then(|v| v.as_str())
|
||||
+ // Miner-level state verdict (now under the "miner_status" tag).
|
||||
+ if let Some(state) = msg
|
||||
+ .and_then(|v| v.pointer("/miner_status/miner_state"))
|
||||
+ .and_then(|v| v.as_str())
|
||||
{
|
||||
let normal = matches!(
|
||||
state.to_lowercase().as_str(),
|
||||
@@ -872,6 +887,68 @@ impl GetMessages for VnishV120 {
|
||||
}
|
||||
}
|
||||
|
||||
+ // Per-hashboard faults from the summary chains (round 20 #1). VNish reports
|
||||
+ // per-chip status buckets (`red` = failed, `orange` = degraded, `grey` =
|
||||
+ // healthy) and a per-chain state; attribute each fault to its own board so
|
||||
+ // the Health column reds the right hashboard icon and that icon's tooltip
|
||||
+ // carries the specific fault, instead of everything landing on the miner-
|
||||
+ // level (brain) message. Chain ids are 1-based; board positions are 0-based.
|
||||
+ if let Some(chains) = msg
|
||||
+ .and_then(|v| v.pointer("/chains"))
|
||||
+ .and_then(|v| v.as_array())
|
||||
+ {
|
||||
+ for chain in chains {
|
||||
+ let Some(id) = chain.pointer("/id").and_then(|v| v.as_u64()) else {
|
||||
+ continue;
|
||||
+ };
|
||||
+ let idx = id.saturating_sub(1) as u16;
|
||||
+ let red = chain
|
||||
+ .pointer("/chip_statuses/red")
|
||||
+ .and_then(|v| v.as_u64())
|
||||
+ .unwrap_or(0);
|
||||
+ let orange = chain
|
||||
+ .pointer("/chip_statuses/orange")
|
||||
+ .and_then(|v| v.as_u64())
|
||||
+ .unwrap_or(0);
|
||||
+ let state = chain
|
||||
+ .pointer("/status/state")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .unwrap_or("");
|
||||
+ let state_ok = matches!(
|
||||
+ state.to_lowercase().as_str(),
|
||||
+ "" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
|
||||
+ );
|
||||
+
|
||||
+ if red > 0 {
|
||||
+ messages.push(MinerMessage::with_component(
|
||||
+ 0,
|
||||
+ 0,
|
||||
+ format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
+ MessageSeverity::Error,
|
||||
+ Some(MinerComponent::hashboard(idx)),
|
||||
+ ));
|
||||
+ } else if !state_ok {
|
||||
+ // A board not in a normal state but with no failed chips: report
|
||||
+ // the state itself (e.g. "initializing", "disabled", "stopped").
|
||||
+ messages.push(MinerMessage::with_component(
|
||||
+ 0,
|
||||
+ 0,
|
||||
+ format!("Hashboard {id}: {state}"),
|
||||
+ MessageSeverity::Error,
|
||||
+ Some(MinerComponent::hashboard(idx)),
|
||||
+ ));
|
||||
+ } else if orange > 0 {
|
||||
+ messages.push(MinerMessage::with_component(
|
||||
+ 0,
|
||||
+ 0,
|
||||
+ format!("Hashboard {id}: {orange} degraded chip(s)"),
|
||||
+ MessageSeverity::Warning,
|
||||
+ Some(MinerComponent::hashboard(idx)),
|
||||
+ ));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
messages
|
||||
}
|
||||
}
|
||||
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
index 4f0453a1..1301a657 100644
|
||||
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
@@ -20,7 +20,7 @@ use asic_rs_core::{
|
||||
device::DeviceInfo,
|
||||
fan::FanData,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
- message::{MessageSeverity, MinerMessage},
|
||||
+ message::{MessageSeverity, MinerComponent, MinerMessage},
|
||||
miner::TuningTarget,
|
||||
operating_state::OperatingState,
|
||||
pool::{PoolData, PoolGroupData, PoolURL},
|
||||
@@ -351,14 +351,26 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
- DataField::Messages => vec![(
|
||||
- WEB_SUMMARY,
|
||||
- DataExtractor {
|
||||
- func: get_by_pointer,
|
||||
- key: Some("/miner/miner_status"),
|
||||
- tag: None,
|
||||
- },
|
||||
- )],
|
||||
+ DataField::Messages => vec![
|
||||
+ (
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner/miner_status"),
|
||||
+ tag: Some("miner_status"),
|
||||
+ },
|
||||
+ ),
|
||||
+ // Per-hashboard diagnostics (chip status buckets + per-chain state)
|
||||
+ // for per-board fault messages in parse_messages.
|
||||
+ (
|
||||
+ WEB_SUMMARY,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/miner/chains"),
|
||||
+ tag: Some("chains"),
|
||||
+ },
|
||||
+ ),
|
||||
+ ],
|
||||
DataField::TuningPercent => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
@@ -805,9 +817,12 @@ impl GetMessages for VnishV130 {
|
||||
/// reported here rather than computed from invented thresholds.
|
||||
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
|
||||
let mut messages = Vec::new();
|
||||
+ let msg = data.get(&DataField::Messages);
|
||||
|
||||
- if let Some(status) = data.get(&DataField::Messages)
|
||||
- && let Some(state) = status.pointer("/miner_state").and_then(|v| v.as_str())
|
||||
+ // Miner-level state verdict (now under the "miner_status" tag).
|
||||
+ if let Some(state) = msg
|
||||
+ .and_then(|v| v.pointer("/miner_status/miner_state"))
|
||||
+ .and_then(|v| v.as_str())
|
||||
{
|
||||
let normal = matches!(
|
||||
state.to_lowercase().as_str(),
|
||||
@@ -827,6 +842,68 @@ impl GetMessages for VnishV130 {
|
||||
}
|
||||
}
|
||||
|
||||
+ // Per-hashboard faults from the summary chains (round 20 #1). VNish reports
|
||||
+ // per-chip status buckets (`red` = failed, `orange` = degraded, `grey` =
|
||||
+ // healthy) and a per-chain state; attribute each fault to its own board so
|
||||
+ // the Health column reds the right hashboard icon and that icon's tooltip
|
||||
+ // carries the specific fault, instead of everything landing on the miner-
|
||||
+ // level (brain) message. Chain ids are 1-based; board positions are 0-based.
|
||||
+ if let Some(chains) = msg
|
||||
+ .and_then(|v| v.pointer("/chains"))
|
||||
+ .and_then(|v| v.as_array())
|
||||
+ {
|
||||
+ for chain in chains {
|
||||
+ let Some(id) = chain.pointer("/id").and_then(|v| v.as_u64()) else {
|
||||
+ continue;
|
||||
+ };
|
||||
+ let idx = id.saturating_sub(1) as u16;
|
||||
+ let red = chain
|
||||
+ .pointer("/chip_statuses/red")
|
||||
+ .and_then(|v| v.as_u64())
|
||||
+ .unwrap_or(0);
|
||||
+ let orange = chain
|
||||
+ .pointer("/chip_statuses/orange")
|
||||
+ .and_then(|v| v.as_u64())
|
||||
+ .unwrap_or(0);
|
||||
+ let state = chain
|
||||
+ .pointer("/status/state")
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .unwrap_or("");
|
||||
+ let state_ok = matches!(
|
||||
+ state.to_lowercase().as_str(),
|
||||
+ "" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
|
||||
+ );
|
||||
+
|
||||
+ if red > 0 {
|
||||
+ messages.push(MinerMessage::with_component(
|
||||
+ 0,
|
||||
+ 0,
|
||||
+ format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
+ MessageSeverity::Error,
|
||||
+ Some(MinerComponent::hashboard(idx)),
|
||||
+ ));
|
||||
+ } else if !state_ok {
|
||||
+ // A board not in a normal state but with no failed chips: report
|
||||
+ // the state itself (e.g. "initializing", "disabled", "stopped").
|
||||
+ messages.push(MinerMessage::with_component(
|
||||
+ 0,
|
||||
+ 0,
|
||||
+ format!("Hashboard {id}: {state}"),
|
||||
+ MessageSeverity::Error,
|
||||
+ Some(MinerComponent::hashboard(idx)),
|
||||
+ ));
|
||||
+ } else if orange > 0 {
|
||||
+ messages.push(MinerMessage::with_component(
|
||||
+ 0,
|
||||
+ 0,
|
||||
+ format!("Hashboard {id}: {orange} degraded chip(s)"),
|
||||
+ MessageSeverity::Warning,
|
||||
+ Some(MinerComponent::hashboard(idx)),
|
||||
+ ));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
messages
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,243 @@
|
||||
Subject: [PATCH 0033] vnish hashboard model + chip-fail severity; whatsminer PSU serial
|
||||
|
||||
Round 21 #1 + #3.
|
||||
|
||||
- VNish per-board chip failures while the board is still MINING are now Warning
|
||||
(yellow), not Error (red): dead/degraded chips on a board that keeps hashing
|
||||
near its target are wear, not a down board. A board NOT in a normal mining
|
||||
state stays Error (red). Both v1_2_0 and v1_3_0. (The GUI renders a warning-only
|
||||
board as Degraded/yellow.)
|
||||
- VNish hashboard model: parse_hashboards now reads the factory-info
|
||||
/chains[]/board_model (e.g. "A3HB70601" on S21 Pro, "BHB42603" on S19j Pro),
|
||||
keyed by chain id, into BoardData.hashboard_model. The factory-info endpoint is
|
||||
already fetched for the PSU serial; neither the live /chains nor /summary carry
|
||||
board_model. Both backends. Verified live (10.4.0.193, 10.4.1.218).
|
||||
- WhatsMiner v1/v2 PSU serial: get_psu /Msg exposes serial_no (e.g.
|
||||
"1355A2129604289"); parse_psu now reads it (it was hardcoded None with an
|
||||
incorrect "v1/v2 does not report a serial" comment). Verified live (10.8.1.145).
|
||||
|
||||
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
index 85011853..2c14f217 100644
|
||||
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_2_0/mod.rs
|
||||
@@ -296,6 +296,16 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: Some("unit"),
|
||||
},
|
||||
),
|
||||
+ // Per-board hashboard model ("board_model") from factory-info, which
|
||||
+ // the live /chains + /summary do not carry. Already fetched for serial.
|
||||
+ (
|
||||
+ WEB_FACTORY_INFO,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/chains"),
|
||||
+ tag: Some("factory"),
|
||||
+ },
|
||||
+ ),
|
||||
],
|
||||
DataField::Chips => vec![(
|
||||
WEB_CHAINS,
|
||||
@@ -493,6 +503,11 @@ impl GetHashboards for VnishV120 {
|
||||
.unwrap_or(HashRateUnit::GigaHash);
|
||||
let algo = self.device_info.algo;
|
||||
let chip_chains = data.get(&DataField::Chips).and_then(|v| v.as_array());
|
||||
+ // Factory-info chains carry the hashboard model (board_model), keyed by the
|
||||
+ // same 1-based chain id. Not present on the live /chains or /summary.
|
||||
+ let factory_chains = hashboards_data
|
||||
+ .and_then(|v| v.pointer("/factory"))
|
||||
+ .and_then(|v| v.as_array());
|
||||
|
||||
let mut hashboards: Vec<BoardData> =
|
||||
(0..self.device_info.hardware.board_count().unwrap_or(0) as usize)
|
||||
@@ -642,6 +657,16 @@ impl GetHashboards for VnishV120 {
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s == "mining")
|
||||
.or_else(|| board.hashrate.as_ref().map(|h| h.value > 0.0));
|
||||
+ // Hashboard model from factory-info (board_model), matched by chain id.
|
||||
+ board.hashboard_model = factory_chains.and_then(|chains| {
|
||||
+ chains
|
||||
+ .iter()
|
||||
+ .find(|c| c.pointer("/id").and_then(|v| v.as_u64()) == Some(id))
|
||||
+ .and_then(|c| c.pointer("/board_model"))
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .filter(|s| !s.is_empty())
|
||||
+ .map(String::from)
|
||||
+ });
|
||||
}
|
||||
|
||||
hashboards
|
||||
@@ -919,22 +944,31 @@ impl GetMessages for VnishV120 {
|
||||
"" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
|
||||
);
|
||||
|
||||
- if red > 0 {
|
||||
+ // Severity reflects whether the board is still doing its job. A board
|
||||
+ // NOT in a normal mining state is down -> Error (red). A board that is
|
||||
+ // still mining but has some failed/degraded chips is sub-optimal, not
|
||||
+ // broken -> Warning (yellow): dead chips while the board keeps hashing
|
||||
+ // near its target are wear, not a fault (a ~83%-hashrate board must not
|
||||
+ // read as broken).
|
||||
+ if !state_ok {
|
||||
+ let detail = if red > 0 {
|
||||
+ format!("Hashboard {id}: {state} ({red} failed chip(s))")
|
||||
+ } else {
|
||||
+ format!("Hashboard {id}: {state}")
|
||||
+ };
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
- format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
+ detail,
|
||||
MessageSeverity::Error,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
- } else if !state_ok {
|
||||
- // A board not in a normal state but with no failed chips: report
|
||||
- // the state itself (e.g. "initializing", "disabled", "stopped").
|
||||
+ } else if red > 0 {
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
- format!("Hashboard {id}: {state}"),
|
||||
- MessageSeverity::Error,
|
||||
+ format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
+ MessageSeverity::Warning,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
} else if orange > 0 {
|
||||
diff --git a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
index 1301a657..e6247923 100644
|
||||
--- a/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-vnish/src/backends/v1_3_0/mod.rs
|
||||
@@ -294,6 +294,17 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: Some("unit"),
|
||||
},
|
||||
),
|
||||
+ // Per-board hashboard model ("board_model", e.g. "A3HB70601") from
|
||||
+ // the factory-info endpoint, which the live /chains + /summary do not
|
||||
+ // carry. Already fetched for the PSU serial.
|
||||
+ (
|
||||
+ WEB_FACTORY_INFO,
|
||||
+ DataExtractor {
|
||||
+ func: get_by_pointer,
|
||||
+ key: Some("/chains"),
|
||||
+ tag: Some("factory"),
|
||||
+ },
|
||||
+ ),
|
||||
],
|
||||
DataField::Chips => vec![(
|
||||
WEB_CHAINS,
|
||||
@@ -499,6 +510,11 @@ impl GetHashboards for VnishV130 {
|
||||
.unwrap_or(HashRateUnit::GigaHash);
|
||||
let algo = self.device_info.algo;
|
||||
let chip_chains = data.get(&DataField::Chips).and_then(|v| v.as_array());
|
||||
+ // Factory-info chains carry the hashboard model (board_model), keyed by the
|
||||
+ // same 1-based chain id. Not present on the live /chains or /summary.
|
||||
+ let factory_chains = hashboards_data
|
||||
+ .and_then(|v| v.pointer("/factory"))
|
||||
+ .and_then(|v| v.as_array());
|
||||
|
||||
let mut hashboards: Vec<BoardData> =
|
||||
(0..self.device_info.hardware.board_count().unwrap_or(0) as usize)
|
||||
@@ -648,6 +664,16 @@ impl GetHashboards for VnishV130 {
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s == "mining")
|
||||
.or_else(|| board.hashrate.as_ref().map(|h| h.value > 0.0));
|
||||
+ // Hashboard model from factory-info (board_model), matched by chain id.
|
||||
+ board.hashboard_model = factory_chains.and_then(|chains| {
|
||||
+ chains
|
||||
+ .iter()
|
||||
+ .find(|c| c.pointer("/id").and_then(|v| v.as_u64()) == Some(id))
|
||||
+ .and_then(|c| c.pointer("/board_model"))
|
||||
+ .and_then(|v| v.as_str())
|
||||
+ .filter(|s| !s.is_empty())
|
||||
+ .map(String::from)
|
||||
+ });
|
||||
}
|
||||
|
||||
hashboards
|
||||
@@ -874,22 +900,31 @@ impl GetMessages for VnishV130 {
|
||||
"" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
|
||||
);
|
||||
|
||||
- if red > 0 {
|
||||
+ // Severity reflects whether the board is still doing its job. A board
|
||||
+ // NOT in a normal mining state is down -> Error (red). A board that is
|
||||
+ // still mining but has some failed/degraded chips is sub-optimal, not
|
||||
+ // broken -> Warning (yellow): dead chips while the board keeps hashing
|
||||
+ // near its target are wear, not a fault (a ~83%-hashrate board must not
|
||||
+ // read as broken).
|
||||
+ if !state_ok {
|
||||
+ let detail = if red > 0 {
|
||||
+ format!("Hashboard {id}: {state} ({red} failed chip(s))")
|
||||
+ } else {
|
||||
+ format!("Hashboard {id}: {state}")
|
||||
+ };
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
- format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
+ detail,
|
||||
MessageSeverity::Error,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
- } else if !state_ok {
|
||||
- // A board not in a normal state but with no failed chips: report
|
||||
- // the state itself (e.g. "initializing", "disabled", "stopped").
|
||||
+ } else if red > 0 {
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
- format!("Hashboard {id}: {state}"),
|
||||
- MessageSeverity::Error,
|
||||
+ format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
+ MessageSeverity::Warning,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
} else if orange > 0 {
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
index 4025a931..8d5dad3c 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
|
||||
@@ -557,14 +557,15 @@ impl GetWattage for WhatsMinerV1 {
|
||||
}
|
||||
|
||||
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
|
||||
- // get_psu /Msg -> {model, hw_version, sw_version, ...} (values are strings).
|
||||
- // No DC output voltage or rated envelope is exposed, so only identity is set.
|
||||
+ // get_psu /Msg -> {model, name, hw_version, sw_version, serial_no, ...}
|
||||
+ // (values are strings). No DC output voltage or rated envelope is exposed, so
|
||||
+ // only identity (model/version/serial) is set.
|
||||
let d = data.get(&DataField::Psu)?;
|
||||
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
|
||||
let psu = PsuInfo {
|
||||
model: s("/model").or_else(|| s("/name")),
|
||||
version: s("/hw_version").or_else(|| s("/sw_version")),
|
||||
- serial: None, // v1/v2 get_psu does not report a serial (V3 does)
|
||||
+ serial: s("/serial_no"),
|
||||
voltage_min: None,
|
||||
voltage_max: None,
|
||||
output_voltage: None,
|
||||
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
index 2b340e28..328fb462 100644
|
||||
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
|
||||
@@ -530,14 +530,15 @@ impl GetWattage for WhatsMinerV2 {
|
||||
}
|
||||
|
||||
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
|
||||
- // get_psu /Msg -> {model, hw_version, sw_version} (string values). No DC
|
||||
- // output voltage or rated envelope is exposed, so only identity is set.
|
||||
+ // get_psu /Msg -> {model, name, hw_version, sw_version, serial_no} (string
|
||||
+ // values). No DC output voltage or rated envelope is exposed, so only
|
||||
+ // identity (model/version/serial) is set.
|
||||
let d = data.get(&DataField::Psu)?;
|
||||
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
|
||||
let psu = PsuInfo {
|
||||
model: s("/model").or_else(|| s("/name")),
|
||||
version: s("/hw_version").or_else(|| s("/sw_version")),
|
||||
- serial: None, // v1/v2 get_psu does not report a serial (V3 does)
|
||||
+ serial: s("/serial_no"),
|
||||
voltage_min: None,
|
||||
voltage_max: None,
|
||||
output_voltage: None,
|
||||
@@ -0,0 +1,39 @@
|
||||
Subject: [PATCH 0005] health tooltips: convert tip area to widget coordinates
|
||||
|
||||
Round 19 #2 (the real fix). The GtkTreeView "query-tooltip" handler for the Health
|
||||
column set a per-icon tip area from gtk_tree_view_get_cell_area, whose rectangle is
|
||||
in BIN-WINDOW coordinates, but gtk_tooltip_set_tip_area expects WIDGET coordinates.
|
||||
The area was therefore offset upward by the column-header height, so it did not
|
||||
contain the pointer -- and GTK suppresses a tooltip whose tip area excludes the
|
||||
cursor. That is why the health icon tooltips never appeared, while the Errors column
|
||||
(which sets no tip area) worked. Convert the slot rectangle back to widget
|
||||
coordinates with gtk_tree_view_convert_bin_window_to_widget_coords before setting it.
|
||||
|
||||
diff --git a/cpp_src/widgets_bridge.cpp b/cpp_src/widgets_bridge.cpp
|
||||
index ba9f1c04..6d09ccb7 100644
|
||||
--- a/cpp_src/widgets_bridge.cpp
|
||||
+++ b/cpp_src/widgets_bridge.cpp
|
||||
@@ -1019,9 +1019,21 @@ static gboolean dvlc_query_tooltip(GtkWidget* tv, gint x, gint y, gboolean keybo
|
||||
// or moves the tooltip as the pointer crosses from one icon to the next -- the
|
||||
// old tooltip just stays put with stale text. Setting a per-slot area makes GTK
|
||||
// hide + re-show + reposition the tooltip for each icon.
|
||||
+ //
|
||||
+ // CRITICAL (round 19 #2, the reason the health tooltips never showed): the slot
|
||||
+ // geometry above (block_left, crect) is in BIN-WINDOW coordinates (what
|
||||
+ // gtk_tree_view_get_cell_area and get_path_at_pos use), but
|
||||
+ // gtk_tooltip_set_tip_area expects WIDGET coordinates. Feeding it bin-window
|
||||
+ // coords offsets the area upward by the header height, so it does not contain
|
||||
+ // the pointer -- and GTK then suppresses the tooltip entirely (it only shows a
|
||||
+ // tooltip whose tip area contains the cursor). The Errors column worked because
|
||||
+ // it sets no tip area. Convert the slot rect back to widget coordinates.
|
||||
+ gint area_wx = 0, area_wy = 0;
|
||||
+ gtk_tree_view_convert_bin_window_to_widget_coords(
|
||||
+ GTK_TREE_VIEW(tv), block_left + slot * adv, crect.y, &area_wx, &area_wy);
|
||||
GdkRectangle area;
|
||||
- area.x = block_left + slot * adv;
|
||||
- area.y = crect.y;
|
||||
+ area.x = area_wx;
|
||||
+ area.y = area_wy;
|
||||
area.width = adv;
|
||||
area.height = crect.height;
|
||||
gtk_tooltip_set_tip_area(tooltip, &area);
|
||||
@@ -1019,9 +1019,21 @@ static gboolean dvlc_query_tooltip(GtkWidget* tv, gint x, gint y, gboolean keybo
|
||||
// or moves the tooltip as the pointer crosses from one icon to the next -- the
|
||||
// old tooltip just stays put with stale text. Setting a per-slot area makes GTK
|
||||
// hide + re-show + reposition the tooltip for each icon.
|
||||
//
|
||||
// CRITICAL (round 19 #2, the reason the health tooltips never showed): the slot
|
||||
// geometry above (block_left, crect) is in BIN-WINDOW coordinates (what
|
||||
// gtk_tree_view_get_cell_area and get_path_at_pos use), but
|
||||
// gtk_tooltip_set_tip_area expects WIDGET coordinates. Feeding it bin-window
|
||||
// coords offsets the area upward by the header height, so it does not contain
|
||||
// the pointer -- and GTK then suppresses the tooltip entirely (it only shows a
|
||||
// tooltip whose tip area contains the cursor). The Errors column worked because
|
||||
// it sets no tip area. Convert the slot rect back to widget coordinates.
|
||||
gint area_wx = 0, area_wy = 0;
|
||||
gtk_tree_view_convert_bin_window_to_widget_coords(
|
||||
GTK_TREE_VIEW(tv), block_left + slot * adv, crect.y, &area_wx, &area_wy);
|
||||
GdkRectangle area;
|
||||
area.x = block_left + slot * adv;
|
||||
area.y = crect.y;
|
||||
area.x = area_wx;
|
||||
area.y = area_wy;
|
||||
area.width = adv;
|
||||
area.height = crect.height;
|
||||
gtk_tooltip_set_tip_area(tooltip, &area);
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"20173e90df24055f67bf03e2b3bb3bc396168f39aa45b36828b1963749d7838a","Cargo.lock":"2f4e619eefd164b57242e6bae57ddf3f73053f6af308a1dea181936d6a41a291","Cargo.toml":"2310d9df1678c138cc82922659ba19d00a92fd2f107a21047890e53fd79c492d","Cargo.toml.orig":"6c6d97588811d1b3b4c0839aa016d6133745b96f7620d390d093d60a8e29d501","src/config/collector.rs":"8c79ac6d3a04f93efc78b176ef7f6b1dc44e50d2bc95d813439b47422d6bb28f","src/config/fan.rs":"80c305261643542f11368342c3dcea29bbd3b016fb6f2962fdad6489dac2734a","src/config/mod.rs":"0d14701319d84ded3cd2f6ba6f92bff18c8e5cff90a2229592d97baae3ed4de3","src/config/pools.rs":"a74ab648053eb51305c4e1bbb6c05db57575ff2542b4fd53d28d33687a62eee3","src/config/preset.rs":"e68d694d3cf537c67ecb3b535a77904e25cc3b206a6ec214fc904011229b8a7c","src/config/scaling.rs":"f402e00c75ef796068765ab1a82ce6a3a0eb88f484c4a67f574ede90a3abaeeb","src/config/temperature.rs":"c6fd6f9cc8e565f27b58fb571fd33b58dcf2112a50b570f6b54a3c11c13d1fbe","src/config/timezone.rs":"4470fd704885e62e3bc8da8087dce6b002dd3fa92cec54d96ce88a06f03e1cbe","src/config/tuning.rs":"31a0826419d4690315f6eecc03250bfb4e5342431ff261015a9f9f3d87e69b6c","src/data/board.rs":"0f2547d5763225a3c5387da695de52b65c38eeb7942d14ecef36a72388c7a451","src/data/capabilities.rs":"29cbab6262fb8888b30b4674a30ef03983e005b4e18eefddfbbf9c568e1e1e17","src/data/collector.rs":"a13377bd87ed2c634cfcb3a40d4ca8184457bdf73bc8aaf343def42fd850bc37","src/data/command.rs":"53cd7e5e87888a76ba866b33b6d87400112bc3eeb4b5e331a381dfbb2c04579e","src/data/deserialize.rs":"461a84defd6f2fb53c8b3c059463c2bfcf69df80db0f5aa2d30b47e710163992","src/data/device.rs":"813b0d41834b217da9f2d51fc7d9cb0f12db6aa7501dd43b6c3f992f29e7827f","src/data/fan.rs":"9307626335008c04d5e5c742bdd7ff5c6e9055dbd84d0e7a655e6e656da3df78","src/data/firmware.rs":"648acace3b289f623cf678f36fb854ff5ddafb8e2f651ae4a15128ae719f87ba","src/data/hashrate.rs":"037a4cce611c9dafb03eb18c4d088c42df5a9bf23f376c0436aded7a3d657b0d","src/data/message.rs":"7b399ab1a0b6e43e61a5461d29a2752beed2d1fd7b214eb891572f8994d47c11","src/data/miner.rs":"aabe27610a25e5b5db991854d4cf6b7dc1e699828559fd7872ff9f8df2ce0013","src/data/mod.rs":"f63a6bd20fb2389e434257ccfe646321b25449993c937ece0d29850e0ab2279f","src/data/operating_state.rs":"7dccbfcc3eada16d0f890772323d4626fa9f298f7fc1882675ae3672d94f6da3","src/data/pool.rs":"a6bff9e56239915a095c4f99187a2d5f4631c3641332071c5134128cacaecceb","src/data/serialize.rs":"347f8cdf619156ac73aa0d89ed41555bd7332ef60cc92f945bc0f16f4ad29137","src/data/share.rs":"99adfa10cfc59e245f41f77c70951e7aac5b3422e48abd270c56c3db122bbb6d","src/discovery.rs":"efc236592941e72609bd3be18551834f648b608caaf73b9555f75b9838692f6b","src/errors.rs":"0238c8cb6585d05cdd01aec031895e5240e3883f44f3fa22a7398027a360ef1a","src/lib.rs":"e2c8ecde3cf8edda920470f8b938056b60448184a5c81672f04a8e0235c3cf22","src/test/api.rs":"5defa33709c14cadfa7390981c3c7d3f324ef1878e4ee56c089dbf85665b57ae","src/test/mod.rs":"0b44b178ea8950b75fe09047797085f03e5c0eb17d62ca1f3e62a8f643fda87c","src/test/util.rs":"c6f5a3cccb40f1d6a7c316b52c70c59f8dda24a6ad83cb5aeac0b5d970debd0e","src/traits/auth.rs":"dffa58542ac9e57175f5dcad261f80b3efeba76ef3a039b0d9c6f9eb14a19893","src/traits/discovery.rs":"b232ea113c675178ae62c9f5ee35d0329e3a4465388133992c0db8d697113e34","src/traits/entry.rs":"03cf30045be6ba92a414d36990d316d572be21e6c66039ed8193da9a3c27cf53","src/traits/firmware.rs":"94831620bb8c8c4ce2ad69f8fd7b9679ee1de63b1f99529559e24f2118710638","src/traits/identification.rs":"67866931aa28c2e5b0e07dbacae47c1d82b53addea333f75033c451bbd2c9a77","src/traits/make.rs":"1d099cd51ecb354d20acef4cc1d2b3f75b682b6d6c887553861e185602d465f4","src/traits/miner.rs":"efdb1e41334335170d9cec147b3d0db5540f69a58a2ffe3aa78057cce8a4648b","src/traits/mod.rs":"61406c4d2603299e4bad57c6f90115cadf93cee50a857bbfbb00d99f3a6873ac","src/traits/model.rs":"efde2b5cae4c4f018436bb68b236f354b5a733f7dafdeaf3f1c534b469a22d64","src/util.rs":"53255c65e85b97236cb34b452e2cb522edf377f49d2232645e0e0e33c447bb23"},"package":"1f25e625fc4c645ce995c5609a9fdff6f047d6a5e4d6be9dc167999a43197f58"}
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"20173e90df24055f67bf03e2b3bb3bc396168f39aa45b36828b1963749d7838a","Cargo.lock":"2f4e619eefd164b57242e6bae57ddf3f73053f6af308a1dea181936d6a41a291","Cargo.toml":"2310d9df1678c138cc82922659ba19d00a92fd2f107a21047890e53fd79c492d","Cargo.toml.orig":"6c6d97588811d1b3b4c0839aa016d6133745b96f7620d390d093d60a8e29d501","src/config/collector.rs":"8c79ac6d3a04f93efc78b176ef7f6b1dc44e50d2bc95d813439b47422d6bb28f","src/config/fan.rs":"80c305261643542f11368342c3dcea29bbd3b016fb6f2962fdad6489dac2734a","src/config/mod.rs":"0d14701319d84ded3cd2f6ba6f92bff18c8e5cff90a2229592d97baae3ed4de3","src/config/pools.rs":"a74ab648053eb51305c4e1bbb6c05db57575ff2542b4fd53d28d33687a62eee3","src/config/preset.rs":"e68d694d3cf537c67ecb3b535a77904e25cc3b206a6ec214fc904011229b8a7c","src/config/scaling.rs":"f402e00c75ef796068765ab1a82ce6a3a0eb88f484c4a67f574ede90a3abaeeb","src/config/temperature.rs":"c6fd6f9cc8e565f27b58fb571fd33b58dcf2112a50b570f6b54a3c11c13d1fbe","src/config/timezone.rs":"4470fd704885e62e3bc8da8087dce6b002dd3fa92cec54d96ce88a06f03e1cbe","src/config/tuning.rs":"31a0826419d4690315f6eecc03250bfb4e5342431ff261015a9f9f3d87e69b6c","src/data/board.rs":"0f2547d5763225a3c5387da695de52b65c38eeb7942d14ecef36a72388c7a451","src/data/capabilities.rs":"29cbab6262fb8888b30b4674a30ef03983e005b4e18eefddfbbf9c568e1e1e17","src/data/collector.rs":"b0ea657174d7259a7e9d9c232e707293940a4cce2558e1976dbf6ec5c726fe71","src/data/command.rs":"53cd7e5e87888a76ba866b33b6d87400112bc3eeb4b5e331a381dfbb2c04579e","src/data/deserialize.rs":"461a84defd6f2fb53c8b3c059463c2bfcf69df80db0f5aa2d30b47e710163992","src/data/device.rs":"813b0d41834b217da9f2d51fc7d9cb0f12db6aa7501dd43b6c3f992f29e7827f","src/data/fan.rs":"9307626335008c04d5e5c742bdd7ff5c6e9055dbd84d0e7a655e6e656da3df78","src/data/firmware.rs":"648acace3b289f623cf678f36fb854ff5ddafb8e2f651ae4a15128ae719f87ba","src/data/hashrate.rs":"037a4cce611c9dafb03eb18c4d088c42df5a9bf23f376c0436aded7a3d657b0d","src/data/message.rs":"7b399ab1a0b6e43e61a5461d29a2752beed2d1fd7b214eb891572f8994d47c11","src/data/miner.rs":"7a0d2a7ce07ac5480ca0e1e80549828220df7802077f735cd334f6f21f0e0112","src/data/mod.rs":"f63a6bd20fb2389e434257ccfe646321b25449993c937ece0d29850e0ab2279f","src/data/operating_state.rs":"7dccbfcc3eada16d0f890772323d4626fa9f298f7fc1882675ae3672d94f6da3","src/data/pool.rs":"a6bff9e56239915a095c4f99187a2d5f4631c3641332071c5134128cacaecceb","src/data/serialize.rs":"347f8cdf619156ac73aa0d89ed41555bd7332ef60cc92f945bc0f16f4ad29137","src/data/share.rs":"99adfa10cfc59e245f41f77c70951e7aac5b3422e48abd270c56c3db122bbb6d","src/discovery.rs":"efc236592941e72609bd3be18551834f648b608caaf73b9555f75b9838692f6b","src/errors.rs":"0238c8cb6585d05cdd01aec031895e5240e3883f44f3fa22a7398027a360ef1a","src/lib.rs":"e2c8ecde3cf8edda920470f8b938056b60448184a5c81672f04a8e0235c3cf22","src/test/api.rs":"5defa33709c14cadfa7390981c3c7d3f324ef1878e4ee56c089dbf85665b57ae","src/test/mod.rs":"0b44b178ea8950b75fe09047797085f03e5c0eb17d62ca1f3e62a8f643fda87c","src/test/util.rs":"c6f5a3cccb40f1d6a7c316b52c70c59f8dda24a6ad83cb5aeac0b5d970debd0e","src/traits/auth.rs":"dffa58542ac9e57175f5dcad261f80b3efeba76ef3a039b0d9c6f9eb14a19893","src/traits/discovery.rs":"b232ea113c675178ae62c9f5ee35d0329e3a4465388133992c0db8d697113e34","src/traits/entry.rs":"03cf30045be6ba92a414d36990d316d572be21e6c66039ed8193da9a3c27cf53","src/traits/firmware.rs":"94831620bb8c8c4ce2ad69f8fd7b9679ee1de63b1f99529559e24f2118710638","src/traits/identification.rs":"67866931aa28c2e5b0e07dbacae47c1d82b53addea333f75033c451bbd2c9a77","src/traits/make.rs":"1d099cd51ecb354d20acef4cc1d2b3f75b682b6d6c887553861e185602d465f4","src/traits/miner.rs":"1adf2f76b04fcaf0a4042f055eab07b2c87ea76fb8856a3c6741defa98e1f354","src/traits/mod.rs":"61406c4d2603299e4bad57c6f90115cadf93cee50a857bbfbb00d99f3a6873ac","src/traits/model.rs":"efde2b5cae4c4f018436bb68b236f354b5a733f7dafdeaf3f1c534b469a22d64","src/util.rs":"53255c65e85b97236cb34b452e2cb522edf377f49d2232645e0e0e33c447bb23"},"package":"1f25e625fc4c645ce995c5609a9fdff6f047d6a5e4d6be9dc167999a43197f58"}
|
||||
@@ -65,6 +65,12 @@ pub enum DataField {
|
||||
/// Miner-level fan duty cycle as a percentage (0-100).
|
||||
#[cfg_attr(feature = "python", pydantic(value = "FanSpeedPercent"))]
|
||||
FanSpeedPercent,
|
||||
/// Board temperature safety thresholds (critical / shutdown), in Celsius.
|
||||
#[cfg_attr(feature = "python", pydantic(value = "TemperatureLimits"))]
|
||||
TemperatureLimits,
|
||||
/// Auto-tuner status (a human-readable label, e.g. "Stable", "Tuning").
|
||||
#[cfg_attr(feature = "python", pydantic(value = "TunerStatus"))]
|
||||
TunerStatus,
|
||||
/// PSU fan speed or configuration.
|
||||
#[cfg_attr(feature = "python", pydantic(value = "PsuFans"))]
|
||||
PsuFans,
|
||||
|
||||
@@ -181,6 +181,12 @@ pub struct MinerData {
|
||||
/// Miner-level fan duty cycle as a percentage (0-100), when reported. Firmware
|
||||
/// exposes no maximum RPM, so this duty cycle is the normalized fan indicator.
|
||||
pub fan_speed_percent: Option<f64>,
|
||||
/// Board target temperature threshold in Celsius, when reported (round 19 #10).
|
||||
pub temp_target: Option<f64>,
|
||||
/// Board hot temperature threshold in Celsius, when reported (round 19 #10).
|
||||
pub temp_hot: Option<f64>,
|
||||
/// Board dangerous temperature threshold in Celsius, when reported (round 19 #10).
|
||||
pub temp_dangerous: Option<f64>,
|
||||
/// The current PDU fan information for the miner
|
||||
pub psu_fans: Vec<FanData>,
|
||||
/// The average temperature across all chips in the miner
|
||||
@@ -230,6 +236,9 @@ pub struct MinerData {
|
||||
#[serde(default)]
|
||||
#[cfg_attr(feature = "python", pydantic(default = None))]
|
||||
pub operating_state: Option<OperatingState>,
|
||||
/// Auto-tuner status as a human-readable label (round 19 #10), when reported:
|
||||
/// e.g. "Stable"/"Tuning" (Braiins), "Optimized"/"Tuning"/"Off" (ePIC).
|
||||
pub tuner_status: Option<String>,
|
||||
/// The current pools configured on the miner
|
||||
pub pools: Vec<PoolGroupData>,
|
||||
/// Difficulty of the best share found over the miner's lifetime, when reported.
|
||||
|
||||
@@ -282,6 +282,7 @@ impl<
|
||||
let tuning_capabilities = self.parse_tuning_capabilities(&data);
|
||||
let fluid_temperature = self.parse_fluid_temperature(&data);
|
||||
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&data);
|
||||
let (temp_target, temp_hot, temp_dangerous) = self.parse_temperature_limits(&data);
|
||||
let fans = self.parse_fans(&data);
|
||||
let fan_speed_percent = self.parse_fan_speed_percent(&data);
|
||||
let psu_fans = self.parse_psu_fans(&data);
|
||||
@@ -289,6 +290,7 @@ impl<
|
||||
let light_flashing = self.parse_light_flashing(&data);
|
||||
let is_mining = self.parse_is_mining(&data);
|
||||
let operating_state = self.parse_operating_state(&data);
|
||||
let tuner_status = self.parse_tuner_status(&data);
|
||||
let messages = self.parse_messages(&data);
|
||||
let pools = self.parse_pools(&data);
|
||||
let best_share = self.parse_best_share(&data);
|
||||
@@ -368,6 +370,9 @@ impl<
|
||||
expected_fans: device_info.hardware.fans,
|
||||
fans,
|
||||
fan_speed_percent,
|
||||
temp_target,
|
||||
temp_hot,
|
||||
temp_dangerous,
|
||||
psu_fans,
|
||||
average_temperature,
|
||||
fluid_temperature,
|
||||
@@ -388,6 +393,7 @@ impl<
|
||||
uptime,
|
||||
is_mining,
|
||||
operating_state,
|
||||
tuner_status,
|
||||
|
||||
pools,
|
||||
best_share,
|
||||
@@ -741,6 +747,15 @@ pub trait GetFluidTemperature: CollectData {
|
||||
) -> Option<Temperature> {
|
||||
None
|
||||
}
|
||||
/// Board temperature safety thresholds as (target, hot, dangerous) in Celsius.
|
||||
/// Backends that expose them override this; others return (None, None, None).
|
||||
#[allow(unused_variables)]
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
(None, None, None)
|
||||
}
|
||||
}
|
||||
|
||||
// Wattage
|
||||
@@ -901,6 +916,18 @@ pub trait GetOperatingState: CollectData {
|
||||
fn parse_operating_state(&self, data: &HashMap<DataField, Value>) -> Option<OperatingState> {
|
||||
None
|
||||
}
|
||||
#[tracing::instrument(level = "debug")]
|
||||
async fn get_tuner_status(&self) -> Option<String> {
|
||||
let mut collector = self.get_collector();
|
||||
let data = collector.collect(&[DataField::TunerStatus]).await;
|
||||
self.parse_tuner_status(&data)
|
||||
}
|
||||
/// Auto-tuner status as a human-readable label. Backends that expose it override
|
||||
/// this; others return None.
|
||||
#[allow(unused_variables)]
|
||||
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
// Pools
|
||||
|
||||
@@ -272,6 +272,16 @@ impl GetDataLocations for BraiinsV2507 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Auto-tuner status (round 19 #10, T3): performance/tuner-state
|
||||
// overall_tuner_state enum; command already fetched.
|
||||
DataField::TunerStatus => vec![(
|
||||
WEB_PERFORMANCE_TUNER_STATE,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/overall_tuner_state"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Uptime => vec![(
|
||||
WEB_MINER_DETAILS,
|
||||
DataExtractor {
|
||||
@@ -372,6 +382,16 @@ impl GetDataLocations for BraiinsV2507 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
|
||||
// (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
|
||||
DataField::TemperatureLimits => vec![(
|
||||
WEB_CONSTRAINTS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/cooling_constraints"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -620,6 +640,21 @@ impl GetOperatingState for BraiinsV2507 {
|
||||
},
|
||||
})
|
||||
}
|
||||
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
// BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
|
||||
// 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
|
||||
Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
|
||||
0 => return None,
|
||||
1 => "Disabled",
|
||||
2 => "Stable",
|
||||
3 => "Tuning",
|
||||
4 => "Error",
|
||||
5 => "Continuous",
|
||||
6 => "Preheat",
|
||||
_ => return None,
|
||||
})
|
||||
.map(str::to_string)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetIsMining for BraiinsV2507 {
|
||||
@@ -725,7 +760,26 @@ impl GetScaledTuningTarget for BraiinsV2507 {
|
||||
}
|
||||
}
|
||||
|
||||
impl GetFluidTemperature for BraiinsV2507 {}
|
||||
impl GetFluidTemperature for BraiinsV2507 {
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
// Braiins cooling_constraints target/hot/dangerous default thresholds in
|
||||
// degree_c (round 19 #10, T3).
|
||||
let d = data.get(&DataField::TemperatureLimits);
|
||||
let f = |k: &str| {
|
||||
d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0)
|
||||
};
|
||||
(
|
||||
f("target_temperature"),
|
||||
f("hot_temperature"),
|
||||
f("dangerous_temperature"),
|
||||
)
|
||||
}
|
||||
}
|
||||
impl GetTuningCapabilities for BraiinsV2507 {
|
||||
fn parse_tuning_capabilities(
|
||||
&self,
|
||||
|
||||
@@ -275,6 +275,16 @@ impl GetDataLocations for BraiinsV2604 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Auto-tuner status (round 19 #10, T3): performance/tuner-state
|
||||
// overall_tuner_state enum; command already fetched.
|
||||
DataField::TunerStatus => vec![(
|
||||
WEB_PERFORMANCE_TUNER_STATE,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/overall_tuner_state"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Uptime => vec![(
|
||||
WEB_MINER_DETAILS,
|
||||
DataExtractor {
|
||||
@@ -393,6 +403,16 @@ impl GetDataLocations for BraiinsV2604 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Board temp thresholds (round 19 #10, T3): cooling_constraints defaults
|
||||
// (target/hot/dangerous); WEB_CONSTRAINTS already fetched.
|
||||
DataField::TemperatureLimits => vec![(
|
||||
WEB_CONSTRAINTS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/cooling_constraints"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -657,6 +677,21 @@ impl GetOperatingState for BraiinsV2604 {
|
||||
},
|
||||
})
|
||||
}
|
||||
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
// BOS+ TunerState enum (bos-plus-api performance.proto): 1 Disabled,
|
||||
// 2 Stable, 3 Tuning, 4 Error, 5 Continuous, 6 Preheat (round 19 #10, T3).
|
||||
Some(match data.get(&DataField::TunerStatus)?.as_u64()? {
|
||||
0 => return None,
|
||||
1 => "Disabled",
|
||||
2 => "Stable",
|
||||
3 => "Tuning",
|
||||
4 => "Error",
|
||||
5 => "Continuous",
|
||||
6 => "Preheat",
|
||||
_ => return None,
|
||||
})
|
||||
.map(str::to_string)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetIsMining for BraiinsV2604 {
|
||||
@@ -775,7 +810,26 @@ impl GetScaledTuningTarget for BraiinsV2604 {
|
||||
}
|
||||
}
|
||||
|
||||
impl GetFluidTemperature for BraiinsV2604 {}
|
||||
impl GetFluidTemperature for BraiinsV2604 {
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
// Braiins cooling_constraints target/hot/dangerous default thresholds in
|
||||
// degree_c (round 19 #10, T3).
|
||||
let d = data.get(&DataField::TemperatureLimits);
|
||||
let f = |k: &str| {
|
||||
d.and_then(|v| v.pointer(&format!("/{k}/default/degree_c")))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0)
|
||||
};
|
||||
(
|
||||
f("target_temperature"),
|
||||
f("hot_temperature"),
|
||||
f("dangerous_temperature"),
|
||||
)
|
||||
}
|
||||
}
|
||||
impl GetTuningCapabilities for BraiinsV2604 {
|
||||
fn parse_tuning_capabilities(
|
||||
&self,
|
||||
@@ -1167,10 +1221,10 @@ mod tests {
|
||||
|
||||
use super::*;
|
||||
use crate::test::json::v26_04::{
|
||||
WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND, WEB_LOCATE_COMMAND,
|
||||
WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND, WEB_MINER_STATS_COMMAND,
|
||||
WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND, WEB_POOLS_COMMAND,
|
||||
WEB_VERSION_COMMAND,
|
||||
WEB_CONSTRAINTS_COMMAND, WEB_COOLING_STATE_COMMAND, WEB_HASHBOARDS_COMMAND,
|
||||
WEB_LOCATE_COMMAND, WEB_MINER_CONFIGURATION_COMMAND, WEB_MINER_DETAILS_COMMAND,
|
||||
WEB_MINER_STATS_COMMAND, WEB_NETWORK_COMMAND, WEB_PERFORMANCE_TUNER_STATE_COMMAND,
|
||||
WEB_POOLS_COMMAND, WEB_VERSION_COMMAND,
|
||||
};
|
||||
|
||||
#[tokio::test]
|
||||
@@ -1251,6 +1305,13 @@ mod tests {
|
||||
},
|
||||
Value::from_str(WEB_HASHBOARDS_COMMAND).unwrap(),
|
||||
);
|
||||
results.insert(
|
||||
MinerCommand::WebAPI {
|
||||
command: "configuration/constraints",
|
||||
parameters: None,
|
||||
},
|
||||
Value::from_str(WEB_CONSTRAINTS_COMMAND).unwrap(),
|
||||
);
|
||||
results.insert(
|
||||
MinerCommand::WebAPI {
|
||||
command: "actions/locate",
|
||||
@@ -1313,6 +1374,12 @@ mod tests {
|
||||
// 19 #10, T3).
|
||||
let fan_pct = miner_data.fan_speed_percent.expect("braiins fan duty");
|
||||
assert!((fan_pct - 92.0).abs() < 1e-6);
|
||||
// Board temp thresholds from cooling_constraints defaults (round 19 #10, T3).
|
||||
assert_eq!(miner_data.temp_target, Some(60.0));
|
||||
assert_eq!(miner_data.temp_hot, Some(80.0));
|
||||
assert_eq!(miner_data.temp_dangerous, Some(90.0));
|
||||
// Auto-tuner status: overall_tuner_state 5 -> Continuous (round 19 #10, T3).
|
||||
assert_eq!(miner_data.tuner_status.as_deref(), Some("Continuous"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -0,0 +1,200 @@
|
||||
{
|
||||
"tuner_constraints": {
|
||||
"power_target": {
|
||||
"default": {
|
||||
"watt": 2832
|
||||
},
|
||||
"min": {
|
||||
"watt": 944
|
||||
},
|
||||
"max": {
|
||||
"watt": 6435
|
||||
}
|
||||
},
|
||||
"hashrate_target": {
|
||||
"default": {
|
||||
"terahash_per_second": 96.0
|
||||
},
|
||||
"min": {
|
||||
"terahash_per_second": 70.75
|
||||
},
|
||||
"max": {
|
||||
"terahash_per_second": 252.57
|
||||
}
|
||||
},
|
||||
"enabled": {
|
||||
"default": true
|
||||
},
|
||||
"default_mode": 1
|
||||
},
|
||||
"cooling_constraints": {
|
||||
"default_cooling_mode": 1,
|
||||
"target_temperature": {
|
||||
"default": {
|
||||
"degree_c": 60.0
|
||||
},
|
||||
"min": {
|
||||
"degree_c": 0.0
|
||||
},
|
||||
"max": {
|
||||
"degree_c": 200.0
|
||||
}
|
||||
},
|
||||
"hot_temperature": {
|
||||
"default": {
|
||||
"degree_c": 80.0
|
||||
},
|
||||
"min": {
|
||||
"degree_c": 0.0
|
||||
},
|
||||
"max": {
|
||||
"degree_c": 200.0
|
||||
}
|
||||
},
|
||||
"dangerous_temperature": {
|
||||
"default": {
|
||||
"degree_c": 90.0
|
||||
},
|
||||
"min": {
|
||||
"degree_c": 0.0
|
||||
},
|
||||
"max": {
|
||||
"degree_c": 200.0
|
||||
}
|
||||
},
|
||||
"fan_speed_ratio": {
|
||||
"default": 1.0,
|
||||
"min": 0.0,
|
||||
"max": 1.0
|
||||
},
|
||||
"minimum_required_fans": {
|
||||
"default": 2,
|
||||
"min": 0,
|
||||
"max": 4
|
||||
},
|
||||
"min_fan_speed": {
|
||||
"default": 0,
|
||||
"min": 0,
|
||||
"max": 100
|
||||
},
|
||||
"max_fan_speed": {
|
||||
"default": 100,
|
||||
"min": 0,
|
||||
"max": 100
|
||||
},
|
||||
"pause_cooldown_fan_speed_ratio": {
|
||||
"default": 0.2,
|
||||
"min": 0.0,
|
||||
"max": 1.0
|
||||
},
|
||||
"default_fan_pause_mode": 2,
|
||||
"default_fan_pause_runtime": 1,
|
||||
"fan_pause_runtime_limited_duration_s": 120
|
||||
},
|
||||
"dps_constraints": {
|
||||
"power_step": {
|
||||
"default": {
|
||||
"watt": 300
|
||||
},
|
||||
"min": {
|
||||
"watt": 1
|
||||
},
|
||||
"max": {
|
||||
"watt": 1000
|
||||
}
|
||||
},
|
||||
"hashrate_step": {
|
||||
"default": {
|
||||
"terahash_per_second": 11.0
|
||||
},
|
||||
"min": {
|
||||
"terahash_per_second": 0.1
|
||||
},
|
||||
"max": {
|
||||
"terahash_per_second": 100.0
|
||||
}
|
||||
},
|
||||
"min_power_target": {
|
||||
"default": {
|
||||
"watt": 944
|
||||
},
|
||||
"min": {
|
||||
"watt": 944
|
||||
},
|
||||
"max": {
|
||||
"watt": 6435
|
||||
}
|
||||
},
|
||||
"min_hashrate_target": {
|
||||
"default": {
|
||||
"terahash_per_second": 70.75
|
||||
},
|
||||
"min": {
|
||||
"terahash_per_second": 70.75
|
||||
},
|
||||
"max": {
|
||||
"terahash_per_second": 252.57
|
||||
}
|
||||
},
|
||||
"shutdown_enabled": {
|
||||
"default": false
|
||||
},
|
||||
"shutdown_duration": {
|
||||
"default": {
|
||||
"hours": 3
|
||||
},
|
||||
"min": {
|
||||
"hours": 0
|
||||
},
|
||||
"max": {
|
||||
"hours": 999
|
||||
}
|
||||
},
|
||||
"enabled": {
|
||||
"default": true
|
||||
},
|
||||
"mode": 1,
|
||||
"on_start_target_percent": {
|
||||
"default": 100,
|
||||
"min": 50,
|
||||
"max": 100
|
||||
}
|
||||
},
|
||||
"hashboards_constraints": {
|
||||
"hashboard_ids": [
|
||||
"1",
|
||||
"2",
|
||||
"3"
|
||||
],
|
||||
"enabled": {
|
||||
"default": true
|
||||
},
|
||||
"frequency": {
|
||||
"default": {
|
||||
"hertz": 505000000.0
|
||||
},
|
||||
"min": {
|
||||
"hertz": 50000000.0
|
||||
},
|
||||
"max": {
|
||||
"hertz": 1300000000.0
|
||||
}
|
||||
},
|
||||
"voltage": {
|
||||
"default": {
|
||||
"volt": 13.4
|
||||
},
|
||||
"min": {
|
||||
"volt": 11.96
|
||||
},
|
||||
"max": {
|
||||
"volt": 15.2
|
||||
}
|
||||
},
|
||||
"quick_ramping_time_s": {
|
||||
"default": 30,
|
||||
"min": 2,
|
||||
"max": 600
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,3 +12,4 @@ pub(crate) const WEB_POOLS_COMMAND: &str = include_str!("pools.json");
|
||||
pub(crate) const WEB_COOLING_STATE_COMMAND: &str = include_str!("cooling_state.json");
|
||||
pub(crate) const WEB_HASHBOARDS_COMMAND: &str = include_str!("miner_hw_hashboards.json");
|
||||
pub(crate) const WEB_LOCATE_COMMAND: &str = include_str!("actions_locate.json");
|
||||
pub(crate) const WEB_CONSTRAINTS_COMMAND: &str = include_str!("configuration_constraints.json");
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"4c9489c1f9b5f16e3fd8ab777da35bb120ccd0ca05f780cf94853c89fb5c8946","Cargo.lock":"69db8793725d6071e21b4353fb89537912096d7eccebd6ee597367330141f613","Cargo.toml":"df82261a9c3187bee15a7d6092d54ad2e9c7e4d1f127cd577c457d913f6881cf","Cargo.toml.orig":"e7c4ef90bc86763dad35d1a4da1c17c7e2f59eaac79e2f011647ae31c43d5e2b","src/backends/mod.rs":"1362c4d3805dccb7a78ef6b45d6a81b8f63b2be75fcf80329b6c2b0dd9e2d5c5","src/backends/v1/mod.rs":"16625602cfff61557b0f4b9eaefdba193f629eca94a964302b5f5cf881af1120","src/backends/v1/web.rs":"3a567a4f581baa5d9d2d4e59d8acc754eec51d49b0a4f5434d87614b037a4a55","src/firmware.rs":"fb88124a51089756cc3271f3d4a234d73add61ab919c4710ef26a52dc8b5ef80","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/capabilities.json":"d2b3dae7aa2a1e2977e0ddf62cf2d730de64cf12bf62388c12fd23dc5278bbcb","src/test/json/v1/chip_clocks.json":"d1f46d3aad6ad55ec1c02d0b26aa4c5034c1ccaefb130d7b0e46efe48bb122a0","src/test/json/v1/chip_hashrates.json":"9601a1289f93fe4e27c722d51b3a31daa71aec71f2c29e71f6d1eefe01edf7f2","src/test/json/v1/chip_temps.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/chip_voltages.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/mod.rs":"5671105221b84b0b6edb2df34b25bfc9e33459da285d4316be0db23ddb630e8d","src/test/json/v1/network.json":"3374b419fa2f0bc19544c670e08118bbc45bd4d121a577c5a6403c8c8100f628","src/test/json/v1/summary.json":"ac8ac018da9d619b5884f283b730bad2bf0a7e8f2032a7119193c9e5d87d6a7c","src/test/json/v1/temps.json":"794edf870985ed4398ead96670b8f5d01deb4d825fb14a8325087a29cd939fa8","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"268dc7c8b3289fccd3230ff87f7bfc727a3e7e2f6f72ae56ab9d27c63eabc5cf"}
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"4c9489c1f9b5f16e3fd8ab777da35bb120ccd0ca05f780cf94853c89fb5c8946","Cargo.lock":"69db8793725d6071e21b4353fb89537912096d7eccebd6ee597367330141f613","Cargo.toml":"df82261a9c3187bee15a7d6092d54ad2e9c7e4d1f127cd577c457d913f6881cf","Cargo.toml.orig":"e7c4ef90bc86763dad35d1a4da1c17c7e2f59eaac79e2f011647ae31c43d5e2b","src/backends/mod.rs":"1362c4d3805dccb7a78ef6b45d6a81b8f63b2be75fcf80329b6c2b0dd9e2d5c5","src/backends/v1/mod.rs":"b42ecb0edb9e92f5de47fbac632b3f6edcb0160546619dc619ba75a9f070e791","src/backends/v1/web.rs":"3a567a4f581baa5d9d2d4e59d8acc754eec51d49b0a4f5434d87614b037a4a55","src/firmware.rs":"fb88124a51089756cc3271f3d4a234d73add61ab919c4710ef26a52dc8b5ef80","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/capabilities.json":"d2b3dae7aa2a1e2977e0ddf62cf2d730de64cf12bf62388c12fd23dc5278bbcb","src/test/json/v1/chip_clocks.json":"d1f46d3aad6ad55ec1c02d0b26aa4c5034c1ccaefb130d7b0e46efe48bb122a0","src/test/json/v1/chip_hashrates.json":"9601a1289f93fe4e27c722d51b3a31daa71aec71f2c29e71f6d1eefe01edf7f2","src/test/json/v1/chip_temps.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/chip_voltages.json":"cb7390e424af57f55f0c974ddfe0c98c4d5b4dbcd85887e38ff8caf7b19f62fe","src/test/json/v1/mod.rs":"5671105221b84b0b6edb2df34b25bfc9e33459da285d4316be0db23ddb630e8d","src/test/json/v1/network.json":"3374b419fa2f0bc19544c670e08118bbc45bd4d121a577c5a6403c8c8100f628","src/test/json/v1/summary.json":"ac8ac018da9d619b5884f283b730bad2bf0a7e8f2032a7119193c9e5d87d6a7c","src/test/json/v1/temps.json":"794edf870985ed4398ead96670b8f5d01deb4d825fb14a8325087a29cd939fa8","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"268dc7c8b3289fccd3230ff87f7bfc727a3e7e2f6f72ae56ab9d27c63eabc5cf"}
|
||||
@@ -482,6 +482,16 @@ impl GetDataLocations for PowerPlayV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Board temperature thresholds (round 19 #10, T3); summary /Misc carries
|
||||
// Critical Temp and Shutdown Temp. Already fetched.
|
||||
DataField::TemperatureLimits => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/Misc"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Hashboards => vec![
|
||||
(
|
||||
WEB_TEMPS,
|
||||
@@ -584,6 +594,16 @@ impl GetDataLocations for PowerPlayV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Auto-tuner status (round 19 #10, T3): PowerPlay PerpetualTune; summary
|
||||
// already fetched.
|
||||
DataField::TunerStatus => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/PerpetualTune"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::LightFlashing => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
@@ -1139,7 +1159,22 @@ impl GetFans for PowerPlayV1 {
|
||||
impl GetPsuFans for PowerPlayV1 {}
|
||||
impl GetTuningCapabilities for PowerPlayV1 {}
|
||||
|
||||
impl GetFluidTemperature for PowerPlayV1 {}
|
||||
impl GetFluidTemperature for PowerPlayV1 {
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
// ePIC summary /Misc: Shutdown Temp (hot) + Critical Temp (dangerous); no
|
||||
// target threshold reported (round 19 #10, T3).
|
||||
let d = data.get(&DataField::TemperatureLimits);
|
||||
let f = |k: &str| {
|
||||
d.and_then(|v| v.pointer(k))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0)
|
||||
};
|
||||
(None, f("/Shutdown Temp"), f("/Critical Temp"))
|
||||
}
|
||||
}
|
||||
|
||||
impl GetWattage for PowerPlayV1 {
|
||||
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
|
||||
@@ -1383,6 +1418,28 @@ impl GetOperatingState for PowerPlayV1 {
|
||||
.and_then(Value::as_str)
|
||||
.and_then(OperatingState::from_label)
|
||||
}
|
||||
fn parse_tuner_status(&self, data: &HashMap<DataField, Value>) -> Option<String> {
|
||||
// ePIC PerpetualTune: Running gates it; the per-algorithm Optimized flag
|
||||
// distinguishes a settled tune from an in-progress one (round 19 #10, T3).
|
||||
let pt = data.get(&DataField::TunerStatus)?;
|
||||
if !pt.pointer("/Running").and_then(|v| v.as_bool()).unwrap_or(false) {
|
||||
return Some("Off".to_string());
|
||||
}
|
||||
let optimized = pt
|
||||
.pointer("/Algorithm")
|
||||
.and_then(|v| v.as_object())
|
||||
.and_then(|algos| {
|
||||
algos
|
||||
.values()
|
||||
.filter_map(|a| a.pointer("/Optimized").and_then(|v| v.as_bool()))
|
||||
.next()
|
||||
});
|
||||
Some(match optimized {
|
||||
Some(true) => "Optimized",
|
||||
_ => "Tuning",
|
||||
})
|
||||
.map(str::to_string)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetIsMining for PowerPlayV1 {
|
||||
@@ -2205,6 +2262,13 @@ mod tests {
|
||||
assert_eq!(miner_data.wattage, Some(Power::from_watts(2166.6174)));
|
||||
// Miner-level fan duty cycle from summary /Fans/Fans Speed (round 19 #10, T3).
|
||||
assert_eq!(miner_data.fan_speed_percent, Some(100.0));
|
||||
// Board temp thresholds from summary /Misc (round 19 #10, T3): Shutdown->hot,
|
||||
// Critical->dangerous, no target.
|
||||
assert_eq!(miner_data.temp_target, None);
|
||||
assert_eq!(miner_data.temp_hot, Some(85.0));
|
||||
assert_eq!(miner_data.temp_dangerous, Some(100.0));
|
||||
// Auto-tuner: PerpetualTune Running=true, Optimized=false -> Tuning (T3).
|
||||
assert_eq!(miner_data.tuner_status.as_deref(), Some("Tuning"));
|
||||
assert_eq!(miner_data.hashboards.len(), 3);
|
||||
assert_eq!(miner_data.hashboards[0].active, Some(false));
|
||||
assert_eq!(miner_data.hashboards[1].chips.len(), 110);
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"fe8effe2bfdda5d4c390656c016729f531a2b1c60033228557659c0befdde9f2","Cargo.lock":"a2b2cb45bb8b574e4f29ffdcdb5ebafd1dd87a0e6e11b47383973a99be367784","Cargo.toml":"503efa00123f8567f5fe40bf6a93e9e453d13094df0e0e1b7e98bdacdfbd2595","Cargo.toml.orig":"1c4ba0315fb491c086fc22a5c9bafaf7288c6b1fd48679c3d03dbd9df156a8b5","src/backends/mod.rs":"548d988b877410e330a55e275f64b2adad95ca5f1a0f085fe144957c96b8906f","src/backends/v1/mod.rs":"2c04560cd60492adf42bc33549247f70601056a0355aebbf8b5638be881b5627","src/backends/v1/rpc.rs":"25b0b9d56fbf113d5b8c3d3bc8eb7a0d67967b1f90f6d855da0b9f6ff24ae335","src/firmware.rs":"d95345295ae5043dfc357e69ae56c564b261fdb3b19b5c0ad1765267ff05ab3f","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/config.json":"6ca9e6217d853d4bf1e75d69159630e9c9184ede96751706b88dfb699b5d59ad","src/test/json/v1/devs.json":"8f746dc6a02953eee5ee96dcf53be8dc7880a8ffc2c6e303f0284bcf6a97f42d","src/test/json/v1/events.json":"913683ff97af3333018807e1cc6e43467ea8a55925e5964dc402616615e2a5e3","src/test/json/v1/fans.json":"f8a9a1234d651055c80f4ebb1380bbb4e6d19eb33012902c55fff1385e592447","src/test/json/v1/healthchipget_0.json":"10619460049333ca016b2beec59ecc514ed9077fb19bdf7d0ed697201f8cb96c","src/test/json/v1/healthchipget_1.json":"80927fb1480c95be7f3a4e155d63f68f97720530ff7cf5d5ade06f2a3e810bf0","src/test/json/v1/healthchipget_2.json":"1e93ee2ab472ee7af58add08b4251e3ce0ad4f986d4325abbf43fd4c9b3dd28f","src/test/json/v1/mod.rs":"5a050f07455e622e35ad79ab1c8a6daf2ea38c4198472e49c6bbfe80538a9e48","src/test/json/v1/pools.json":"0068745327e31853fec051172abb7337f18a4cf9972c51967113d63f4f31f504","src/test/json/v1/power.json":"80534bb4581de7c8b747bf33b5d629b909c6e16a531d18ecb4afd7ffad3f014f","src/test/json/v1/profiles.json":"1f00429036e270daa08f12cd2d7357135070c57acd7a899a3c0af6167fe82abb","src/test/json/v1/stats.json":"2b105f0eb927046c9d2389bde978a43e3d54d12a420dfbe400786bb2f0ae31ca","src/test/json/v1/summary.json":"aaea3378eb7040952037e2f1ef7bd5f20a1b242bf93d4ba0501c46104b0b31a0","src/test/json/v1/temps.json":"1ee781cd2be3ed6a6a07e23be930248735fb51348c160453ba10f6ef71fcb7f1","src/test/json/v1/version.json":"4beb6ca5c0ebf359cee0434fdcc4d0a1a0607436634e46be3fd951e2256595df","src/test/json/v1/voltageget_0.json":"c445fa8674c2542b2d296fbafdd3166c53008dfbd9da8095327217989d37f1da","src/test/json/v1/voltageget_1.json":"96b91c3447dd66e7f1f575ed3b99611062e8b1d516d31422b74e425c46b2f49c","src/test/json/v1/voltageget_2.json":"7d40544021b2e32401135ae333067b770d2d736ada9e60deaca8fd8f5a79a1e3","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"513792d93a2a21d5258d9e6ac0e6dc9e0a6365118934514b4e656792add78066"}
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"fe8effe2bfdda5d4c390656c016729f531a2b1c60033228557659c0befdde9f2","Cargo.lock":"a2b2cb45bb8b574e4f29ffdcdb5ebafd1dd87a0e6e11b47383973a99be367784","Cargo.toml":"503efa00123f8567f5fe40bf6a93e9e453d13094df0e0e1b7e98bdacdfbd2595","Cargo.toml.orig":"1c4ba0315fb491c086fc22a5c9bafaf7288c6b1fd48679c3d03dbd9df156a8b5","src/backends/mod.rs":"548d988b877410e330a55e275f64b2adad95ca5f1a0f085fe144957c96b8906f","src/backends/v1/mod.rs":"a66ca11f7ab20d83d17ef0b6106810524902e0650ac770144f3998e597dd0541","src/backends/v1/rpc.rs":"25b0b9d56fbf113d5b8c3d3bc8eb7a0d67967b1f90f6d855da0b9f6ff24ae335","src/firmware.rs":"d95345295ae5043dfc357e69ae56c564b261fdb3b19b5c0ad1765267ff05ab3f","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"24191681066d5cf6a3022ad59c1baa92b57e3ce7717bb78d6a682af9e19a38c4","src/test/json/v1/config.json":"6ca9e6217d853d4bf1e75d69159630e9c9184ede96751706b88dfb699b5d59ad","src/test/json/v1/devs.json":"8f746dc6a02953eee5ee96dcf53be8dc7880a8ffc2c6e303f0284bcf6a97f42d","src/test/json/v1/events.json":"913683ff97af3333018807e1cc6e43467ea8a55925e5964dc402616615e2a5e3","src/test/json/v1/fans.json":"f8a9a1234d651055c80f4ebb1380bbb4e6d19eb33012902c55fff1385e592447","src/test/json/v1/healthchipget_0.json":"10619460049333ca016b2beec59ecc514ed9077fb19bdf7d0ed697201f8cb96c","src/test/json/v1/healthchipget_1.json":"80927fb1480c95be7f3a4e155d63f68f97720530ff7cf5d5ade06f2a3e810bf0","src/test/json/v1/healthchipget_2.json":"1e93ee2ab472ee7af58add08b4251e3ce0ad4f986d4325abbf43fd4c9b3dd28f","src/test/json/v1/mod.rs":"e8d449dbe57fd97fa70908673438c069a050548e800b6e9762c5a622bd7acc6d","src/test/json/v1/pools.json":"0068745327e31853fec051172abb7337f18a4cf9972c51967113d63f4f31f504","src/test/json/v1/power.json":"80534bb4581de7c8b747bf33b5d629b909c6e16a531d18ecb4afd7ffad3f014f","src/test/json/v1/profiles.json":"1f00429036e270daa08f12cd2d7357135070c57acd7a899a3c0af6167fe82abb","src/test/json/v1/stats.json":"2b105f0eb927046c9d2389bde978a43e3d54d12a420dfbe400786bb2f0ae31ca","src/test/json/v1/summary.json":"aaea3378eb7040952037e2f1ef7bd5f20a1b242bf93d4ba0501c46104b0b31a0","src/test/json/v1/temps.json":"1ee781cd2be3ed6a6a07e23be930248735fb51348c160453ba10f6ef71fcb7f1","src/test/json/v1/version.json":"4beb6ca5c0ebf359cee0434fdcc4d0a1a0607436634e46be3fd951e2256595df","src/test/json/v1/voltageget_0.json":"c445fa8674c2542b2d296fbafdd3166c53008dfbd9da8095327217989d37f1da","src/test/json/v1/voltageget_1.json":"96b91c3447dd66e7f1f575ed3b99611062e8b1d516d31422b74e425c46b2f49c","src/test/json/v1/voltageget_2.json":"7d40544021b2e32401135ae333067b770d2d736ada9e60deaca8fd8f5a79a1e3","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"513792d93a2a21d5258d9e6ac0e6dc9e0a6365118934514b4e656792add78066"}
|
||||
@@ -278,6 +278,11 @@ impl GetDataLocations for LuxMinerV1 {
|
||||
parameters: None,
|
||||
};
|
||||
|
||||
const RPC_TEMPCTRL: MinerCommand = MinerCommand::RPC {
|
||||
command: "tempctrl",
|
||||
parameters: None,
|
||||
};
|
||||
|
||||
match data_field {
|
||||
DataField::Mac => vec![(
|
||||
RPC_CONFIG,
|
||||
@@ -305,6 +310,16 @@ impl GetDataLocations for LuxMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Board temp thresholds (round 19 #10, T3): LuxOS tempctrl reports
|
||||
// ChipTarget / ChipHot / ChipDangerous.
|
||||
DataField::TemperatureLimits => vec![(
|
||||
RPC_TEMPCTRL,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/TEMPCTRL/0"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::ApiVersion => vec![(
|
||||
RPC_VERSION,
|
||||
DataExtractor {
|
||||
@@ -690,6 +705,20 @@ impl GetFluidTemperature for LuxMinerV1 {
|
||||
(None, None) => None,
|
||||
}
|
||||
}
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
// LuxOS tempctrl chip thresholds ChipTarget / ChipHot / ChipDangerous
|
||||
// (round 19 #10, T3).
|
||||
let d = data.get(&DataField::TemperatureLimits);
|
||||
let f = |k: &str| {
|
||||
d.and_then(|v| v.get(k))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0)
|
||||
};
|
||||
(f("ChipTarget"), f("ChipHot"), f("ChipDangerous"))
|
||||
}
|
||||
}
|
||||
|
||||
impl GetFirmwareVersion for LuxMinerV1 {
|
||||
@@ -1465,7 +1494,8 @@ mod tests {
|
||||
use super::*;
|
||||
use crate::test::json::v1::{
|
||||
CONFIG, DEVS, EVENTS, FANS, HEALTHCHIPGET_0, HEALTHCHIPGET_1, HEALTHCHIPGET_2, POOLS,
|
||||
POWER, PROFILES, STATS, SUMMARY, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1, VOLTAGEGET_2,
|
||||
POWER, PROFILES, STATS, SUMMARY, TEMPCTRL, TEMPS, VERSION, VOLTAGEGET_0, VOLTAGEGET_1,
|
||||
VOLTAGEGET_2,
|
||||
};
|
||||
|
||||
#[test]
|
||||
@@ -1582,6 +1612,11 @@ mod tests {
|
||||
parameters: None,
|
||||
};
|
||||
|
||||
let tempctrl_cmd = MinerCommand::RPC {
|
||||
command: "tempctrl",
|
||||
parameters: None,
|
||||
};
|
||||
|
||||
results.insert(version_cmd, Value::from_str(VERSION)?);
|
||||
results.insert(stats_cmd, Value::from_str(STATS)?);
|
||||
results.insert(summary_cmd, Value::from_str(SUMMARY)?);
|
||||
@@ -1591,6 +1626,7 @@ mod tests {
|
||||
results.insert(power_cmd, Value::from_str(POWER)?);
|
||||
results.insert(profiles_cmd, Value::from_str(PROFILES)?);
|
||||
results.insert(temps_cmd, Value::from_str(TEMPS)?);
|
||||
results.insert(tempctrl_cmd, Value::from_str(TEMPCTRL)?);
|
||||
results.insert(devs_cmd, Value::from_str(DEVS)?);
|
||||
results.insert(
|
||||
MinerCommand::RPC {
|
||||
@@ -1704,6 +1740,11 @@ mod tests {
|
||||
// Miner-level fan duty cycle = max of per-fan Speed (all 20 here); round 19
|
||||
// #10, T3.
|
||||
assert_eq!(miner_data.fan_speed_percent, Some(20.0));
|
||||
// Board temp thresholds from tempctrl ChipTarget/ChipHot/ChipDangerous
|
||||
// (round 19 #10, T3).
|
||||
assert_eq!(miner_data.temp_target, Some(83.0));
|
||||
assert_eq!(miner_data.temp_hot, Some(93.0));
|
||||
assert_eq!(miner_data.temp_dangerous, Some(100.0));
|
||||
assert_eq!(miner_data.hashboards[0].chips.len(), 77);
|
||||
assert_eq!(miner_data.pools.len(), 2);
|
||||
assert_eq!(miner_data.pools[0].len(), 2);
|
||||
|
||||
@@ -10,6 +10,7 @@ pub(crate) const PROFILES: &str = include_str!("profiles.json");
|
||||
pub(crate) const STATS: &str = include_str!("stats.json");
|
||||
pub(crate) const SUMMARY: &str = include_str!("summary.json");
|
||||
pub(crate) const TEMPS: &str = include_str!("temps.json");
|
||||
pub(crate) const TEMPCTRL: &str = include_str!("tempctrl.json");
|
||||
pub(crate) const VERSION: &str = include_str!("version.json");
|
||||
pub(crate) const EVENTS: &str = include_str!("events.json");
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{
|
||||
"STATUS": [
|
||||
{
|
||||
"Code": 200,
|
||||
"Description": "LUXminer 2026.9.21.003141-c8f244146",
|
||||
"Msg": "Temperature control",
|
||||
"STATUS": "S",
|
||||
"When": 1790206067
|
||||
}
|
||||
],
|
||||
"TEMPCTRL": [
|
||||
{
|
||||
"ChipDangerous": 100.0,
|
||||
"ChipHot": 93.0,
|
||||
"ChipTarget": 83.0,
|
||||
"Dangerous": 70.0,
|
||||
"Hot": 65.0,
|
||||
"Mode": "Automatic",
|
||||
"Target": 45.0,
|
||||
"WaterInletDangerous": 50.0,
|
||||
"WaterInletHot": 49.0,
|
||||
"WaterInletStartup": 15.0
|
||||
}
|
||||
],
|
||||
"id": 1
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"de321c89f62a60690ba07d6bb145ac688c6141c458638e68b3ed36b50b8de1f1","Cargo.lock":"5942ec7c9cf5c201bd32442d65020dc3ae72e33cb5aaf374b2a26501571a1487","Cargo.toml":"cb9ee00cbb415fa66a71a7d4822839bb3552336ec9ab975ae7b1137c711449cb","Cargo.toml.orig":"08409c395e4d502015da62e97efdc9c5bc6e3076031144f3f5aa35c900c7c735","src/backends/mod.rs":"26591e67688f8d015242295dde5050c4b34986e9980018a855346291a0472206","src/backends/v1_2_0/mod.rs":"fc68a12769890e18231255c6a53cb2c68e4706a887d91f49113c6192684340d2","src/backends/v1_2_0/web.rs":"ac89f16bf623f7d85590d34b45c99b0e522d9d434b4c22af7fa8a8a653e09d2e","src/backends/v1_3_0/mod.rs":"0bba1bf94e7a86d763dbedda3bb5d68cf760e17f744204b0bbc0de4e3754f795","src/backends/v1_3_0/web.rs":"1ec4cbe6bdc26f165d9e54e9bf2aac4c3706357ce4677dc21113710d4a26c3c1","src/firmware.rs":"168eeffaef90cb1525bb2e126e73905b5205d49215437263813e30323f6b7a05","src/lib.rs":"16ea1c0007fa6d6c86c1f83d3ac9cdf065cd9936cd52f35ef89c227397bbc54a","src/timezone.rs":"309bf23de1bdc9126bde5db8dabff0d2c0fea797dbf2630a772a18539838a05e"},"package":"1cb662e56f104c0fe45c8ccdac13f60cbcaad45ac228f939c6ac46ff40335052"}
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"de321c89f62a60690ba07d6bb145ac688c6141c458638e68b3ed36b50b8de1f1","Cargo.lock":"5942ec7c9cf5c201bd32442d65020dc3ae72e33cb5aaf374b2a26501571a1487","Cargo.toml":"cb9ee00cbb415fa66a71a7d4822839bb3552336ec9ab975ae7b1137c711449cb","Cargo.toml.orig":"08409c395e4d502015da62e97efdc9c5bc6e3076031144f3f5aa35c900c7c735","src/backends/mod.rs":"26591e67688f8d015242295dde5050c4b34986e9980018a855346291a0472206","src/backends/v1_2_0/mod.rs":"a1b0eb9e2e57cad0190eb8f31dafff0999e31c3602db2b8d84e9dd45c955b623","src/backends/v1_2_0/web.rs":"ac89f16bf623f7d85590d34b45c99b0e522d9d434b4c22af7fa8a8a653e09d2e","src/backends/v1_3_0/mod.rs":"9aa230fe942ca775f812300f0041f5565861ef32ad73207e48d02b41e423ee25","src/backends/v1_3_0/web.rs":"1ec4cbe6bdc26f165d9e54e9bf2aac4c3706357ce4677dc21113710d4a26c3c1","src/firmware.rs":"168eeffaef90cb1525bb2e126e73905b5205d49215437263813e30323f6b7a05","src/lib.rs":"16ea1c0007fa6d6c86c1f83d3ac9cdf065cd9936cd52f35ef89c227397bbc54a","src/timezone.rs":"309bf23de1bdc9126bde5db8dabff0d2c0fea797dbf2630a772a18539838a05e"},"package":"1cb662e56f104c0fe45c8ccdac13f60cbcaad45ac228f939c6ac46ff40335052"}
|
||||
@@ -20,7 +20,7 @@ use asic_rs_core::{
|
||||
device::DeviceInfo,
|
||||
fan::FanData,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
message::{MessageSeverity, MinerMessage},
|
||||
message::{MessageSeverity, MinerComponent, MinerMessage},
|
||||
miner::TuningTarget,
|
||||
operating_state::OperatingState,
|
||||
pool::{PoolData, PoolGroupData, PoolURL},
|
||||
@@ -296,6 +296,16 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: Some("unit"),
|
||||
},
|
||||
),
|
||||
// Per-board hashboard model ("board_model") from factory-info, which
|
||||
// the live /chains + /summary do not carry. Already fetched for serial.
|
||||
(
|
||||
WEB_FACTORY_INFO,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/chains"),
|
||||
tag: Some("factory"),
|
||||
},
|
||||
),
|
||||
],
|
||||
DataField::Chips => vec![(
|
||||
WEB_CHAINS,
|
||||
@@ -353,14 +363,26 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Messages => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/miner_status"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Messages => vec![
|
||||
(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/miner_status"),
|
||||
tag: Some("miner_status"),
|
||||
},
|
||||
),
|
||||
// Per-hashboard diagnostics (chip status buckets + per-chain state)
|
||||
// for per-board fault messages in parse_messages.
|
||||
(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/chains"),
|
||||
tag: Some("chains"),
|
||||
},
|
||||
),
|
||||
],
|
||||
DataField::TuningTarget => vec![(
|
||||
WEB_SETTINGS,
|
||||
DataExtractor {
|
||||
@@ -369,6 +391,25 @@ impl GetDataLocations for VnishV120 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Miner-level fan duty cycle (round 19 #10, T3); summary already fetched.
|
||||
DataField::FanSpeedPercent => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/cooling/fan_duty"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Board temp thresholds (round 19 #10, T3): settings restart_temp
|
||||
// (dangerous) + auto cooling target. Settings already fetched.
|
||||
DataField::TemperatureLimits => vec![(
|
||||
WEB_SETTINGS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -462,6 +503,11 @@ impl GetHashboards for VnishV120 {
|
||||
.unwrap_or(HashRateUnit::GigaHash);
|
||||
let algo = self.device_info.algo;
|
||||
let chip_chains = data.get(&DataField::Chips).and_then(|v| v.as_array());
|
||||
// Factory-info chains carry the hashboard model (board_model), keyed by the
|
||||
// same 1-based chain id. Not present on the live /chains or /summary.
|
||||
let factory_chains = hashboards_data
|
||||
.and_then(|v| v.pointer("/factory"))
|
||||
.and_then(|v| v.as_array());
|
||||
|
||||
let mut hashboards: Vec<BoardData> =
|
||||
(0..self.device_info.hardware.board_count().unwrap_or(0) as usize)
|
||||
@@ -611,6 +657,16 @@ impl GetHashboards for VnishV120 {
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s == "mining")
|
||||
.or_else(|| board.hashrate.as_ref().map(|h| h.value > 0.0));
|
||||
// Hashboard model from factory-info (board_model), matched by chain id.
|
||||
board.hashboard_model = factory_chains.and_then(|chains| {
|
||||
chains
|
||||
.iter()
|
||||
.find(|c| c.pointer("/id").and_then(|v| v.as_u64()) == Some(id))
|
||||
.and_then(|c| c.pointer("/board_model"))
|
||||
.and_then(|v| v.as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(String::from)
|
||||
});
|
||||
}
|
||||
|
||||
hashboards
|
||||
@@ -678,6 +734,12 @@ impl GetFans for VnishV120 {
|
||||
|
||||
fans
|
||||
}
|
||||
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
// VNish summary /miner/cooling/fan_duty is a miner-level duty % (round 19 #10).
|
||||
data.get(&DataField::FanSpeedPercent)
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v >= 0.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetPsuFans for VnishV120 {}
|
||||
@@ -766,6 +828,26 @@ impl GetFluidTemperature for VnishV120 {
|
||||
.max()
|
||||
.map(|t| Temperature::from_celsius(t as f64))
|
||||
}
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
// VNish settings: restart_temp is the dangerous threshold; the auto cooling
|
||||
// mode "param" is the target temperature. No hot threshold (round 19 #10, T3).
|
||||
let m = data.get(&DataField::TemperatureLimits);
|
||||
let dangerous = m
|
||||
.and_then(|v| v.pointer("/misc/restart_temp"))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0);
|
||||
let target = m
|
||||
.filter(|v| {
|
||||
v.pointer("/cooling/settings/mode/name").and_then(|n| n.as_str()) == Some("auto")
|
||||
})
|
||||
.and_then(|v| v.pointer("/cooling/settings/mode/param"))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0);
|
||||
(target, None, dangerous)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetWattage for VnishV120 {
|
||||
@@ -805,9 +887,12 @@ impl GetMessages for VnishV120 {
|
||||
/// reported here rather than computed from invented thresholds.
|
||||
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
|
||||
let mut messages = Vec::new();
|
||||
let msg = data.get(&DataField::Messages);
|
||||
|
||||
if let Some(status) = data.get(&DataField::Messages)
|
||||
&& let Some(state) = status.pointer("/miner_state").and_then(|v| v.as_str())
|
||||
// Miner-level state verdict (now under the "miner_status" tag).
|
||||
if let Some(state) = msg
|
||||
.and_then(|v| v.pointer("/miner_status/miner_state"))
|
||||
.and_then(|v| v.as_str())
|
||||
{
|
||||
let normal = matches!(
|
||||
state.to_lowercase().as_str(),
|
||||
@@ -827,6 +912,77 @@ impl GetMessages for VnishV120 {
|
||||
}
|
||||
}
|
||||
|
||||
// Per-hashboard faults from the summary chains (round 20 #1). VNish reports
|
||||
// per-chip status buckets (`red` = failed, `orange` = degraded, `grey` =
|
||||
// healthy) and a per-chain state; attribute each fault to its own board so
|
||||
// the Health column reds the right hashboard icon and that icon's tooltip
|
||||
// carries the specific fault, instead of everything landing on the miner-
|
||||
// level (brain) message. Chain ids are 1-based; board positions are 0-based.
|
||||
if let Some(chains) = msg
|
||||
.and_then(|v| v.pointer("/chains"))
|
||||
.and_then(|v| v.as_array())
|
||||
{
|
||||
for chain in chains {
|
||||
let Some(id) = chain.pointer("/id").and_then(|v| v.as_u64()) else {
|
||||
continue;
|
||||
};
|
||||
let idx = id.saturating_sub(1) as u16;
|
||||
let red = chain
|
||||
.pointer("/chip_statuses/red")
|
||||
.and_then(|v| v.as_u64())
|
||||
.unwrap_or(0);
|
||||
let orange = chain
|
||||
.pointer("/chip_statuses/orange")
|
||||
.and_then(|v| v.as_u64())
|
||||
.unwrap_or(0);
|
||||
let state = chain
|
||||
.pointer("/status/state")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
let state_ok = matches!(
|
||||
state.to_lowercase().as_str(),
|
||||
"" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
|
||||
);
|
||||
|
||||
// Severity reflects whether the board is still doing its job. A board
|
||||
// NOT in a normal mining state is down -> Error (red). A board that is
|
||||
// still mining but has some failed/degraded chips is sub-optimal, not
|
||||
// broken -> Warning (yellow): dead chips while the board keeps hashing
|
||||
// near its target are wear, not a fault (a ~83%-hashrate board must not
|
||||
// read as broken).
|
||||
if !state_ok {
|
||||
let detail = if red > 0 {
|
||||
format!("Hashboard {id}: {state} ({red} failed chip(s))")
|
||||
} else {
|
||||
format!("Hashboard {id}: {state}")
|
||||
};
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
detail,
|
||||
MessageSeverity::Error,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
} else if red > 0 {
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
MessageSeverity::Warning,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
} else if orange > 0 {
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
format!("Hashboard {id}: {orange} degraded chip(s)"),
|
||||
MessageSeverity::Warning,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
messages
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ use asic_rs_core::{
|
||||
device::DeviceInfo,
|
||||
fan::FanData,
|
||||
hashrate::{HashRate, HashRateUnit},
|
||||
message::{MessageSeverity, MinerMessage},
|
||||
message::{MessageSeverity, MinerComponent, MinerMessage},
|
||||
miner::TuningTarget,
|
||||
operating_state::OperatingState,
|
||||
pool::{PoolData, PoolGroupData, PoolURL},
|
||||
@@ -294,6 +294,17 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: Some("unit"),
|
||||
},
|
||||
),
|
||||
// Per-board hashboard model ("board_model", e.g. "A3HB70601") from
|
||||
// the factory-info endpoint, which the live /chains + /summary do not
|
||||
// carry. Already fetched for the PSU serial.
|
||||
(
|
||||
WEB_FACTORY_INFO,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/chains"),
|
||||
tag: Some("factory"),
|
||||
},
|
||||
),
|
||||
],
|
||||
DataField::Chips => vec![(
|
||||
WEB_CHAINS,
|
||||
@@ -351,14 +362,26 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Messages => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/miner_status"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Messages => vec![
|
||||
(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/miner_status"),
|
||||
tag: Some("miner_status"),
|
||||
},
|
||||
),
|
||||
// Per-hashboard diagnostics (chip status buckets + per-chain state)
|
||||
// for per-board fault messages in parse_messages.
|
||||
(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/chains"),
|
||||
tag: Some("chains"),
|
||||
},
|
||||
),
|
||||
],
|
||||
DataField::TuningPercent => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
@@ -375,6 +398,26 @@ impl GetDataLocations for VnishV130 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Miner-level fan duty cycle (round 19 #10, T3); summary already fetched.
|
||||
DataField::FanSpeedPercent => vec![(
|
||||
WEB_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner/cooling/fan_duty"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
// Board temp thresholds (round 19 #10, T3): settings /miner/misc/restart_temp
|
||||
// (dangerous) + auto cooling target (/miner/cooling/settings/mode/param).
|
||||
// Settings already fetched for the tuning preset.
|
||||
DataField::TemperatureLimits => vec![(
|
||||
WEB_SETTINGS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/miner"),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
@@ -467,6 +510,11 @@ impl GetHashboards for VnishV130 {
|
||||
.unwrap_or(HashRateUnit::GigaHash);
|
||||
let algo = self.device_info.algo;
|
||||
let chip_chains = data.get(&DataField::Chips).and_then(|v| v.as_array());
|
||||
// Factory-info chains carry the hashboard model (board_model), keyed by the
|
||||
// same 1-based chain id. Not present on the live /chains or /summary.
|
||||
let factory_chains = hashboards_data
|
||||
.and_then(|v| v.pointer("/factory"))
|
||||
.and_then(|v| v.as_array());
|
||||
|
||||
let mut hashboards: Vec<BoardData> =
|
||||
(0..self.device_info.hardware.board_count().unwrap_or(0) as usize)
|
||||
@@ -616,6 +664,16 @@ impl GetHashboards for VnishV130 {
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s == "mining")
|
||||
.or_else(|| board.hashrate.as_ref().map(|h| h.value > 0.0));
|
||||
// Hashboard model from factory-info (board_model), matched by chain id.
|
||||
board.hashboard_model = factory_chains.and_then(|chains| {
|
||||
chains
|
||||
.iter()
|
||||
.find(|c| c.pointer("/id").and_then(|v| v.as_u64()) == Some(id))
|
||||
.and_then(|c| c.pointer("/board_model"))
|
||||
.and_then(|v| v.as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(String::from)
|
||||
});
|
||||
}
|
||||
|
||||
hashboards
|
||||
@@ -683,6 +741,12 @@ impl GetFans for VnishV130 {
|
||||
|
||||
fans
|
||||
}
|
||||
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
|
||||
// VNish summary /miner/cooling/fan_duty is a miner-level duty % (round 19 #10).
|
||||
data.get(&DataField::FanSpeedPercent)
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v >= 0.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetPsuFans for VnishV130 {}
|
||||
@@ -716,6 +780,26 @@ impl GetFluidTemperature for VnishV130 {
|
||||
.max()
|
||||
.map(|t| Temperature::from_celsius(t as f64))
|
||||
}
|
||||
fn parse_temperature_limits(
|
||||
&self,
|
||||
data: &HashMap<DataField, Value>,
|
||||
) -> (Option<f64>, Option<f64>, Option<f64>) {
|
||||
// VNish settings: restart_temp is the dangerous threshold; the auto cooling
|
||||
// mode "param" is the target temperature. No hot threshold (round 19 #10, T3).
|
||||
let m = data.get(&DataField::TemperatureLimits);
|
||||
let dangerous = m
|
||||
.and_then(|v| v.pointer("/misc/restart_temp"))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0);
|
||||
let target = m
|
||||
.filter(|v| {
|
||||
v.pointer("/cooling/settings/mode/name").and_then(|n| n.as_str()) == Some("auto")
|
||||
})
|
||||
.and_then(|v| v.pointer("/cooling/settings/mode/param"))
|
||||
.and_then(|v| v.as_f64())
|
||||
.filter(|v| v.is_finite() && *v > 0.0);
|
||||
(target, None, dangerous)
|
||||
}
|
||||
}
|
||||
|
||||
impl GetWattage for VnishV130 {
|
||||
@@ -759,9 +843,12 @@ impl GetMessages for VnishV130 {
|
||||
/// reported here rather than computed from invented thresholds.
|
||||
fn parse_messages(&self, data: &HashMap<DataField, Value>) -> Vec<MinerMessage> {
|
||||
let mut messages = Vec::new();
|
||||
let msg = data.get(&DataField::Messages);
|
||||
|
||||
if let Some(status) = data.get(&DataField::Messages)
|
||||
&& let Some(state) = status.pointer("/miner_state").and_then(|v| v.as_str())
|
||||
// Miner-level state verdict (now under the "miner_status" tag).
|
||||
if let Some(state) = msg
|
||||
.and_then(|v| v.pointer("/miner_status/miner_state"))
|
||||
.and_then(|v| v.as_str())
|
||||
{
|
||||
let normal = matches!(
|
||||
state.to_lowercase().as_str(),
|
||||
@@ -781,6 +868,77 @@ impl GetMessages for VnishV130 {
|
||||
}
|
||||
}
|
||||
|
||||
// Per-hashboard faults from the summary chains (round 20 #1). VNish reports
|
||||
// per-chip status buckets (`red` = failed, `orange` = degraded, `grey` =
|
||||
// healthy) and a per-chain state; attribute each fault to its own board so
|
||||
// the Health column reds the right hashboard icon and that icon's tooltip
|
||||
// carries the specific fault, instead of everything landing on the miner-
|
||||
// level (brain) message. Chain ids are 1-based; board positions are 0-based.
|
||||
if let Some(chains) = msg
|
||||
.and_then(|v| v.pointer("/chains"))
|
||||
.and_then(|v| v.as_array())
|
||||
{
|
||||
for chain in chains {
|
||||
let Some(id) = chain.pointer("/id").and_then(|v| v.as_u64()) else {
|
||||
continue;
|
||||
};
|
||||
let idx = id.saturating_sub(1) as u16;
|
||||
let red = chain
|
||||
.pointer("/chip_statuses/red")
|
||||
.and_then(|v| v.as_u64())
|
||||
.unwrap_or(0);
|
||||
let orange = chain
|
||||
.pointer("/chip_statuses/orange")
|
||||
.and_then(|v| v.as_u64())
|
||||
.unwrap_or(0);
|
||||
let state = chain
|
||||
.pointer("/status/state")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
let state_ok = matches!(
|
||||
state.to_lowercase().as_str(),
|
||||
"" | "mining" | "auto-tuning" | "auto_tuning" | "tuning"
|
||||
);
|
||||
|
||||
// Severity reflects whether the board is still doing its job. A board
|
||||
// NOT in a normal mining state is down -> Error (red). A board that is
|
||||
// still mining but has some failed/degraded chips is sub-optimal, not
|
||||
// broken -> Warning (yellow): dead chips while the board keeps hashing
|
||||
// near its target are wear, not a fault (a ~83%-hashrate board must not
|
||||
// read as broken).
|
||||
if !state_ok {
|
||||
let detail = if red > 0 {
|
||||
format!("Hashboard {id}: {state} ({red} failed chip(s))")
|
||||
} else {
|
||||
format!("Hashboard {id}: {state}")
|
||||
};
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
detail,
|
||||
MessageSeverity::Error,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
} else if red > 0 {
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
format!("Hashboard {id}: {red} failed chip(s)"),
|
||||
MessageSeverity::Warning,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
} else if orange > 0 {
|
||||
messages.push(MinerMessage::with_component(
|
||||
0,
|
||||
0,
|
||||
format!("Hashboard {id}: {orange} degraded chip(s)"),
|
||||
MessageSeverity::Warning,
|
||||
Some(MinerComponent::hashboard(idx)),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
messages
|
||||
}
|
||||
}
|
||||
@@ -1354,6 +1512,28 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
/// Fan duty cycle (summary /miner/cooling/fan_duty) and board temp thresholds
|
||||
/// (settings restart_temp -> dangerous, auto cooling param -> target); round 19
|
||||
/// #10, T3. Values match the live 10.4.1.50 fleet unit.
|
||||
#[test]
|
||||
fn fan_duty_and_temp_thresholds() {
|
||||
let miner = VnishV130::new(IpAddr::from([127, 0, 0, 1]), AntMinerModel::S19jPro);
|
||||
let mut data: HashMap<DataField, Value> = HashMap::new();
|
||||
data.insert(DataField::FanSpeedPercent, json!(81));
|
||||
data.insert(
|
||||
DataField::TemperatureLimits,
|
||||
json!({
|
||||
"misc": { "restart_temp": 90 },
|
||||
"cooling": { "settings": { "mode": { "name": "auto", "param": 65 } } }
|
||||
}),
|
||||
);
|
||||
assert_eq!(miner.parse_fan_speed_percent(&data), Some(81.0));
|
||||
assert_eq!(
|
||||
miner.parse_temperature_limits(&data),
|
||||
(Some(65.0), None, Some(90.0))
|
||||
);
|
||||
}
|
||||
|
||||
/// An L9 is a Scrypt miner and VNish says so in `/info`, both in
|
||||
/// `algorithm` and by reporting `hr_measure: MH/s`. Before this was wired
|
||||
/// up it came back as a SHA-256 miner and every figure was read as GH/s,
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"30f09ad063df45fdf223aff235fe2da15cb1a7e79e86d7012074153b91662fc4","Cargo.lock":"9d0886791db53421d3218ab72d964145b86cfbe9738eaf09aac5d3c89a1c0190","Cargo.toml":"8c2e9938436850f2e250e8268ed7b385fce903e2077923b207a0560ca3e3242c","Cargo.toml.orig":"891fcfa45e79d6bc4d838c4f3075618f791bd013c99231da48e752b987f409d5","src/backends/mod.rs":"0f5a0ae31d5443d0d0f41a2540def806196238c92d22761b3ad9843cb2e77f45","src/backends/v1/mod.rs":"2622d7b51dab7f749d20fc04dda371320271b8078fed0c352515becc7daebc47","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"9bab68108a178f6a1e2c32481c94e0dcd38c3123e633bf89773b62a9c529290b","src/backends/v2/rpc.rs":"52f8d504c236009b020bf33b5550236e36d07b2c73a15bdcfcafa5188e4e1cb6","src/backends/v3/mod.rs":"2cf0311d1dba5d175ad7501917e7b9b3abdc3f1f5ef8993d9d3f453cecd3c09f","src/backends/v3/rpc.rs":"7a5f80aec4af1bcaa0d36e67345aa9acbbd8ead73c0be474f06305358b38e81b","src/error_codes.rs":"b2af610880fb400a9e6297662371a6b3b55077b72cf11115b77fd4d2df44e6a1","src/firmware.rs":"6d002e481ce0a897c0485b9393b0382fcb25811164e893eb8eb67b2ff392ca0d","src/lib.rs":"710b46c9d934f26f900e1366ca1df5f872896e7d8da03569c0f159859e899cc9","src/test/json/mod.rs":"99760925ccfefc40d2455d3567fb1ecfc99e9e55e70478190ef372a954825909","src/test/json/v1/devs.json":"b4fd010f0bae3584efde93387cf2dab5933b499cc30a2dd7635fdc994b56c3b8","src/test/json/v1/get_psu.json":"8c11b6495e0bd5da496dd5c10ca53ec53b2d8fe9a3737f470ec9ce2c1aaf9d99","src/test/json/v1/get_version.json":"c43e947e654792ab191210d50c6f793ee0dd7af41e8cb59f0722b70f32a203bc","src/test/json/v1/mod.rs":"a12ec375a02238d5e26b64e2f7aeb0fc336747d86ae012dc154265ee5afaabbf","src/test/json/v1/pools.json":"b570808a3428a0773d7d2ee322150d8fd0794a33804af970300a7fef128a8a01","src/test/json/v1/status.json":"00ec38dd9f980b7ac0ffd6f815374afdbbed98d601bd8ef18bcf0f76ae0aa853","src/test/json/v1/summary.json":"d6e3e75654eb4019e1f479b3d9cf3097130f1afb85dd3338682c094fd4ab498a","src/test/json/v1/summary_with_errors.json":"1ba682f6ad5c43e41ae22a4069d0f52f04da3f07a18031bf4c07e07b3c59cc97","src/test/json/v2/devs.json":"2d203e41ef6ef337c0c81456b73d08730882c3167403c557c3c9776022a972d1","src/test/json/v2/get_error_code.json":"e90b702fd97bceb4f62dcb8228f75ff5ce930290355dca94eefd7192f7f57009","src/test/json/v2/get_error_code_with_errors.json":"6cb6038366eb3835684421c41be0b2b30ae8ce79a7ed51a85f4f52f70da9df16","src/test/json/v2/get_miner_info.json":"55d2af984833a692f502188ae4df4e41bdc10386b47f921c896a452ef1de9062","src/test/json/v2/get_psu.json":"b43086b65897061521d1f6611e200ef372a1724f9ea1876e347c03d5fb19b8f2","src/test/json/v2/get_version.json":"b17e3a81603b43186b2e15745e6822b6c82b3c6f5928b22f84e683d7728dbfcd","src/test/json/v2/mod.rs":"c847205d076323bbd9698e393d241b08f3cf75d32aae86f7058cf8748266b935","src/test/json/v2/pools.json":"926d34e8dae774473ebfec83d4a38e77ca73231708f07683763e212be7af0580","src/test/json/v2/status.json":"fc268cd23864ef99e84813dbf8eb916b2e6f339351a0ee5dab217cbe02569fc3","src/test/json/v2/summary.json":"4e4c01b986e2960893f58d0f1ea4dce23b8ef88db4985348f7f0183eb4818478","src/test/json/v3/get_device_info.json":"83ac22ea9a11adbceb4c963db80aa62d9a2aa50d019a372394dece817d924cda","src/test/json/v3/get_device_info_with_errors.json":"24cee4b7840e87e12147cbfddf6c361f3b378a15bb85330b339d3be9e17cdbd5","src/test/json/v3/get_miner_status_edevs.json":"2d831c06113f555e0988df994c2e602a053a4aea603dded0db8f0f80e191ca5a","src/test/json/v3/get_miner_status_pools.json":"cd65c2efd3a5ce80b57aae46c420298a34ca06df7ac7f8c36fd556217703d242","src/test/json/v3/get_miner_status_summary.json":"799a94ba13ef54aed0f81a3d041d6c1fa263d4183754b384c69ca12d85a8d3ba","src/test/json/v3/mod.rs":"7ea3a8ff1b81c7a5b0f44f7c12dda880a9aeac5b0e6b56ac4fff4f4a7cbfe451","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"c85da6325b62f061327dc5f7605dd3721c823a9e8a2cfd6a356363dfbc84d66e"}
|
||||
{"$comment":"This file only protects against accidental modifications. It is not a security mechanism and does not protect against malicious changes.","files":{".cargo_vcs_info.json":"30f09ad063df45fdf223aff235fe2da15cb1a7e79e86d7012074153b91662fc4","Cargo.lock":"9d0886791db53421d3218ab72d964145b86cfbe9738eaf09aac5d3c89a1c0190","Cargo.toml":"8c2e9938436850f2e250e8268ed7b385fce903e2077923b207a0560ca3e3242c","Cargo.toml.orig":"891fcfa45e79d6bc4d838c4f3075618f791bd013c99231da48e752b987f409d5","src/backends/mod.rs":"0f5a0ae31d5443d0d0f41a2540def806196238c92d22761b3ad9843cb2e77f45","src/backends/v1/mod.rs":"177f88d99ae39eded5f2843df42017855252a10fa2d85b22c1dd2cce73be1290","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"ba400e105436c3c0acff002a1a5d1a1f357828d91c81b533120b4452e57a9ed0","src/backends/v2/rpc.rs":"52f8d504c236009b020bf33b5550236e36d07b2c73a15bdcfcafa5188e4e1cb6","src/backends/v3/mod.rs":"fe308cc4944a5abbb578a3c87c1538ba189d25fdaae4c06faeb151a3cb5aedc7","src/backends/v3/rpc.rs":"7a5f80aec4af1bcaa0d36e67345aa9acbbd8ead73c0be474f06305358b38e81b","src/error_codes.rs":"b2af610880fb400a9e6297662371a6b3b55077b72cf11115b77fd4d2df44e6a1","src/firmware.rs":"6d002e481ce0a897c0485b9393b0382fcb25811164e893eb8eb67b2ff392ca0d","src/lib.rs":"710b46c9d934f26f900e1366ca1df5f872896e7d8da03569c0f159859e899cc9","src/test/json/mod.rs":"99760925ccfefc40d2455d3567fb1ecfc99e9e55e70478190ef372a954825909","src/test/json/v1/devs.json":"b4fd010f0bae3584efde93387cf2dab5933b499cc30a2dd7635fdc994b56c3b8","src/test/json/v1/get_psu.json":"8c11b6495e0bd5da496dd5c10ca53ec53b2d8fe9a3737f470ec9ce2c1aaf9d99","src/test/json/v1/get_version.json":"c43e947e654792ab191210d50c6f793ee0dd7af41e8cb59f0722b70f32a203bc","src/test/json/v1/mod.rs":"a12ec375a02238d5e26b64e2f7aeb0fc336747d86ae012dc154265ee5afaabbf","src/test/json/v1/pools.json":"b570808a3428a0773d7d2ee322150d8fd0794a33804af970300a7fef128a8a01","src/test/json/v1/status.json":"00ec38dd9f980b7ac0ffd6f815374afdbbed98d601bd8ef18bcf0f76ae0aa853","src/test/json/v1/summary.json":"d6e3e75654eb4019e1f479b3d9cf3097130f1afb85dd3338682c094fd4ab498a","src/test/json/v1/summary_with_errors.json":"1ba682f6ad5c43e41ae22a4069d0f52f04da3f07a18031bf4c07e07b3c59cc97","src/test/json/v2/devs.json":"2d203e41ef6ef337c0c81456b73d08730882c3167403c557c3c9776022a972d1","src/test/json/v2/get_error_code.json":"e90b702fd97bceb4f62dcb8228f75ff5ce930290355dca94eefd7192f7f57009","src/test/json/v2/get_error_code_with_errors.json":"6cb6038366eb3835684421c41be0b2b30ae8ce79a7ed51a85f4f52f70da9df16","src/test/json/v2/get_miner_info.json":"55d2af984833a692f502188ae4df4e41bdc10386b47f921c896a452ef1de9062","src/test/json/v2/get_psu.json":"b43086b65897061521d1f6611e200ef372a1724f9ea1876e347c03d5fb19b8f2","src/test/json/v2/get_version.json":"b17e3a81603b43186b2e15745e6822b6c82b3c6f5928b22f84e683d7728dbfcd","src/test/json/v2/mod.rs":"c847205d076323bbd9698e393d241b08f3cf75d32aae86f7058cf8748266b935","src/test/json/v2/pools.json":"926d34e8dae774473ebfec83d4a38e77ca73231708f07683763e212be7af0580","src/test/json/v2/status.json":"fc268cd23864ef99e84813dbf8eb916b2e6f339351a0ee5dab217cbe02569fc3","src/test/json/v2/summary.json":"4e4c01b986e2960893f58d0f1ea4dce23b8ef88db4985348f7f0183eb4818478","src/test/json/v3/get_device_info.json":"83ac22ea9a11adbceb4c963db80aa62d9a2aa50d019a372394dece817d924cda","src/test/json/v3/get_device_info_with_errors.json":"24cee4b7840e87e12147cbfddf6c361f3b378a15bb85330b339d3be9e17cdbd5","src/test/json/v3/get_miner_status_edevs.json":"2d831c06113f555e0988df994c2e602a053a4aea603dded0db8f0f80e191ca5a","src/test/json/v3/get_miner_status_pools.json":"cd65c2efd3a5ce80b57aae46c420298a34ca06df7ac7f8c36fd556217703d242","src/test/json/v3/get_miner_status_summary.json":"799a94ba13ef54aed0f81a3d041d6c1fa263d4183754b384c69ca12d85a8d3ba","src/test/json/v3/mod.rs":"7ea3a8ff1b81c7a5b0f44f7c12dda880a9aeac5b0e6b56ac4fff4f4a7cbfe451","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"c85da6325b62f061327dc5f7605dd3721c823a9e8a2cfd6a356363dfbc84d66e"}
|
||||
@@ -205,14 +205,26 @@ impl GetDataLocations for WhatsMinerV1 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Hashboards => vec![(
|
||||
RPC_DEVS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some(""),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Hashboards => vec![
|
||||
(
|
||||
RPC_DEVS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some(""),
|
||||
tag: None,
|
||||
},
|
||||
),
|
||||
// Merge in summary so "Chip Data" (miner-wide chip marking) is
|
||||
// available per board (round 19 #10); RPC_SUMMARY already fetched.
|
||||
(
|
||||
RPC_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/SUMMARY/0"),
|
||||
tag: None,
|
||||
},
|
||||
),
|
||||
],
|
||||
DataField::Pools => vec![(
|
||||
RPC_POOLS,
|
||||
DataExtractor {
|
||||
@@ -436,6 +448,20 @@ impl GetHashboards for WhatsMinerV1 {
|
||||
);
|
||||
}
|
||||
|
||||
// Chip marking from the merged summary "Chip Data" (miner-wide, first
|
||||
// token), applied to every board (round 19 #10).
|
||||
let chip_type = hashboard_data
|
||||
.pointer("/Chip Data")
|
||||
.and_then(|v| v.as_str())
|
||||
.and_then(|s| s.split_whitespace().next())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string);
|
||||
if chip_type.is_some() {
|
||||
for board in hashboards.iter_mut() {
|
||||
board.chip_type = chip_type.clone();
|
||||
}
|
||||
}
|
||||
|
||||
hashboards
|
||||
}
|
||||
}
|
||||
@@ -531,14 +557,15 @@ impl GetWattage for WhatsMinerV1 {
|
||||
}
|
||||
|
||||
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
|
||||
// get_psu /Msg -> {model, hw_version, sw_version, ...} (values are strings).
|
||||
// No DC output voltage or rated envelope is exposed, so only identity is set.
|
||||
// get_psu /Msg -> {model, name, hw_version, sw_version, serial_no, ...}
|
||||
// (values are strings). No DC output voltage or rated envelope is exposed, so
|
||||
// only identity (model/version/serial) is set.
|
||||
let d = data.get(&DataField::Psu)?;
|
||||
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
|
||||
let psu = PsuInfo {
|
||||
model: s("/model").or_else(|| s("/name")),
|
||||
version: s("/hw_version").or_else(|| s("/sw_version")),
|
||||
serial: None, // v1/v2 get_psu does not report a serial (V3 does)
|
||||
serial: s("/serial_no"),
|
||||
voltage_min: None,
|
||||
voltage_max: None,
|
||||
output_voltage: None,
|
||||
@@ -992,6 +1019,12 @@ mod integration_tests {
|
||||
assert_eq!(shares.difficulty_rejected, Some(0.0));
|
||||
assert_eq!(shares.stale_shares, Some(0));
|
||||
assert_eq!(shares.found_blocks, Some(0));
|
||||
// Chip marking from summary "Chip Data" first token (round 19 #10).
|
||||
assert!(!miner_data.hashboards.is_empty());
|
||||
assert_eq!(
|
||||
miner_data.hashboards[0].chip_type.as_deref(),
|
||||
Some("HP5A01-19101436")
|
||||
);
|
||||
assert_eq!(miner_data.wattage, Some(Power::from_watts(3417f64)));
|
||||
assert_eq!(
|
||||
miner_data.tuning_target,
|
||||
|
||||
@@ -216,14 +216,26 @@ impl GetDataLocations for WhatsMinerV2 {
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Hashboards => vec![(
|
||||
RPC_DEVS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some(""),
|
||||
tag: None,
|
||||
},
|
||||
)],
|
||||
DataField::Hashboards => vec![
|
||||
(
|
||||
RPC_DEVS,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some(""),
|
||||
tag: None,
|
||||
},
|
||||
),
|
||||
// Merge in summary so "Chip Data" (miner-wide chip marking) is
|
||||
// available per board (round 19 #10); RPC_SUMMARY already fetched.
|
||||
(
|
||||
RPC_SUMMARY,
|
||||
DataExtractor {
|
||||
func: get_by_pointer,
|
||||
key: Some("/SUMMARY/0"),
|
||||
tag: None,
|
||||
},
|
||||
),
|
||||
],
|
||||
DataField::Pools => vec![(
|
||||
RPC_POOLS,
|
||||
DataExtractor {
|
||||
@@ -433,6 +445,20 @@ impl GetHashboards for WhatsMinerV2 {
|
||||
);
|
||||
}
|
||||
|
||||
// Chip marking from the merged summary "Chip Data" (miner-wide, first
|
||||
// token), applied to every board (round 19 #10).
|
||||
let chip_type = hashboard_data
|
||||
.pointer("/Chip Data")
|
||||
.and_then(|v| v.as_str())
|
||||
.and_then(|s| s.split_whitespace().next())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string);
|
||||
if chip_type.is_some() {
|
||||
for board in hashboards.iter_mut() {
|
||||
board.chip_type = chip_type.clone();
|
||||
}
|
||||
}
|
||||
|
||||
hashboards
|
||||
}
|
||||
}
|
||||
@@ -504,14 +530,15 @@ impl GetWattage for WhatsMinerV2 {
|
||||
}
|
||||
|
||||
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
|
||||
// get_psu /Msg -> {model, hw_version, sw_version} (string values). No DC
|
||||
// output voltage or rated envelope is exposed, so only identity is set.
|
||||
// get_psu /Msg -> {model, name, hw_version, sw_version, serial_no} (string
|
||||
// values). No DC output voltage or rated envelope is exposed, so only
|
||||
// identity (model/version/serial) is set.
|
||||
let d = data.get(&DataField::Psu)?;
|
||||
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
|
||||
let psu = PsuInfo {
|
||||
model: s("/model").or_else(|| s("/name")),
|
||||
version: s("/hw_version").or_else(|| s("/sw_version")),
|
||||
serial: None, // v1/v2 get_psu does not report a serial (V3 does)
|
||||
serial: s("/serial_no"),
|
||||
voltage_min: None,
|
||||
voltage_max: None,
|
||||
output_voltage: None,
|
||||
|
||||
@@ -459,6 +459,19 @@ impl GetHashboards for WhatsMinerV3 {
|
||||
.map(|h| h.value > 0.0)
|
||||
.unwrap_or(false),
|
||||
);
|
||||
// Chip marking (per-board chipdataN, first token) + hashboard model
|
||||
// (miner-wide hash-board, e.g. "K40") from get.device.info (round 19 #10).
|
||||
board.chip_type = hashboard_data
|
||||
.pointer(&format!("/chipdata{idx}"))
|
||||
.and_then(|v| v.as_str())
|
||||
.and_then(|s| s.split_whitespace().next())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string);
|
||||
board.hashboard_model = hashboard_data
|
||||
.pointer("/hash-board")
|
||||
.and_then(|v| v.as_str())
|
||||
.filter(|s| !s.is_empty())
|
||||
.map(str::to_string);
|
||||
}
|
||||
|
||||
hashboards
|
||||
@@ -1241,6 +1254,17 @@ mod integration_tests {
|
||||
assert!(miner_data.is_mining);
|
||||
assert_eq!(miner_data.fans.len(), 2);
|
||||
assert_eq!(miner_data.pools[0].len(), 3);
|
||||
// Chip marking (chipdataN first token) + hashboard model (hash-board);
|
||||
// round 19 #10.
|
||||
assert!(!miner_data.hashboards.is_empty());
|
||||
assert_eq!(
|
||||
miner_data.hashboards[0].chip_type.as_deref(),
|
||||
Some("K8EC374-2426")
|
||||
);
|
||||
assert_eq!(
|
||||
miner_data.hashboards[0].hashboard_model.as_deref(),
|
||||
Some("K40")
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||