Compare commits

...
10 Commits
Author SHA1 Message Date
noahandClaude Opus 4.8 a4fcb6e763 asic-rs telemetry: VNish fan%/temps, WhatsMiner chip type, and auto-tuner status
Round 19 #10 telemetry extension, live-verified. Two logical changes (patches 0030
and 0031) shipped together; they populate existing GUI columns plus one new "Tuner"
column.

VNish + WhatsMiner (patch 0030, no core/GUI change):
- VNish v1_2_0 + v1_3_0: fan duty % (summary /miner/cooling/fan_duty) and board temp
  thresholds (settings restart_temp -> dangerous, auto cooling param -> target).
  Live-verified 10.4.1.50 (81 / 90 / 65). No PSU serial exposed -> stays None.
- WhatsMiner chip type (per user, do not drop): v1/v2 summary "Chip Data" merged
  into hashboards -> BoardData.chip_type (first token); v3 chipdataN -> chip_type and
  hash-board ("K40") -> hashboard_model.

Auto-tuner status (patch 0031):
- New DataField::TunerStatus + MinerData.tuner_status (Option<String>), riding the
  existing GetOperatingState trait via a defaulted parse_tuner_status.
- Braiins: performance/tuner-state overall_tuner_state via the BOS+ TunerState enum
  (Disabled/Stable/Tuning/Error/Continuous/Preheat) -- mapping from the bos-plus-api
  proto. ePIC: PerpetualTune -> Off/Optimized/Tuning. Others -> None.
- GUI: new "Tuner" column (Health & status category, auto-hidden when empty).

All values live-verified against the corpus miners (ePIC 10.4.1.6, LuxOS 10.4.1.60,
Braiins 10.4.1.83, VNish 10.4.1.50). Fixture tests assert every parsed value.
ALL_COLUMNS 71 -> 72.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 18:10:57 -06:00
alkane-ci 76409b0d3b ci: refresh README badges [skip release] 2026-09-23 23:57:28 +00:00
noahandClaude Opus 4.8 4aec6d40ad asic-rs telemetry: board temp thresholds -> target/hot/dangerous (LuxOS, Braiins; remap ePIC)
Round 19 #10 telemetry extension. Live-verified against the corpus miners, this
remodels the board temperature thresholds to item #10's target/hot/dangerous scheme
and adds the LuxOS and Braiins backends. Supersedes the ePIC-only critical/shutdown
model shipped in v0.72.0.

Core (asic-rs-core):
- MinerData: temp_critical/temp_shutdown -> temp_target/temp_hot/temp_dangerous.
- parse_temperature_limits (defaulted on the existing GetFluidTemperature trait)
  now returns (target, hot, dangerous); parse_data wires all three fields.

Backends (each reads an already-fetched or single command; live-verified):
- LuxOS: new tempctrl RPC; ChipTarget/ChipHot/ChipDangerous (live 10.4.1.60 = 83/93/100).
- Braiins v25_07 + v26_04: configuration/constraints cooling_constraints defaults
  (live 10.4.1.83 = 60/80/90); WEB_CONSTRAINTS already fetched for tuning caps.
- ePIC remap: Shutdown Temp -> hot, Critical Temp -> dangerous, no target.
- VNish (settings restart_temp/param) handled in a follow-up (needs settings auth);
  Antminer/WhatsMiner expose no thresholds -> (None,None,None).

GUI: the two temp columns (Critical/Shutdown) become three (Target/Hot/Dangerous),
right-aligned, Temperature category, auto-hidden when empty. MinerRow gains
temp_target_c/temp_hot_c/temp_dangerous_c; to_row reads them. ALL_COLUMNS 70 -> 71.

Fixtures captured from live: luxminer tempctrl.json, braiins configuration_constraints.json.
Fixture tests for epic, luxminer, braiins v26_04 assert the parsed thresholds. Patch 0029.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 17:40:33 -06:00
alkane-ci 33a116d9fd ci: refresh README badges [skip release] 2026-09-23 23:10:06 +00:00
noahandClaude Opus 4.8 45d9632590 asic-rs telemetry T3-temps: board temperature thresholds (critical / shutdown)
Round 19 #10 telemetry extension. Adds the board temperature safety thresholds
("board dangerous temp" from item #10).

Core (asic-rs-core):
- 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) -- no supertrait blast radius; parse_data
  wires both fields in.

Backend:
- ePIC: summary /Misc Critical Temp + Shutdown Temp (already-fetched summary).
- Antminer/WhatsMiner expose no 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).

GUI: two new columns (Critical temp / Shutdown temp), right-aligned, Temperature
category, auto-hidden when empty. MinerRow gains temp_critical_c / temp_shutdown_c;
to_row reads them. ALL_COLUMNS 68 -> 70.

Fixture test for epic asserts the parsed thresholds. Patch 0028.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 16:53:57 -06:00
alkane-ci 0265370be2 ci: refresh README badges [skip release] 2026-09-23 22:43:35 +00:00
noahandClaude Opus 4.8 fadd851e04 asic-rs telemetry T3-fan: miner-level fan duty cycle (fan speed %)
Round 19 #10 / #8 telemetry extension. Adds the fan duty cycle as a miner-level
percentage -- the normalized fan-load indicator the GUI wanted alongside per-fan
RPMs. No firmware exposes a maximum fan RPM, so a true actual/maximum pair is not
possible; the duty cycle is the closest normalized signal.

Core (asic-rs-core):
- New DataField::FanSpeedPercent; MinerData gains fan_speed_percent (Option<f64>).
- Modeled as a top-level miner-level value (most firmwares report a single duty),
  so FanData is untouched -- no Eq removal / literal churn across its 17 crates.
- Rides the existing GetFans trait via a defaulted parse_fan_speed_percent method
  (no supertrait blast radius); parse_data wires it in.

Backends (read already-fetched commands, no extra round-trips):
- ePIC: summary /Fans/Fans Speed (single %).
- LuxOS: max of FANS[].Speed.
- Braiins v25_07 + v26_04: max of cooling fans[].target_speed_ratio x 100.
- Antminer (pwm via config) and VNish (fan_duty) have no data fixtures -> left for a
  live-verified pass; WhatsMiner is firmware-locked -> None.

GUI: new "Fan %" column (right-aligned, Cooling category, auto-hidden when empty).
MinerRow gains fan_speed_percent; to_row reads it. ALL_COLUMNS 67 -> 68.

Fixture tests: epic, luxminer, braiins v26_04 assert the parsed percentage. Patch 0027.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 16:28:14 -06:00
alkane-ci 24f9d9682d ci: refresh README badges [skip release] 2026-09-23 22:10:04 +00:00
noahandClaude Opus 4.8 3f9fc4a24b asic-rs telemetry T2b: cumulative share stats (difficulty acc/rej, stale, blocks)
Round 19 #10 telemetry extension, tier 2b. Adds the cumulative share statistics
from item #10 end to end: difficulty-weighted accepted/rejected work, raw stale
share count, and blocks found.

Core (asic-rs-core):
- New ShareSummary sub-struct (data/share.rs) with a parse_cgminer_share_summary
  helper reading a cgminer/btminer SUMMARY[0] object.
- New DataField::ShareSummary; MinerData gains share_summary.
- Rides the existing GetBestShare trait via a defaulted parse_share_summary method
  (no new supertrait bound, no per-backend empty impl); parse_data wires it in.

Backends (read the already-fetched SUMMARY, so no extra round-trips; these are
miner-level aggregates -> top-level MinerData fields, not per-pool PoolData):
- Antminer v2020 + v2023_07, LuxOS, WhatsMiner V1 + V2 override parse_share_summary.
- Braiins (no cumulative difficulty), ePIC (current difficulty only), WhatsMiner V3
  and VNish expose none and inherit None -- fixtures confirm.

GUI: four new columns (Diff acc / Diff rej / Stale / Blocks), right-aligned, in the
Pools category, auto-hidden when empty. MinerRow gains the four fields; to_row reads
them from share_summary. ALL_COLUMNS 63 -> 67.

Fixture tests: whatsminer v1 and antminer v2020 assert the parsed values. Patch 0026.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-23 15:51:57 -06:00
alkane-ci 8ab607de6c ci: refresh README badges [skip release] 2026-09-23 21:30:23 +00:00
37 changed files with 2902 additions and 54 deletions
+9 -9
View File
@@ -1,11 +1,11 @@
{
"bench_parse_line_near_max_addrs": 8789980.0,
"bench_parse_targets_many_ranges_near_cap": 167614817.0,
"bench_render_cells": 16546104.0,
"bench_sort_by_each_column": 2415723.0,
"bench_targets_to_cidrs_large_range": 1664048.0,
"bench_upsert_cold_start_population": 46439419.0,
"bench_view_pipeline": 743132.0,
"bench_view_pipeline_default_sort": 1348836.0,
"bench_view_pipeline_with_filter": 897779.0
"bench_parse_line_near_max_addrs": 2827876.0,
"bench_parse_targets_many_ranges_near_cap": 212629393.0,
"bench_render_cells": 20754823.0,
"bench_sort_by_each_column": 2044409.0,
"bench_targets_to_cidrs_large_range": 2702478.0,
"bench_upsert_cold_start_population": 63442076.0,
"bench_view_pipeline": 785884.0,
"bench_view_pipeline_default_sort": 1696098.0,
"bench_view_pipeline_with_filter": 1122175.0
}
+5 -5
View File
@@ -1,5 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="147.5" height="20" role="img" aria-label="bench: -30.5% vs prev">
<title>bench: -30.5% vs prev</title>
<svg xmlns="http://www.w3.org/2000/svg" width="147.5" height="20" role="img" aria-label="bench: +14.4% vs prev">
<title>bench: +14.4% 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"/>
@@ -7,13 +7,13 @@
<clipPath id="r"><rect width="147.5" height="20" rx="3" fill="#fff"/></clipPath>
<g clip-path="url(#r)">
<rect width="44.5" height="20" fill="#555"/>
<rect x="44.5" width="103.0" height="20" fill="#4c1"/>
<rect x="44.5" width="103.0" height="20" fill="#fe7d37"/>
<rect width="147.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="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">-30.5% vs prev</text>
<text x="96.0" y="14">-30.5% vs prev</text>
<text x="96.0" y="15" fill="#010101" fill-opacity=".3">+14.4% vs prev</text>
<text x="96.0" y="14">+14.4% vs prev</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 952 B

After

Width:  |  Height:  |  Size: 955 B

+4 -4
View File
@@ -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.3k">
<title>lines of code: 13.3k</title>
<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>
<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.3k</text>
<text x="118.8" y="14">13.3k</text>
<text x="118.8" y="15" fill="#010101" fill-opacity=".3">13.5k</text>
<text x="118.8" y="14">13.5k</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 952 B

After

Width:  |  Height:  |  Size: 952 B

+98 -5
View File
@@ -563,9 +563,17 @@ 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>,
/// Miner-level fan duty cycle as a percentage (round 19 #10, T3); `None` when
/// the firmware does not report it (no firmware exposes a maximum RPM).
pub fan_speed_percent: Option<f64>,
pub psu_fan_rpm: f64,
pub fan_count: Option<u32>,
pub expected_fans: Option<u32>,
@@ -590,10 +598,19 @@ pub struct MinerRow {
/// (round 19 #10). `None` when the firmware reports neither.
pub accepted_shares: Option<u64>,
pub rejected_shares: Option<u64>,
/// Cumulative share statistics from the miner summary (round 19 #10, T2):
/// difficulty-weighted accepted / rejected work, raw stale count, and blocks
/// found. `None` where the firmware does not report the value.
pub difficulty_accepted: Option<f64>,
pub difficulty_rejected: Option<f64>,
pub stale_shares: Option<u64>,
pub found_blocks: Option<u64>,
// state
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);
@@ -1071,6 +1088,10 @@ pub enum Column {
Fan2,
Fan3,
Fan4,
/// Miner-level fan duty cycle % (round 19 #10, T3). No firmware exposes a
/// maximum RPM, so this normalized duty cycle is the fan-load indicator.
/// Populated on ePIC, LuxOS, and Braiins; others leave it empty (auto-hidden).
FanSpeedPercent,
Firmware,
FwVersion,
Worker,
@@ -1095,6 +1116,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).
@@ -1120,6 +1147,8 @@ pub enum Column {
Uptime,
Light,
OperatingState,
/// Auto-tuner status label (round 19 #10, T3); Braiins/ePIC today.
Tuner,
BestShare,
SessionBestShare,
TuningPercent,
@@ -1130,6 +1159,14 @@ pub enum Column {
Accepted,
Rejected,
RejectRatio,
/// Cumulative share statistics (round 19 #10, T2): difficulty-weighted
/// accepted / rejected work, raw stale count, and blocks found. Populated on
/// the cgminer family (Antminer, LuxOS, WhatsMiner V1/V2); other firmwares
/// leave them empty (auto-hidden).
DiffAccepted,
DiffRejected,
StaleShares,
Blocks,
/// Per-hashboard hashrate / voltage / frequency, slash-joined like Chip temp.
BoardHashrate,
BoardVoltage,
@@ -1145,7 +1182,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; 63] = [
pub const ALL_COLUMNS: [Column; 72] = [
Column::Ip,
Column::Hashrate,
Column::Hashrate1m,
@@ -1159,6 +1196,7 @@ pub const ALL_COLUMNS: [Column; 63] = [
Column::Fan2,
Column::Fan3,
Column::Fan4,
Column::FanSpeedPercent,
Column::Firmware,
Column::FwVersion,
// Pool account (the part before the dot) before Worker (the rig part after
@@ -1172,6 +1210,9 @@ pub const ALL_COLUMNS: [Column; 63] = [
Column::FluidTemp,
Column::EnvTemp,
Column::OutletTemp,
Column::TargetTemp,
Column::HotTemp,
Column::DangerousTemp,
Column::PsuFan,
Column::PsuVersion,
Column::PsuSerial,
@@ -1194,6 +1235,7 @@ pub const ALL_COLUMNS: [Column; 63] = [
Column::Uptime,
Column::Light,
Column::OperatingState,
Column::Tuner,
Column::BestShare,
Column::SessionBestShare,
Column::TuningPercent,
@@ -1201,6 +1243,10 @@ pub const ALL_COLUMNS: [Column; 63] = [
Column::Accepted,
Column::Rejected,
Column::RejectRatio,
Column::DiffAccepted,
Column::DiffRejected,
Column::StaleShares,
Column::Blocks,
Column::BoardHashrate,
Column::BoardVoltage,
Column::BoardFrequency,
@@ -1246,10 +1292,15 @@ impl Column {
Column::Fan2 => "Fan 2 (RPM)",
Column::Fan3 => "Fan 3 (RPM)",
Column::Fan4 => "Fan 4 (RPM)",
Column::FanSpeedPercent => "Fan %",
Column::Target => "Target",
Column::Accepted => "Accepted",
Column::Rejected => "Rejected",
Column::RejectRatio => "Reject %",
Column::DiffAccepted => "Diff acc",
Column::DiffRejected => "Diff rej",
Column::StaleShares => "Stale",
Column::Blocks => "Blocks",
Column::BoardHashrate => "Board HR",
Column::BoardVoltage => "Board V",
Column::BoardFrequency => "Board freq",
@@ -1269,6 +1320,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",
@@ -1292,6 +1346,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 %",
@@ -1315,10 +1370,14 @@ 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::Accepted | Column::Rejected => 100,
Column::RejectRatio => 90,
Column::DiffAccepted | Column::DiffRejected => 110,
Column::StaleShares | Column::Blocks => 80,
Column::BoardHashrate | Column::BoardVoltage | Column::BoardFrequency => 130,
Column::PsuVersion => 100,
Column::PsuSerial => 150,
@@ -1350,6 +1409,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,
@@ -1374,13 +1434,21 @@ impl Column {
| Column::FluidTemp
| Column::EnvTemp
| Column::OutletTemp
| Column::TargetTemp
| Column::HotTemp
| Column::DangerousTemp
| Column::Fan1
| Column::Fan2
| Column::Fan3
| Column::Fan4
| Column::FanSpeedPercent
| Column::Accepted
| Column::Rejected
| Column::RejectRatio
| Column::DiffAccepted
| Column::DiffRejected
| Column::StaleShares
| Column::Blocks
| Column::BoardHashrate
| Column::BoardVoltage
| Column::BoardFrequency
@@ -1456,13 +1524,23 @@ 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)),
Column::Fan4 => SortKey::Num(r.fan_rpms.get(3).copied().unwrap_or(none)),
Column::FanSpeedPercent => SortKey::Num(r.fan_speed_percent.unwrap_or(none)),
Column::Accepted => SortKey::Num(r.accepted_shares.map(|v| v as f64).unwrap_or(none)),
Column::Rejected => SortKey::Num(r.rejected_shares.map(|v| v as f64).unwrap_or(none)),
Column::RejectRatio => SortKey::Num(r.reject_ratio().unwrap_or(none)),
Column::DiffAccepted => SortKey::Num(r.difficulty_accepted.unwrap_or(none)),
Column::DiffRejected => SortKey::Num(r.difficulty_rejected.unwrap_or(none)),
Column::StaleShares => {
SortKey::Num(r.stale_shares.map(|v| v as f64).unwrap_or(none))
}
Column::Blocks => SortKey::Num(r.found_blocks.map(|v| v as f64).unwrap_or(none)),
Column::BoardHashrate => SortKey::Num(avg_or(&r.board_hashrates, none)),
Column::BoardVoltage => SortKey::Num(avg_positive(&r.board_voltages, none)),
Column::BoardFrequency => SortKey::Num(avg_positive(&r.board_frequencies, none)),
@@ -1548,6 +1626,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).
@@ -1555,10 +1636,19 @@ impl Column {
Column::Fan2 => r.fan_rpms.get(1).map(|&v| format_fan_rpm(v)).unwrap_or_default(),
Column::Fan3 => r.fan_rpms.get(2).map(|&v| format_fan_rpm(v)).unwrap_or_default(),
Column::Fan4 => r.fan_rpms.get(3).map(|&v| format_fan_rpm(v)).unwrap_or_default(),
Column::FanSpeedPercent => {
r.fan_speed_percent.map(|v| format!("{v:.0}%")).unwrap_or_default()
}
Column::Target => r.tuning_target_label.clone().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(),
// Difficulty-weighted work (SI-formatted like Best share); raw stale /
// block counts as plain integers (round 19 #10, T2).
Column::DiffAccepted => r.difficulty_accepted.map(|v| format_si(v, "")).unwrap_or_default(),
Column::DiffRejected => r.difficulty_rejected.map(|v| format_si(v, "")).unwrap_or_default(),
Column::StaleShares => r.stale_shares.map(|v| v.to_string()).unwrap_or_default(),
Column::Blocks => r.found_blocks.map(|v| v.to_string()).unwrap_or_default(),
// Per-hashboard hashrate / voltage / frequency, slash-joined like Chip
// temp; "-" for a board with no reading, blank when none at all.
Column::BoardHashrate => join_board(&r.board_hashrates, |v| {
@@ -1628,6 +1718,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()
@@ -1654,23 +1745,25 @@ 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::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
| Column::FanCount | Column::ExpectedFans => (5, "Cooling"),
| Column::FanCount | Column::ExpectedFans | Column::FanSpeedPercent => (5, "Cooling"),
Column::TotalChips | Column::PsuVersion | Column::PsuSerial | Column::PsuVMin
| Column::PsuVMax => (6, "Hardware"),
Column::Worker | Column::PoolAccount | Column::PoolUrl | Column::Pool1Url
| Column::Pool1Worker | Column::Pool2Url | Column::Pool2Worker | Column::Pool3Url
| Column::Pool3Worker | Column::Accepted | Column::Rejected
| Column::RejectRatio => (7, "Pools"),
| Column::RejectRatio | Column::DiffAccepted | Column::DiffRejected
| Column::StaleShares | Column::Blocks => (7, "Pools"),
}
}
}
+10
View File
@@ -1151,7 +1151,11 @@ 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,
fan_count: (!data.fans.is_empty()).then_some(data.fans.len() as u32),
expected_fans: data.expected_fans.map(|v| v as u32),
@@ -1189,9 +1193,15 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
}
any.then_some(total)
},
// Cumulative share stats from the miner summary (round 19 #10, T2).
difficulty_accepted: data.share_summary.as_ref().and_then(|s| s.difficulty_accepted),
difficulty_rejected: data.share_summary.as_ref().and_then(|s| s.difficulty_rejected),
stale_shares: data.share_summary.as_ref().and_then(|s| s.stale_shares),
found_blocks: data.share_summary.as_ref().and_then(|s| s.found_blocks),
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,
@@ -0,0 +1,399 @@
Subject: [PATCH 0026] telemetry: cumulative share stats (difficulty acc/rej, stale, blocks)
Round 19 #10 telemetry extension, tier 2b. Exposes the cumulative share
statistics the GUI wanted: difficulty-weighted accepted/rejected work, raw stale
share count, and blocks found.
- New ShareSummary sub-struct (data/share.rs) + parse_cgminer_share_summary helper
that reads a cgminer/btminer SUMMARY[0] object ("Difficulty Accepted",
"Difficulty Rejected", "Stale", "Found Blocks").
- New DataField::ShareSummary; MinerData gains share_summary.
- Rides the EXISTING GetBestShare trait via a defaulted parse_share_summary method
(default None), so no new supertrait bound and no empty impl per backend; only
the cgminer-family backends override it. parse_data wires it in.
- Backends (each reads the SUMMARY the collector already fetches, so no extra
round-trips): Antminer v2020 + v2023_07, LuxOS, WhatsMiner V1 + V2. These are
miner-level aggregates, not per-pool, so they are top-level MinerData fields (the
per-pool accepted/rejected share counts stay on PoolData). Braiins does not
expose cumulative difficulty; ePIC reports only the current difficulty target;
WhatsMiner V3 and VNish expose none -> all inherit None.
Fixture tests for whatsminer v1 and antminer v2020 assert the parsed values.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 5899c039..942b39f6 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -111,6 +111,9 @@ pub enum DataField {
/// Difficulty of the best share found over the miner's lifetime, when reported.
#[cfg_attr(feature = "python", pydantic(value = "BestShare"))]
BestShare,
+ /// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
+ #[cfg_attr(feature = "python", pydantic(value = "ShareSummary"))]
+ ShareSummary,
/// Difficulty of the best share found since the last boot or hashing start, when reported.
#[cfg_attr(feature = "python", pydantic(value = "SessionBestShare"))]
SessionBestShare,
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
index 38c7f3be..660850f4 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -17,6 +17,7 @@ use super::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
+ share::ShareSummary,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -237,6 +238,9 @@ pub struct MinerData {
/// Difficulty of the best share found since the last boot or hashing start,
/// when the firmware distinguishes session from all-time.
pub session_best_share: Option<f64>,
+ /// Cumulative share statistics (difficulty accepted/rejected, stale, blocks),
+ /// when reported. Miner-level aggregate from the cgminer/btminer summary.
+ pub share_summary: Option<ShareSummary>,
}
#[cfg(feature = "python")]
diff --git a/vendor/asic-rs-core/src/data/share.rs b/vendor/asic-rs-core/src/data/share.rs
index 3cc50651..73b0a0a8 100644
--- a/vendor/asic-rs-core/src/data/share.rs
+++ b/vendor/asic-rs-core/src/data/share.rs
@@ -3,7 +3,61 @@
//! Firmwares report best-share difficulty as a JSON number, a decimal string,
//! or an AxeOS-style suffix string (`"483k"`, `"1.2M"`).
+#[cfg(feature = "python")]
+use pyo3::pyclass;
+use serde::{Deserialize, Serialize};
use serde_json::Value;
+use ts_rs::TS;
+
+/// Cumulative share statistics reported by a miner (round 19 #10, T2).
+///
+/// These are miner-level aggregates from the cgminer/btminer summary. Difficulty
+/// values are difficulty-weighted sums (not raw share counts, which live on
+/// [`PoolData`][`super::pool::PoolData`]). Every field is optional; a backend
+/// fills in only what its firmware exposes.
+#[cfg_attr(feature = "python", pyclass(from_py_object, module = "asic_rs"))]
+#[cfg_attr(feature = "python", asic_rs_pydantic::py_pydantic_model(getters))]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default, TS)]
+pub struct ShareSummary {
+ /// Difficulty-weighted accepted work, when reported.
+ pub difficulty_accepted: Option<f64>,
+ /// Difficulty-weighted rejected work, when reported.
+ pub difficulty_rejected: Option<f64>,
+ /// Raw stale share count, when reported.
+ pub stale_shares: Option<u64>,
+ /// Number of blocks found by this miner, when reported.
+ pub found_blocks: Option<u64>,
+}
+
+impl ShareSummary {
+ /// True when no field is populated.
+ pub fn is_empty(&self) -> bool {
+ self.difficulty_accepted.is_none()
+ && self.difficulty_rejected.is_none()
+ && self.stale_shares.is_none()
+ && self.found_blocks.is_none()
+ }
+}
+
+/// Parse a [`ShareSummary`] from a cgminer/btminer `SUMMARY[0]` object (the value
+/// extracted at `/SUMMARY/0`). Reads "Difficulty Accepted", "Difficulty Rejected",
+/// "Stale", and "Found Blocks". Returns `None` when none are present.
+pub fn parse_cgminer_share_summary(summary: &Value) -> Option<ShareSummary> {
+ let f = |k: &str| {
+ summary
+ .get(k)
+ .and_then(|v| v.as_f64())
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ };
+ let u = |k: &str| summary.get(k).and_then(|v| v.as_u64());
+ let s = ShareSummary {
+ difficulty_accepted: f("Difficulty Accepted"),
+ difficulty_rejected: f("Difficulty Rejected"),
+ stale_shares: u("Stale"),
+ found_blocks: u("Found Blocks"),
+ };
+ (!s.is_empty()).then_some(s)
+}
/// Parse a share difficulty from a JSON value.
///
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
index cfabb624..76344342 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -34,6 +34,7 @@ use crate::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
+ share::ShareSummary,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -291,6 +292,7 @@ impl<
let pools = self.parse_pools(&data);
let best_share = self.parse_best_share(&data);
let session_best_share = self.parse_session_best_share(&data);
+ let share_summary = self.parse_share_summary(&data);
let device_info = self.get_device_info();
// computed fields
@@ -388,6 +390,7 @@ impl<
pools,
best_share,
session_best_share,
+ share_summary,
}
}
}
@@ -914,6 +917,18 @@ pub trait GetBestShare: CollectData {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
None
}
+ #[tracing::instrument(level = "debug")]
+ async fn get_share_summary(&self) -> Option<ShareSummary> {
+ let mut collector = self.get_collector();
+ let data = collector.collect(&[DataField::ShareSummary]).await;
+ self.parse_share_summary(&data)
+ }
+ /// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
+ /// Backends that expose them override this; others return None.
+ #[allow(unused_variables)]
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ None
+ }
}
// Best share difficulty (this session / since boot)
diff --git a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
index 63f819f8..71195737 100644
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2020/mod.rs
@@ -21,6 +21,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -509,6 +510,16 @@ impl GetDataLocations for AntMinerV2020 {
tag: None,
},
)],
+ // Cumulative share stats from cgminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
// `total_rateideal`, by contrast, says nothing about its own
// scale, so carry STATS' `rate_unit` alongside it.
DataField::ExpectedHashrate => vec![
@@ -889,6 +900,10 @@ impl GetBestShare for AntMinerV2020 {
// (round 19 #10).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for AntMinerV2020 {}
@@ -1679,6 +1694,12 @@ mod tests {
algo: HashAlgorithm::SHA256,
}
);
+ // Cumulative share stats from cgminer summary (round 19 #10, T2).
+ let shares = miner_data.share_summary.expect("share summary");
+ assert_eq!(shares.difficulty_accepted, Some(1305083904.0));
+ assert_eq!(shares.difficulty_rejected, Some(2490368.0));
+ assert_eq!(shares.stale_shares, Some(1));
+ assert_eq!(shares.found_blocks, Some(0));
}
#[tokio::test]
diff --git a/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs b/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs
index 1ac2bad1..58e8a5c2 100644
--- a/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs
+++ b/vendor/asic-rs-firmwares-antminer/src/backends/v2023_07/mod.rs
@@ -23,6 +23,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -547,6 +548,16 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
)],
+ // Cumulative share stats from cgminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -955,6 +966,10 @@ impl GetBestShare for AntMinerV202307 {
// reports 0 when it has never found a share (round 17 R7).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for AntMinerV202307 {
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 a75a3f97..413f237a 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
@@ -20,6 +20,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -455,6 +456,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
+ // Cumulative share stats from LuxOS summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -945,6 +956,10 @@ impl GetBestShare for LuxMinerV1 {
// LuxOS summary -> "Best Share" (all-time), round 16 / G9.
data.extract::<f64>(DataField::BestShare)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for LuxMinerV1 {
fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
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 584ae8d1..aacd1077 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -19,6 +19,7 @@ use asic_rs_core::{
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -264,6 +265,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
+ // Cumulative share stats from btminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -597,6 +608,10 @@ impl GetBestShare for WhatsMinerV1 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for WhatsMinerV1 {}
impl GetOperatingState for WhatsMinerV1 {}
@@ -969,6 +984,14 @@ mod integration_tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 67.43935249).abs() < 1e-6);
}
+ // Cumulative share stats from summary (round 19 #10, T2).
+ let shares = miner_data
+ .share_summary
+ .ok_or_else(|| anyhow::anyhow!("v1 should expose share summary"))?;
+ assert_eq!(shares.difficulty_accepted, Some(158334976.0));
+ assert_eq!(shares.difficulty_rejected, Some(0.0));
+ assert_eq!(shares.stale_shares, Some(0));
+ assert_eq!(shares.found_blocks, Some(0));
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 5de37579..4cfcee19 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
@@ -21,6 +21,7 @@ use asic_rs_core::{
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
+ share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -265,6 +266,16 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
+ // Cumulative share stats from btminer summary (round 19 #10, T2);
+ // RPC_SUMMARY already fetched.
+ DataField::ShareSummary => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: None,
+ },
+ )],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -592,6 +603,10 @@ impl GetBestShare for WhatsMinerV2 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
+ fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
+ data.get(&DataField::ShareSummary)
+ .and_then(parse_cgminer_share_summary)
+ }
}
impl GetSessionBestShare for WhatsMinerV2 {}
impl GetOperatingState for WhatsMinerV2 {}
@@ -0,0 +1,267 @@
Subject: [PATCH 0027] telemetry: miner-level fan duty cycle (fan speed %)
Round 19 #10 / #8 telemetry extension, tier 3. Exposes the fan duty cycle as a
miner-level percentage. No firmware exposes a maximum fan RPM, so this normalized
duty cycle is the fan-load indicator the GUI wanted alongside the per-fan RPMs.
- New DataField::FanSpeedPercent; MinerData gains fan_speed_percent (Option<f64>,
0-100). Modeled as a top-level miner-level value (most firmwares report a single
duty), so FanData is untouched (no Eq/literal churn across 17 crates).
- Rides the EXISTING GetFans trait via a defaulted parse_fan_speed_percent method
(default None), so no new supertrait bound; only backends that expose it override.
- Backends (each reads a command the collector already fetches, so no extra
round-trips): ePIC (summary /Fans/Fans Speed, single %), LuxOS (max of FANS[].Speed),
Braiins v25_07 + v26_04 (max of cooling fans[].target_speed_ratio x 100). Antminer
(pwm via config command) and VNish (fan_duty) have no data fixtures and are left
for a live-verified pass; WhatsMiner is fw-locked -> None.
Fixture tests for epic, luxminer, and braiins v26_04 assert the parsed percentage.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 942b39f6..07d9d571 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -62,6 +62,9 @@ pub enum DataField {
/// Fan speed or fan configuration.
#[cfg_attr(feature = "python", pydantic(value = "Fans"))]
Fans,
+ /// Miner-level fan duty cycle as a percentage (0-100).
+ #[cfg_attr(feature = "python", pydantic(value = "FanSpeedPercent"))]
+ FanSpeedPercent,
/// 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 660850f4..6dc73d26 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -178,6 +178,9 @@ pub struct MinerData {
pub expected_fans: Option<u8>,
/// The current fan information for the miner
pub fans: Vec<FanData>,
+ /// 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>,
/// 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 76344342..baac9387 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -283,6 +283,7 @@ impl<
let fluid_temperature = self.parse_fluid_temperature(&data);
let outlet_fluid_temperature = self.parse_outlet_fluid_temperature(&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);
let hashboards = self.parse_hashboards(&data);
let light_flashing = self.parse_light_flashing(&data);
@@ -366,6 +367,7 @@ impl<
// Cooling information
expected_fans: device_info.hardware.fans,
fans,
+ fan_speed_percent,
psu_fans,
average_temperature,
fluid_temperature,
@@ -682,6 +684,18 @@ pub trait GetFans: CollectData {
fn parse_fans(&self, data: &HashMap<DataField, Value>) -> Vec<FanData> {
vec![]
}
+ #[tracing::instrument(level = "debug")]
+ async fn get_fan_speed_percent(&self) -> Option<f64> {
+ let mut collector = self.get_collector();
+ let data = collector.collect(&[DataField::FanSpeedPercent]).await;
+ self.parse_fan_speed_percent(&data)
+ }
+ /// Miner-level fan duty cycle as a percentage (0-100). Backends that expose it
+ /// override this; others return None.
+ #[allow(unused_variables)]
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ None
+ }
}
// PSU Fans
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 7e07967f..86e84d8c 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
@@ -230,6 +230,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
+ // Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
+ // cooling state already fetched.
+ DataField::FanSpeedPercent => vec![(
+ WEB_COOLING_STATE,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/fans"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -567,6 +577,18 @@ impl GetFans for BraiinsV2507 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
+ // a percentage (round 19 #10, T3).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_array())
+ .into_iter()
+ .flatten()
+ .filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ .map(|v| v * 100.0)
+ .max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
+ }
}
impl GetLightFlashing 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 2f5be88c..303fca49 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
@@ -233,6 +233,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
+ // Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
+ // cooling state already fetched.
+ DataField::FanSpeedPercent => vec![(
+ WEB_COOLING_STATE,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/fans"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -598,6 +608,18 @@ impl GetFans for BraiinsV2604 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
+ // a percentage (round 19 #10, T3).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_array())
+ .into_iter()
+ .flatten()
+ .filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ .map(|v| v * 100.0)
+ .max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
+ }
}
impl GetLightFlashing for BraiinsV2604 {
@@ -1287,6 +1309,10 @@ mod tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 247.3507543407177).abs() < 1e-3);
}
+ // Miner-level fan duty cycle = max target_speed_ratio (0.92) x 100 (round
+ // 19 #10, T3).
+ let fan_pct = miner_data.fan_speed_percent.expect("braiins fan duty");
+ assert!((fan_pct - 92.0).abs() < 1e-6);
}
#[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 2abb0706..16c7872b 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -473,6 +473,15 @@ impl GetDataLocations for PowerPlayV1 {
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("/Fans/Fans Speed"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![
(
WEB_TEMPS,
@@ -1120,6 +1129,11 @@ impl GetFans for PowerPlayV1 {
fans
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // ePIC summary /Fans/Fans Speed is a single miner-level duty % (round 19 #10).
+ data.extract::<f64>(DataField::FanSpeedPercent)
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ }
}
impl GetPsuFans for PowerPlayV1 {}
@@ -2189,6 +2203,8 @@ mod tests {
assert_eq!(miner_data.uptime, Some(Duration::from_secs(23170)));
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));
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 413f237a..edab7c4c 100644
--- a/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-luxminer/src/backends/v1/mod.rs
@@ -295,6 +295,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
+ // Miner-level fan duty cycle (round 19 #10, T3): max of per-fan Speed;
+ // RPC_FANS already fetched.
+ DataField::FanSpeedPercent => vec![(
+ RPC_FANS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/FANS"),
+ tag: None,
+ },
+ )],
DataField::ApiVersion => vec![(
RPC_VERSION,
DataExtractor {
@@ -936,6 +946,17 @@ impl GetFans for LuxMinerV1 {
})
.collect()
}
+ fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // LuxOS FANS[].Speed is per-fan duty %; report the fleet-facing maximum
+ // (round 19 #10, T3).
+ data.get(&DataField::FanSpeedPercent)
+ .and_then(|v| v.as_array())
+ .into_iter()
+ .flatten()
+ .filter_map(|f| f.get("Speed").and_then(|v| v.as_f64()))
+ .filter(|v| v.is_finite() && *v >= 0.0)
+ .max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
+ }
}
impl GetLightFlashing for LuxMinerV1 {
@@ -1680,6 +1701,9 @@ mod tests {
Some(TuningTarget::Power(Power::from_watts(1188f64)))
);
assert_eq!(miner_data.fans.len(), 4);
+ // 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));
assert_eq!(miner_data.hashboards[0].chips.len(), 77);
assert_eq!(miner_data.pools.len(), 2);
assert_eq!(miner_data.pools[0].len(), 2);
@@ -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);
+1 -1
View File
@@ -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":"93694fbadbb9e78d55911a266a966bec6da81394330973786dc9531b7b05f9da","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":"e8500716a9f311072d3e4889a2219e401116187bec6ceffdd21e34bb9d49f415","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":"46c927b83eddaec7a01c6e0d8cc3af1d163d724421ecc94d4484db158fa27f4f","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":"5c17602926ca9971d2529de2dddcef6aa1308a11fc74def1d9f8ccd904405d13","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"}
+12
View File
@@ -62,6 +62,15 @@ pub enum DataField {
/// Fan speed or fan configuration.
#[cfg_attr(feature = "python", pydantic(value = "Fans"))]
Fans,
/// 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,
@@ -111,6 +120,9 @@ pub enum DataField {
/// Difficulty of the best share found over the miner's lifetime, when reported.
#[cfg_attr(feature = "python", pydantic(value = "BestShare"))]
BestShare,
/// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
#[cfg_attr(feature = "python", pydantic(value = "ShareSummary"))]
ShareSummary,
/// Difficulty of the best share found since the last boot or hashing start, when reported.
#[cfg_attr(feature = "python", pydantic(value = "SessionBestShare"))]
SessionBestShare,
+16
View File
@@ -17,6 +17,7 @@ use super::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
share::ShareSummary,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -177,6 +178,15 @@ pub struct MinerData {
pub expected_fans: Option<u8>,
/// The current fan information for the miner
pub fans: Vec<FanData>,
/// 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
@@ -226,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.
@@ -237,6 +250,9 @@ pub struct MinerData {
/// Difficulty of the best share found since the last boot or hashing start,
/// when the firmware distinguishes session from all-time.
pub session_best_share: Option<f64>,
/// Cumulative share statistics (difficulty accepted/rejected, stale, blocks),
/// when reported. Miner-level aggregate from the cgminer/btminer summary.
pub share_summary: Option<ShareSummary>,
}
#[cfg(feature = "python")]
+54
View File
@@ -3,7 +3,61 @@
//! Firmwares report best-share difficulty as a JSON number, a decimal string,
//! or an AxeOS-style suffix string (`"483k"`, `"1.2M"`).
#[cfg(feature = "python")]
use pyo3::pyclass;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use ts_rs::TS;
/// Cumulative share statistics reported by a miner (round 19 #10, T2).
///
/// These are miner-level aggregates from the cgminer/btminer summary. Difficulty
/// values are difficulty-weighted sums (not raw share counts, which live on
/// [`PoolData`][`super::pool::PoolData`]). Every field is optional; a backend
/// fills in only what its firmware exposes.
#[cfg_attr(feature = "python", pyclass(from_py_object, module = "asic_rs"))]
#[cfg_attr(feature = "python", asic_rs_pydantic::py_pydantic_model(getters))]
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default, TS)]
pub struct ShareSummary {
/// Difficulty-weighted accepted work, when reported.
pub difficulty_accepted: Option<f64>,
/// Difficulty-weighted rejected work, when reported.
pub difficulty_rejected: Option<f64>,
/// Raw stale share count, when reported.
pub stale_shares: Option<u64>,
/// Number of blocks found by this miner, when reported.
pub found_blocks: Option<u64>,
}
impl ShareSummary {
/// True when no field is populated.
pub fn is_empty(&self) -> bool {
self.difficulty_accepted.is_none()
&& self.difficulty_rejected.is_none()
&& self.stale_shares.is_none()
&& self.found_blocks.is_none()
}
}
/// Parse a [`ShareSummary`] from a cgminer/btminer `SUMMARY[0]` object (the value
/// extracted at `/SUMMARY/0`). Reads "Difficulty Accepted", "Difficulty Rejected",
/// "Stale", and "Found Blocks". Returns `None` when none are present.
pub fn parse_cgminer_share_summary(summary: &Value) -> Option<ShareSummary> {
let f = |k: &str| {
summary
.get(k)
.and_then(|v| v.as_f64())
.filter(|v| v.is_finite() && *v >= 0.0)
};
let u = |k: &str| summary.get(k).and_then(|v| v.as_u64());
let s = ShareSummary {
difficulty_accepted: f("Difficulty Accepted"),
difficulty_rejected: f("Difficulty Rejected"),
stale_shares: u("Stale"),
found_blocks: u("Found Blocks"),
};
(!s.is_empty()).then_some(s)
}
/// Parse a share difficulty from a JSON value.
///
+56
View File
@@ -34,6 +34,7 @@ use crate::{
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
share::ShareSummary,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -281,16 +282,20 @@ 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);
let hashboards = self.parse_hashboards(&data);
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);
let session_best_share = self.parse_session_best_share(&data);
let share_summary = self.parse_share_summary(&data);
let device_info = self.get_device_info();
// computed fields
@@ -364,6 +369,10 @@ impl<
// Cooling information
expected_fans: device_info.hardware.fans,
fans,
fan_speed_percent,
temp_target,
temp_hot,
temp_dangerous,
psu_fans,
average_temperature,
fluid_temperature,
@@ -384,10 +393,12 @@ impl<
uptime,
is_mining,
operating_state,
tuner_status,
pools,
best_share,
session_best_share,
share_summary,
}
}
}
@@ -679,6 +690,18 @@ pub trait GetFans: CollectData {
fn parse_fans(&self, data: &HashMap<DataField, Value>) -> Vec<FanData> {
vec![]
}
#[tracing::instrument(level = "debug")]
async fn get_fan_speed_percent(&self) -> Option<f64> {
let mut collector = self.get_collector();
let data = collector.collect(&[DataField::FanSpeedPercent]).await;
self.parse_fan_speed_percent(&data)
}
/// Miner-level fan duty cycle as a percentage (0-100). Backends that expose it
/// override this; others return None.
#[allow(unused_variables)]
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
None
}
}
// PSU Fans
@@ -724,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
@@ -884,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
@@ -914,6 +958,18 @@ pub trait GetBestShare: CollectData {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
None
}
#[tracing::instrument(level = "debug")]
async fn get_share_summary(&self) -> Option<ShareSummary> {
let mut collector = self.get_collector();
let data = collector.collect(&[DataField::ShareSummary]).await;
self.parse_share_summary(&data)
}
/// Cumulative share statistics (difficulty accepted/rejected, stale, blocks).
/// Backends that expose them override this; others return None.
#[allow(unused_variables)]
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
None
}
}
// Best share difficulty (this session / since boot)
+1 -1
View File
@@ -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":"6e42d50107b1a43fd7cf4a4c4f538468a337ed219ad8d6b23bd9abdabd123bd5","Cargo.lock":"7f984c7231c91f2def8f3e2e923a85c2e0b3239492f5ce23400881ea4de1aa16","Cargo.toml":"8a447efc18cd97d019a9771fb258b06f694499500561564eec75480e46bcc554","Cargo.toml.orig":"6c9e7b86804255debe03545c6358eb975d3d470810a19e6c40c680299a686b1f","src/backends/mod.rs":"65cdc60cdf38968f5a7e197338f4cf6173406ce69a4f0aaa96a9e29f4f581b6e","src/backends/v2020/firmware.rs":"5a41bfb8f42f17523e68f8702e87d75bcdb268bd4950bb66227f6966ef3576a9","src/backends/v2020/mod.rs":"63872e035c349d10a5377a8992d635bd053911970e29e4bc46b0c6d239994cec","src/backends/v2020/rpc.rs":"b517f88b9125fe1d8a20d5167f5d0d105b1339fce3d1a9fad5592e00470f46fb","src/backends/v2020/web.rs":"a6a3ad3eb77551b098b0092553b02cee43d165476d8c92164e12a1e765753b0d","src/backends/v2023_07/firmware.rs":"c07668e351d48dab3e24511b1aa9ab5e408bbcb5a438fdb0542a1377f94b9bbb","src/backends/v2023_07/mod.rs":"0c294d8515c56149571d2a504d68352bdaa206d0b996056f560c2ec60d9927f4","src/backends/v2023_07/rpc.rs":"2b24bbb432b302dd15f7a354054fc96c6a75cac2c8e75b8bcc11da37255a05a3","src/backends/v2023_07/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","src/firmware.rs":"e75c21d63218204b61bfab067599402e5c0b20452beaf0b16bfa79bf8afb6b35","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"a3ef4d6805bb4f8ea087e3a9b875e5a1664580e1ff3e3cd2015bb0c5c18ae7bb","src/test/json/v2020/devs.json":"df17cdfc9522e23450702b93f70ff701892db54c6ce6d986300453ad5e0d22db","src/test/json/v2020/mod.rs":"4c2512d36af834d400a865a94c2e8b1919f9d8dcbf54ab2530c73861c51af67d","src/test/json/v2020/pools.json":"4c4d19ad3ef0de84bfb18daaa48428b5f7917d23287c0196eacf3a6e389e7634","src/test/json/v2020/stats.json":"6d3cb463abb7539ae77aa44ef38e62a5dc0db54670aeacf3bbd01e83f49aa1fd","src/test/json/v2020/summary.json":"2f18c81f989b7c5f70dcb0ddac0520e56ec98b6da25c24e59354a6126c965dae","src/test/json/v2020/system_info.json":"51d1ce922e39a254518a24be56ca86ef1b5843582fb26c1ff0ec4ff6f8f91ccf","src/test/json/v2020/version.json":"ae898c4c9ea3462c3e79f9de755f1fccb4ef122b94a4a512e61aa74491c1a8e9","src/test/json/v2023_07/l11_stats.json":"2eab324f253ced9a0ea4e46466691e0e71fc6fde7558fec86bd5acf6bb9c717d","src/test/json/v2023_07/l11_summary.json":"1e0fdb61b968005d0ec5393d9dc889b09efb1398ffa427629bcc0a98d1b67c22","src/test/json/v2023_07/l11_version.json":"d116921a71731c6e492aed109731c39561e34a24c7df2a88d11ac52b80f6100a","src/test/json/v2023_07/l9_stats.json":"731ee545f16dafd356d22703248b91a37f74585ad73cc27441eb3461ce53dca0","src/test/json/v2023_07/l9_summary.json":"b32b5131ad46859b270d2dbb6bdba3c4e5d7301298daee4ce56332c98faaf81d","src/test/json/v2023_07/l9_version.json":"82f03ca6ea8873f12c4d9455f21b98c547801b58fbff1dcd83c837c0f337a129","src/test/json/v2023_07/mod.rs":"1360a8b155b120f2e755ede0736bcc0d76a9d1d693b984a1b51a16e6c0413791","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"0c06e3ecbf95ae3fe5e30aacae55cf6e7ad3d965f4a93b2f85c7b64f61fc75e2"}
{"$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":"6e42d50107b1a43fd7cf4a4c4f538468a337ed219ad8d6b23bd9abdabd123bd5","Cargo.lock":"7f984c7231c91f2def8f3e2e923a85c2e0b3239492f5ce23400881ea4de1aa16","Cargo.toml":"8a447efc18cd97d019a9771fb258b06f694499500561564eec75480e46bcc554","Cargo.toml.orig":"6c9e7b86804255debe03545c6358eb975d3d470810a19e6c40c680299a686b1f","src/backends/mod.rs":"65cdc60cdf38968f5a7e197338f4cf6173406ce69a4f0aaa96a9e29f4f581b6e","src/backends/v2020/firmware.rs":"5a41bfb8f42f17523e68f8702e87d75bcdb268bd4950bb66227f6966ef3576a9","src/backends/v2020/mod.rs":"b2dbba5377a739bc8be3380cfbd09aa80893841c15c305bfd25f900ba7b6a0c9","src/backends/v2020/rpc.rs":"b517f88b9125fe1d8a20d5167f5d0d105b1339fce3d1a9fad5592e00470f46fb","src/backends/v2020/web.rs":"a6a3ad3eb77551b098b0092553b02cee43d165476d8c92164e12a1e765753b0d","src/backends/v2023_07/firmware.rs":"c07668e351d48dab3e24511b1aa9ab5e408bbcb5a438fdb0542a1377f94b9bbb","src/backends/v2023_07/mod.rs":"0906bff13eb51bd47fb0e06cc2c1955fe459c601cb467efc917801ead825dd61","src/backends/v2023_07/rpc.rs":"2b24bbb432b302dd15f7a354054fc96c6a75cac2c8e75b8bcc11da37255a05a3","src/backends/v2023_07/web.rs":"d39b67ed83781b2c4fa84a445b9ffe785ae3001941f800ad9860e050c61c6506","src/firmware.rs":"e75c21d63218204b61bfab067599402e5c0b20452beaf0b16bfa79bf8afb6b35","src/lib.rs":"53f7acddeff8f7d82f80d09e0a9f91962011f9ccf2e441c4ca05cd7fc4eb292e","src/test/json/mod.rs":"a3ef4d6805bb4f8ea087e3a9b875e5a1664580e1ff3e3cd2015bb0c5c18ae7bb","src/test/json/v2020/devs.json":"df17cdfc9522e23450702b93f70ff701892db54c6ce6d986300453ad5e0d22db","src/test/json/v2020/mod.rs":"4c2512d36af834d400a865a94c2e8b1919f9d8dcbf54ab2530c73861c51af67d","src/test/json/v2020/pools.json":"4c4d19ad3ef0de84bfb18daaa48428b5f7917d23287c0196eacf3a6e389e7634","src/test/json/v2020/stats.json":"6d3cb463abb7539ae77aa44ef38e62a5dc0db54670aeacf3bbd01e83f49aa1fd","src/test/json/v2020/summary.json":"2f18c81f989b7c5f70dcb0ddac0520e56ec98b6da25c24e59354a6126c965dae","src/test/json/v2020/system_info.json":"51d1ce922e39a254518a24be56ca86ef1b5843582fb26c1ff0ec4ff6f8f91ccf","src/test/json/v2020/version.json":"ae898c4c9ea3462c3e79f9de755f1fccb4ef122b94a4a512e61aa74491c1a8e9","src/test/json/v2023_07/l11_stats.json":"2eab324f253ced9a0ea4e46466691e0e71fc6fde7558fec86bd5acf6bb9c717d","src/test/json/v2023_07/l11_summary.json":"1e0fdb61b968005d0ec5393d9dc889b09efb1398ffa427629bcc0a98d1b67c22","src/test/json/v2023_07/l11_version.json":"d116921a71731c6e492aed109731c39561e34a24c7df2a88d11ac52b80f6100a","src/test/json/v2023_07/l9_stats.json":"731ee545f16dafd356d22703248b91a37f74585ad73cc27441eb3461ce53dca0","src/test/json/v2023_07/l9_summary.json":"b32b5131ad46859b270d2dbb6bdba3c4e5d7301298daee4ce56332c98faaf81d","src/test/json/v2023_07/l9_version.json":"82f03ca6ea8873f12c4d9455f21b98c547801b58fbff1dcd83c837c0f337a129","src/test/json/v2023_07/mod.rs":"1360a8b155b120f2e755ede0736bcc0d76a9d1d693b984a1b51a16e6c0413791","src/test/mod.rs":"ed52c3d613eabc4a0346bb38bcfdf7a94933d61e368d3c9094821edeab92f81b"},"package":"0c06e3ecbf95ae3fe5e30aacae55cf6e7ad3d965f4a93b2f85c7b64f61fc75e2"}
@@ -21,6 +21,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -509,6 +510,16 @@ impl GetDataLocations for AntMinerV2020 {
tag: None,
},
)],
// Cumulative share stats from cgminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
// `total_rateideal`, by contrast, says nothing about its own
// scale, so carry STATS' `rate_unit` alongside it.
DataField::ExpectedHashrate => vec![
@@ -889,6 +900,10 @@ impl GetBestShare for AntMinerV2020 {
// (round 19 #10).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for AntMinerV2020 {}
@@ -1679,6 +1694,12 @@ mod tests {
algo: HashAlgorithm::SHA256,
}
);
// Cumulative share stats from cgminer summary (round 19 #10, T2).
let shares = miner_data.share_summary.expect("share summary");
assert_eq!(shares.difficulty_accepted, Some(1305083904.0));
assert_eq!(shares.difficulty_rejected, Some(2490368.0));
assert_eq!(shares.stale_shares, Some(1));
assert_eq!(shares.found_blocks, Some(0));
}
#[tokio::test]
@@ -23,6 +23,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -547,6 +548,16 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
)],
// Cumulative share stats from cgminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -955,6 +966,10 @@ impl GetBestShare for AntMinerV202307 {
// reports 0 when it has never found a share (round 17 R7).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for AntMinerV202307 {
File diff suppressed because one or more lines are too long
+77 -1
View File
@@ -230,6 +230,16 @@ impl GetDataLocations for BraiinsV2507 {
tag: None,
},
)],
// Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
// cooling state already fetched.
DataField::FanSpeedPercent => vec![(
WEB_COOLING_STATE,
DataExtractor {
func: get_by_pointer,
key: Some("/fans"),
tag: None,
},
)],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -262,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 {
@@ -362,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![],
}
}
@@ -567,6 +597,18 @@ impl GetFans for BraiinsV2507 {
fans
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
// a percentage (round 19 #10, T3).
data.get(&DataField::FanSpeedPercent)
.and_then(|v| v.as_array())
.into_iter()
.flatten()
.filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
.filter(|v| v.is_finite() && *v >= 0.0)
.map(|v| v * 100.0)
.max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
}
}
impl GetLightFlashing for BraiinsV2507 {
@@ -598,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 {
@@ -703,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,
+98 -5
View File
@@ -233,6 +233,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
// Miner-level fan duty cycle (round 19 #10, T3): max target_speed_ratio;
// cooling state already fetched.
DataField::FanSpeedPercent => vec![(
WEB_COOLING_STATE,
DataExtractor {
func: get_by_pointer,
key: Some("/fans"),
tag: None,
},
)],
DataField::Hashboards => vec![(
WEB_HASHBOARDS,
DataExtractor {
@@ -265,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 {
@@ -383,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![],
}
}
@@ -598,6 +628,18 @@ impl GetFans for BraiinsV2604 {
fans
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// Braiins fans[].target_speed_ratio is a 0-1 duty ratio; report the max as
// a percentage (round 19 #10, T3).
data.get(&DataField::FanSpeedPercent)
.and_then(|v| v.as_array())
.into_iter()
.flatten()
.filter_map(|f| f.pointer("/target_speed_ratio").and_then(|v| v.as_f64()))
.filter(|v| v.is_finite() && *v >= 0.0)
.map(|v| v * 100.0)
.max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
}
}
impl GetLightFlashing for BraiinsV2604 {
@@ -635,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 {
@@ -753,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,
@@ -1145,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]
@@ -1229,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",
@@ -1287,6 +1370,16 @@ mod tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 247.3507543407177).abs() < 1e-3);
}
// Miner-level fan duty cycle = max target_speed_ratio (0.92) x 100 (round
// 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
View File
@@ -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":"b272ad45e4e44a56718596485aa6c3f9f3b28516a6d80d329a1f1594ccc3de95","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"}
+81 -1
View File
@@ -473,6 +473,25 @@ impl GetDataLocations for PowerPlayV1 {
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("/Fans/Fans Speed"),
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,
@@ -575,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 {
@@ -1120,12 +1149,32 @@ impl GetFans for PowerPlayV1 {
fans
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// ePIC summary /Fans/Fans Speed is a single miner-level duty % (round 19 #10).
data.extract::<f64>(DataField::FanSpeedPercent)
.filter(|v| v.is_finite() && *v >= 0.0)
}
}
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> {
@@ -1369,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 {
@@ -2189,6 +2260,15 @@ mod tests {
assert_eq!(miner_data.uptime, Some(Duration::from_secs(23170)));
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
View File
@@ -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":"df4c8e3baad0cbc4ec490f095751211f31839b1b4d2929c1928e3bc54333f1d5","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"}
+81 -1
View File
@@ -20,6 +20,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -277,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,
@@ -294,6 +300,26 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
// Miner-level fan duty cycle (round 19 #10, T3): max of per-fan Speed;
// RPC_FANS already fetched.
DataField::FanSpeedPercent => vec![(
RPC_FANS,
DataExtractor {
func: get_by_pointer,
key: Some("/FANS"),
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 {
@@ -455,6 +481,16 @@ impl GetDataLocations for LuxMinerV1 {
tag: None,
},
)],
// Cumulative share stats from LuxOS summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -669,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 {
@@ -925,6 +975,17 @@ impl GetFans for LuxMinerV1 {
})
.collect()
}
fn parse_fan_speed_percent(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// LuxOS FANS[].Speed is per-fan duty %; report the fleet-facing maximum
// (round 19 #10, T3).
data.get(&DataField::FanSpeedPercent)
.and_then(|v| v.as_array())
.into_iter()
.flatten()
.filter_map(|f| f.get("Speed").and_then(|v| v.as_f64()))
.filter(|v| v.is_finite() && *v >= 0.0)
.max_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
}
}
impl GetLightFlashing for LuxMinerV1 {
@@ -945,6 +1006,10 @@ impl GetBestShare for LuxMinerV1 {
// LuxOS summary -> "Best Share" (all-time), round 16 / G9.
data.extract::<f64>(DataField::BestShare)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for LuxMinerV1 {
fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
@@ -1429,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]
@@ -1546,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)?);
@@ -1555,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 {
@@ -1665,6 +1737,14 @@ mod tests {
Some(TuningTarget::Power(Power::from_watts(1188f64)))
);
assert_eq!(miner_data.fans.len(), 4);
// 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
View File
@@ -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":"01e6310dbe806f132ac303a2d38e82f41a2973fe7c0f448fbecd0f257b285133","src/backends/v1_2_0/web.rs":"ac89f16bf623f7d85590d34b45c99b0e522d9d434b4c22af7fa8a8a653e09d2e","src/backends/v1_3_0/mod.rs":"679aebc708541973da12934f5597aad4f7178b43bd69329142cee1818d50f8d3","src/backends/v1_3_0/web.rs":"1ec4cbe6bdc26f165d9e54e9bf2aac4c3706357ce4677dc21113710d4a26c3c1","src/firmware.rs":"168eeffaef90cb1525bb2e126e73905b5205d49215437263813e30323f6b7a05","src/lib.rs":"16ea1c0007fa6d6c86c1f83d3ac9cdf065cd9936cd52f35ef89c227397bbc54a","src/timezone.rs":"309bf23de1bdc9126bde5db8dabff0d2c0fea797dbf2630a772a18539838a05e"},"package":"1cb662e56f104c0fe45c8ccdac13f60cbcaad45ac228f939c6ac46ff40335052"}
@@ -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 {
@@ -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,
+1 -1
View File
@@ -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":"ba440ed8b997847a79117f143f162b1c5d8484e15a5bee3dcfc6a6b5de622743","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"18932153a8214bb6588e753a6242a9e729a24a9ae9a9bf30772e87477505c4f0","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":"2b1532bad5a75f90bb6556c9856ccb13522935779678eb764dd6de546ee0999d","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"b490e6ae2438b798c866800345e25ae1689f0d43237a9c165a2cca9bbe567c40","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"}
+63 -8
View File
@@ -19,6 +19,7 @@ use asic_rs_core::{
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
};
@@ -204,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 {
@@ -264,6 +277,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
// Cumulative share stats from btminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -425,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
}
}
@@ -597,6 +634,10 @@ impl GetBestShare for WhatsMinerV1 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for WhatsMinerV1 {}
impl GetOperatingState for WhatsMinerV1 {}
@@ -969,6 +1010,20 @@ mod integration_tests {
assert_eq!(hr.unit, HashRateUnit::TeraHash);
assert!((hr.value - 67.43935249).abs() < 1e-6);
}
// Cumulative share stats from summary (round 19 #10, T2).
let shares = miner_data
.share_summary
.ok_or_else(|| anyhow::anyhow!("v1 should expose share summary"))?;
assert_eq!(shares.difficulty_accepted, Some(158334976.0));
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,
+49 -8
View File
@@ -21,6 +21,7 @@ use asic_rs_core::{
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
share::{ShareSummary, parse_cgminer_share_summary},
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -215,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 {
@@ -265,6 +278,16 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
// Cumulative share stats from btminer summary (round 19 #10, T2);
// RPC_SUMMARY already fetched.
DataField::ShareSummary => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: None,
},
)],
DataField::ExpectedHashrate => vec![(
RPC_SUMMARY,
DataExtractor {
@@ -422,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
}
}
@@ -592,6 +629,10 @@ impl GetBestShare for WhatsMinerV2 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
fn parse_share_summary(&self, data: &HashMap<DataField, Value>) -> Option<ShareSummary> {
data.get(&DataField::ShareSummary)
.and_then(parse_cgminer_share_summary)
}
}
impl GetSessionBestShare for WhatsMinerV2 {}
impl GetOperatingState for WhatsMinerV2 {}
@@ -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(())
}