Compare commits

...
6 Commits
Author SHA1 Message Date
noahandClaude Opus 4.8 e45e6eaf91 ui: shrink brain icon, light toggle, blank all unknown-PIC (round 18 #1/#9/#11)
- #1 The control-board (brain) Health icon is drawn at 82% in its full slot, like
  the fan, so it no longer reads oversized (slot advance + tooltip hit-test unchanged).
- #9 The right-click menu now shows a single state-based light toggle: "Stop
  flashing lights" when any selected miner's locate light is on, else "Flash lights".
- #11 The PIC column is blank for every unknown case (non-Antminer makes and
  unclassifiable Antminer models) -- no more "?".

SELFTEST PASS; pic test updated.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 16:28:26 -06:00
noahandClaude Opus 4.8 e5a6cc2b5e psu: extend PSU-info scan to Braiins + WhatsMiner (R5/G15)
Round 17 R5/G15. The PSU version/Vmin/Vmax columns + tooltip now populate for
Braiins and WhatsMiner, not just ePIC.

- Braiins (patch 0020): miner/details -> psu_info gives the PSU type (117, the
  same APW12 ePIC reports) + rated voltage min/max. Verified live on 10.4.1.83/.27:
  model 117, Vmin 11.96 V, Vmax 15.2 V.
- WhatsMiner v1/v2 (patch 0021): get_psu -> model + hw/sw version (no DC output or
  rated envelope exposed). Verified live on 10.8.1.214 (v2): model P221C, version
  H20201205. v3 uses a different response shape and no v3 unit was available, so
  it's left as a follow-up.
- Also fixes a pre-existing broken test (test_whatsminer_v1_parse_messages never
  mocked get_error_code -> always returned 0 messages; CI runs only the GUI
  selftest so it was never caught). whatsminer backend tests now 41/41.

SELFTEST PASS; braiins + whatsminer backend suites green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 16:07:53 -06:00
noahandClaude Opus 4.8 6fb73c9746 firmware: detect + label Bixbit and Hiveon (own colours)
Bixbit and Hiveon keep the stock Antminer web API, so asic-rs identifies them as
"AntMiner Stock". Distinguish them at scan time from the cgminer `version` reply:
Bixbit tags it with BixFirmware/BixMiner/BixAPIVersion (definitive; verified live on
a Bixbit S19j Pro at 10.4.1.70); Hiveon carries a "hiveon" marker (best-effort --
no live Hiveon unit to confirm the exact signature yet). A real stock miner (no
marker) stays "Stock".

Firmware column colours: Bixbit -> pinkish-red (223,62,102, their logo); Hiveon ->
darker logo orange (228,112,24), with "hiveon" added to the existing hive/hiveos
alias. The probe is a short, timeout-bounded cgminer query run only for Antminer
miners that first identified as stock.

SELFTEST PASS. Hiveon detection to be re-verified once a Hiveon miner is available.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 14:15:43 -06:00
noahandClaude Opus 4.8 49985631d4 antminer: read best-share fleet-wide + Bixbit "Power Estimated" wattage (R7)
Round 17 R7. Flashing Bixbit onto fleet units surfaced two Antminer scan gaps
(patch 0019): the stock v2023_07 backend never fetched best-share at all
(DataField::BestShare had no source), so it was blank for every stock/Bixbit
Antminer; and it read wattage only from the cgminer stats, which Bixbit-based
firmware leaves at 0 (real draw is in the summary as "Power Estimated").

Now maps BestShare/SessionBestShare to the cgminer summary and adds a
"Power Estimated" wattage fallback (stock power still wins when present).

Verified live: Bixbit S19j Pro (10.4.1.70) now reads 2615 W + best-share
178930671; stock S21 Pro (10.4.1.90) now reads best-share 299464394 -- both were
blank before. 36 antminer backend tests + SELFTEST pass, no wattage regression.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 13:34:01 -06:00
noahandClaude Opus 4.8 8fe61ec427 psu: PSU info scan + version/Vmin/Vmax columns + tooltip V/A (R5/G15)
Round 17 R5/G15. asic-rs had no PSU telemetry. Adds an optional PsuInfo to
MinerData (model, version, rated voltage min/max, live output voltage/current),
a DataField::Psu, and a default parse_psu backends override (patch 0018). ePIC
populates it by merging the summary "Power Supply Stats" with the capabilities
"Psu Info".

GUI: three new columns -- "PSU version", "PSU Vmin", "PSU Vmax" (Hardware group in
the picker) -- and the R2 power tooltip now shows the PSU output voltage (and
amperage when the firmware reports a non-zero current; ePIC leaves current 0, so
it shows just the voltage).

Verified live on ePIC S19j Pro (10.4.1.6/.10): model 117, fw 22, Vmin 11.877 V,
Vmax 15.182 V, output ~13.2 V. 8 model tests + 18 ePIC backend tests + SELFTEST
pass. Non-ePIC firmware leave the PSU fields blank until they add parse_psu.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 12:24:26 -06:00
noahandClaude Opus 4.8 34a1a1f3b1 tuning: structured power + hashrate target dialogs (Round C)
Round 17 C, first GUI increment. Adds "Set power target..." and "Set hashrate
target..." to the right-click config menu, each a value prompt that shows the
miner's current target and the firmware-advertised valid range, and validates the
entry against it.

- Power target routes through the existing set_power_limit path (LuxOS/Braiins/
  WhatsMiner; VNish stays masked per operator guidance). Where the firmware
  advertises an envelope (Braiins: 944-6435 W) the prompt shows and enforces it.
- Hashrate target routes through set_tuning_config for firmware that tunes by
  hashrate (ePIC). The apply path preserves the firmware's current tuning
  algorithm and scaling config (ePIC's set_tuning_config requires both), reading
  them back before writing the new target.

Model gains: MinerRow.tuning_target_label + power/hashrate target min/max
(from data.tuning_capabilities), and MinerCaps.hashrate_target (set when the miner
actively tunes by hashrate via set_tuning_config). miner_probe's settune verb now
mirrors the same algorithm+scaling-preserving apply path.

Verified live (reversibly, restored after): ePIC S19j Pro (10.4.1.6) hashrate
94->92->94 TH via set_tuning_config Ok(true); LuxOS/Braiins power targets via
set_power_limit (see the luxminer profile-name fix). Model tests + SELFTEST pass.

Presets (G3) and per-board manual V/F (G7) are deferred: no firmware enumerates
its presets through the standard tuning_capabilities API.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Djv3oncM4LxTS5tb61Ako6
2026-09-22 11:33:43 -06:00
27 changed files with 1141 additions and 56 deletions
+9 -1
View File
@@ -492,6 +492,7 @@ async fn tune(ip_s: &str) {
m.supports_set_tuning_percent(),
m.supports_tuning_config(),
);
println!(" psu={:?}", data.psu);
println!(" tuning_percent={:?}", data.tuning_percent);
println!(" tuning_target={:?}", data.tuning_target);
match &data.tuning_capabilities {
@@ -570,7 +571,14 @@ async fn settune(ip_s: &str, kind: &str, value: f64) {
// power-limit setter for a power target (LuxOS/Braiins tune by power
// and expose no set_tuning_config).
if m.supports_tuning_config() {
match m.set_tuning_config(TuningConfig::new(target), None).await {
// Mirror the GUI apply path: preserve the firmware's current tuning
// algorithm + scaling (ePIC requires both for set_tuning_config).
let mut cfg = TuningConfig::new(target);
if let Some(algo) = m.get_tuning_config().await.ok().and_then(|c| c.algorithm) {
cfg = cfg.with_algorithm(algo);
}
let scaling = m.get_scaling_config().await.ok();
match m.set_tuning_config(cfg, scaling).await {
Ok(v) => println!("set_tuning_config({kind} {value}) -> Ok({v})"),
Err(e) => println!("set_tuning_config({kind} {value}) -> Err: {e:#}"),
}
+10 -2
View File
@@ -135,6 +135,13 @@ impl Board {
board_status,
total_chips: chips,
psu_fan_rpm: if self.mining { self.fan * 0.9 } else { 0.0 },
// PSU info demo (round 17 R5): mining units show a version + rated
// envelope + live output, so the columns and the R2 PSU tooltip render.
psu_version: if self.mining { "22 (117)".to_string() } else { String::new() },
psu_voltage_min_v: self.mining.then_some(11.88),
psu_voltage_max_v: self.mining.then_some(15.18),
psu_out_voltage_v: self.mining.then_some(13.2),
psu_out_current_a: self.mining.then_some(210.0),
uptime_secs: if self.mining { 3600 * 24 * 2 + 3600 * 5 } else { 0 },
// One unit is "being located" so the Light column's yellow dot is
// demonstrable offline (round 11 #10).
@@ -165,6 +172,7 @@ impl Board {
resume: self.mining,
power_limit: self.mining,
tuning: self.mining,
hashrate_target: self.mining,
firmware_flash,
pools: true,
timezone: self.mining,
@@ -230,10 +238,10 @@ pub fn bench_fleet() -> Vec<MinerRow> {
Board { ip: "10.255.1.126", make: "Whatsminer", model_id: "M30SVE40", board: "H3", firmware: "Stock", fw_version: "H3.0.1",
hashrate: 92.0, expected: 96.0, power: 3400.0, temp: 70.0, fan: 4800.0,
worker: "blueflare.h3", mining: true, paused: false },
Board { ip: "10.255.1.131", make: "Whatsminer", model_id: "M30SPlusVE40", board: "H616", firmware: "Hive", fw_version: "1.0",
Board { ip: "10.255.1.131", make: "Whatsminer", model_id: "M30SPlusVE40", board: "H616", firmware: "Hiveon", fw_version: "1.05",
hashrate: 100.0, expected: 100.0, power: 3450.0, temp: 71.0, fan: 4900.0,
worker: "blueflare.h616", mining: true, paused: false },
Board { ip: "10.255.1.148", make: "Whatsminer", model_id: "M50VH50", board: "H6", firmware: "BixBit", fw_version: "2.1",
Board { ip: "10.255.1.148", make: "Whatsminer", model_id: "M50VH50", board: "H6", firmware: "Bixbit", fw_version: "0.9.9.4",
hashrate: 118.0, expected: 122.0, power: 3300.0, temp: 66.0, fan: 4600.0,
worker: "blueflare.m50", mining: true, paused: false },
// Rebucketed from idle/not-hashing to paused so the "paused"
+57 -19
View File
@@ -213,6 +213,10 @@ pub struct MinerCaps {
pub resume: bool,
pub power_limit: bool,
pub tuning: bool,
/// Round 17 C: supports setting a structured hashrate target via
/// `set_tuning_config` (the firmware actively tunes by hashrate, e.g. ePIC).
/// Power targets are covered by `power_limit`.
pub hashrate_target: bool,
/// Whether this miner's asic-rs driver supports `upgrade_firmware`
/// (probed via `supports_upgrade_firmware()` at scan time).
pub firmware_flash: bool,
@@ -236,6 +240,7 @@ impl MinerCaps {
resume: self.resume && other.resume,
power_limit: self.power_limit && other.power_limit,
tuning: self.tuning && other.tuning,
hashrate_target: self.hashrate_target && other.hashrate_target,
firmware_flash: self.firmware_flash && other.firmware_flash,
pools: self.pools && other.pools,
timezone: self.timezone && other.timezone,
@@ -268,6 +273,7 @@ impl MinerCaps {
|| self.resume
|| self.power_limit
|| self.tuning
|| self.hashrate_target
|| self.firmware_flash
|| self.pools
|| self.timezone
@@ -422,6 +428,22 @@ pub struct MinerRow {
/// shows "V / A" for a healthy PSU instead of a bare "PSU OK".
pub psu_out_voltage_v: Option<f64>,
pub psu_out_current_a: Option<f64>,
/// PSU identity + rated voltage envelope, when the firmware reports it (round
/// 17 R5 / G15; ePIC today). `psu_version` is blank when unknown.
pub psu_version: String,
pub psu_voltage_min_v: Option<f64>,
pub psu_voltage_max_v: Option<f64>,
/// Current structured tuning target, rendered for display (e.g. "2832 W",
/// "96 TH/s", "preset 3550"), or None (round 17 C).
pub tuning_target_label: Option<String>,
/// Advertised power-target envelope in watts, when the firmware reports one
/// (round 17 C, e.g. Braiins 944-6435 W). Bounds + validate the power-target
/// prompt; `None` leaves it unbounded.
pub power_target_min_w: Option<f64>,
pub power_target_max_w: Option<f64>,
/// Advertised hashrate-target envelope in TH/s, when reported (round 17 C).
pub hashrate_target_min_ths: Option<f64>,
pub hashrate_target_max_ths: Option<f64>,
pub tuning_percent: Option<u8>,
// thermal / cooling
/// Average chip temperature (used for sorting/colour banding of the
@@ -881,6 +903,11 @@ pub enum Column {
EnvTemp,
OutletTemp,
PsuFan,
/// PSU identity + rated voltage envelope (round 17 R5). Populated where the
/// firmware exposes PSU info (ePIC today).
PsuVersion,
PsuVMin,
PsuVMax,
FanCount,
ExpectedFans,
TotalChips,
@@ -912,7 +939,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; 43] = [
pub const ALL_COLUMNS: [Column; 46] = [
Column::Ip,
Column::Hashrate,
Column::Health,
@@ -931,6 +958,9 @@ pub const ALL_COLUMNS: [Column; 43] = [
Column::EnvTemp,
Column::OutletTemp,
Column::PsuFan,
Column::PsuVersion,
Column::PsuVMin,
Column::PsuVMax,
Column::FanCount,
Column::ExpectedFans,
Column::TotalChips,
@@ -1001,6 +1031,9 @@ impl Column {
Column::EnvTemp => "Env temp",
Column::OutletTemp => "Outlet temp",
Column::PsuFan => "PSU fan (RPM)",
Column::PsuVersion => "PSU version",
Column::PsuVMin => "PSU Vmin",
Column::PsuVMax => "PSU Vmax",
Column::FanCount => "Fans",
Column::ExpectedFans => "Fans (exp)",
Column::TotalChips => "Chips",
@@ -1039,6 +1072,8 @@ impl Column {
Column::Power => 90,
Column::ChipTemp | Column::FluidTemp | Column::EnvTemp | Column::OutletTemp => 95,
Column::Cooling | Column::PsuFan => 100,
Column::PsuVersion => 100,
Column::PsuVMin | Column::PsuVMax => 90,
Column::Firmware => 110,
Column::FwVersion => 130,
Column::Worker => 130,
@@ -1086,6 +1121,8 @@ impl Column {
| Column::OutletTemp
| Column::Cooling
| Column::PsuFan
| Column::PsuVMin
| Column::PsuVMax
| Column::FanCount
| Column::ExpectedFans
| Column::TotalChips
@@ -1147,6 +1184,8 @@ impl Column {
r.fan_rpms.iter().cloned().fold(f64::INFINITY, f64::min)
}),
Column::PsuFan => SortKey::Num(r.psu_fan_rpm),
Column::PsuVMin => SortKey::Num(r.psu_voltage_min_v.unwrap_or(none)),
Column::PsuVMax => SortKey::Num(r.psu_voltage_max_v.unwrap_or(none)),
Column::FanCount => SortKey::Num(r.fan_count.map(|v| v as f64).unwrap_or(none)),
Column::ExpectedFans => SortKey::Num(r.expected_fans.map(|v| v as f64).unwrap_or(none)),
Column::TotalChips => SortKey::Num(r.total_chips.map(|v| v as f64).unwrap_or(none)),
@@ -1229,6 +1268,9 @@ impl Column {
r.fan_rpms.iter().map(|&v| format_fan_rpm(v)).collect::<Vec<_>>().join("/")
}
Column::PsuFan => num(r.psu_fan_rpm, 0, ""),
Column::PsuVersion => r.psu_version.clone(),
Column::PsuVMin => r.psu_voltage_min_v.map(|v| format!("{v:.2} V")).unwrap_or_default(),
Column::PsuVMax => r.psu_voltage_max_v.map(|v| format!("{v:.2} V")).unwrap_or_default(),
Column::FanCount => count(r.fan_count),
Column::ExpectedFans => count(r.expected_fans),
Column::TotalChips => combined_count(r.total_chips, r.expected_chips),
@@ -1248,20 +1290,14 @@ impl Column {
Column::Cpu => r.cpu.clone(),
Column::BoardCode => r.board_code.clone(),
Column::Algorithm => r.algorithm.clone(),
Column::Pic => {
// A per-board PIC MCU is an Antminer hashboard property; it has no
// meaning for WhatsMiner or any other make, which show nothing
// rather than a "?" that implies an unanswered Antminer question.
if !r.brand.eq_ignore_ascii_case("antminer") {
String::new()
} else {
match r.pic_present {
Some(true) => "PIC".to_string(),
Some(false) => "noPIC".to_string(),
None => "?".to_string(),
}
}
}
Column::Pic => match r.pic_present {
// A per-board PIC MCU is a known Antminer-hashboard property. Show
// it only when known; anything unknown (non-Antminer makes, or an
// Antminer model we can't classify) is blank, never "?" (round 18 #11).
Some(true) => "PIC".to_string(),
Some(false) => "noPIC".to_string(),
None => String::new(),
},
Column::Locked => match r.write_locked {
Some(true) => "locked".to_string(),
Some(false) => "unlocked".to_string(),
@@ -1322,7 +1358,8 @@ impl Column {
Column::Cooling | Column::PsuFan | Column::FanCount | Column::ExpectedFans => {
(5, "Cooling")
}
Column::TotalChips | Column::Hashboards => (6, "Hardware"),
Column::TotalChips | Column::Hashboards | Column::PsuVersion | Column::PsuVMin
| Column::PsuVMax => (6, "Hardware"),
Column::Worker | Column::PoolAccount | Column::PoolUrl | Column::Pool1Url
| Column::Pool1Worker | Column::Pool2Url | Column::Pool2Worker | Column::Pool3Url
| Column::Pool3Worker => (7, "Pools"),
@@ -2056,12 +2093,12 @@ mod tests {
#[test]
fn pic_locked_error_columns_render() {
// PIC (best-effort): Antminer known -> PIC/noPIC, unknown Antminer -> "?".
// PIC: known -> PIC/noPIC; anything unknown -> blank, never "?" (round 18 #11).
let am = |pic| MinerRow { brand: "Antminer".into(), pic_present: pic, ..Default::default() };
assert_eq!(Column::Pic.cell(&am(Some(true))), "PIC");
assert_eq!(Column::Pic.cell(&am(Some(false))), "noPIC");
assert_eq!(Column::Pic.cell(&am(None)), "?");
// Non-Antminer makes: PIC has no meaning -> blank, never "?".
assert_eq!(Column::Pic.cell(&am(None)), ""); // unknown Antminer model -> blank
// Non-Antminer makes: PIC has no meaning -> blank.
let wm = MinerRow { brand: "WhatsMiner".into(), pic_present: None, ..Default::default() };
assert_eq!(Column::Pic.cell(&wm), "");
@@ -2326,6 +2363,7 @@ mod tests {
resume: true,
power_limit: true,
tuning: true,
hashrate_target: true,
firmware_flash: true,
pools: true,
timezone: true,
+126 -7
View File
@@ -539,6 +539,32 @@ fn infer_pic(model: &str) -> Option<bool> {
None
}
/// Bixbit and Hiveon are aftermarket firmwares that keep the stock Antminer web
/// API, so asic-rs identifies them as "AntMiner Stock". Distinguish them from real
/// stock via the cgminer `version` reply (port 4028): Bixbit tags it with
/// `BixFirmware`/`BixMiner`; Hiveon carries a "hiveon" marker. Returns the display
/// family to relabel with, or None (round 17). Best-effort + fast: a short probe
/// only run for Antminer miners that first identified as stock.
async fn detect_aftermarket_antminer(ip: std::net::IpAddr) -> Option<&'static str> {
use tokio::io::{AsyncReadExt, AsyncWriteExt};
let connect = tokio::net::TcpStream::connect((ip, 4028));
let mut stream = tokio::time::timeout(std::time::Duration::from_secs(3), connect)
.await
.ok()?
.ok()?;
stream.write_all(b"{\"command\":\"version\"}").await.ok()?;
let mut buf = Vec::new();
let _ = tokio::time::timeout(std::time::Duration::from_secs(3), stream.read_to_end(&mut buf)).await;
let text = String::from_utf8_lossy(&buf);
if text.contains("BixFirmware") || text.contains("BixMiner") || text.contains("BixAPIVersion") {
Some("Bixbit")
} else if text.to_ascii_lowercase().contains("hiveon") {
Some("Hiveon")
} else {
None
}
}
async fn to_row(miner: &dyn Miner) -> MinerRow {
let data = miner.get_data().await;
let hashrate_ths = data
@@ -625,7 +651,15 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
// Firmware family (coloured column) and version go in separate columns. Strip
// the vendor word asic-rs prepends on stock firmware ("AntMiner Stock" ->
// "Stock") and carry it into the version instead (round 11 #6).
let (firmware, fw_vendor) = crate::naming::firmware_family(&data.device_info.firmware);
let (mut firmware, mut fw_vendor) = crate::naming::firmware_family(&data.device_info.firmware);
// Bixbit/Hiveon masquerade as stock; relabel them from their cgminer signature
// so they get their own family + colour instead of "Stock" (round 17).
if data.device_info.make.eq_ignore_ascii_case("antminer") && firmware.eq_ignore_ascii_case("stock") {
if let Some(fam) = detect_aftermarket_antminer(data.ip).await {
firmware = fam.to_string();
fw_vendor = None; // the aftermarket version stands alone, no "AntMiner" prefix
}
}
let raw_fw_version = data.firmware_version.clone().unwrap_or_default();
let fw_version = match (fw_vendor, raw_fw_version.is_empty()) {
(Some(vendor), false) => format!("{vendor} {raw_fw_version}"),
@@ -675,6 +709,47 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
// VNish; Braiins and the rest keep asic-rs's answer.
let power_limit = miner.supports_set_power_limit()
&& !data.device_info.firmware.eq_ignore_ascii_case("VNish");
// Structured tuning (round 17 C). Extract the current target + the advertised
// envelope so the "Set performance target" prompt can show/validate bounds.
use asic_rs::core::data::miner::TuningTarget;
let target_watts = |t: &TuningTarget| match t {
TuningTarget::Power(p) => Some(p.as_watts()),
_ => None,
};
let target_ths = |t: &TuningTarget| match t {
TuningTarget::HashRate(h) => Some(
h.clone()
.as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash)
.value,
),
_ => None,
};
let (power_target_min_w, power_target_max_w, hashrate_target_min_ths, hashrate_target_max_ths) =
match &data.tuning_capabilities {
Some(c) => (
c.power.as_ref().and_then(|p| p.minimum.as_ref()).and_then(&target_watts),
c.power.as_ref().and_then(|p| p.maximum.as_ref()).and_then(&target_watts),
c.hashrate.as_ref().and_then(|h| h.minimum.as_ref()).and_then(&target_ths),
c.hashrate.as_ref().and_then(|h| h.maximum.as_ref()).and_then(&target_ths),
),
None => (None, None, None, None),
};
let tuning_target_label = data.tuning_target.as_ref().map(|t| match t {
TuningTarget::Power(p) => format!("{:.0} W", p.as_watts()),
TuningTarget::HashRate(h) => format!(
"{:.0} TH/s",
h.clone().as_unit(asic_rs::core::data::hashrate::HashRateUnit::TeraHash).value
),
TuningTarget::MiningMode(m) => format!("mode {m}"),
TuningTarget::Preset(s) => format!("preset {s}"),
TuningTarget::Manual { .. } => "manual".to_string(),
});
// A hashrate target is offerable only where the firmware actively tunes by
// hashrate through set_tuning_config (ePIC); Braiins advertises a hashrate
// envelope but has no set_tuning_config wired, so it is excluded.
let tunes_by_hashrate = matches!(data.tuning_target, Some(TuningTarget::HashRate(_)))
|| data.tuning_capabilities.as_ref().map(|c| c.hashrate.is_some()).unwrap_or(false);
let hashrate_target = miner.supports_tuning_config() && tunes_by_hashrate;
// Probe what this miner supports being told to do (sync, no extra I/O).
let caps = MinerCaps {
fault_light: miner.supports_set_fault_light(),
@@ -683,6 +758,7 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
resume: miner.supports_resume(),
power_limit,
tuning: miner.supports_set_tuning_percent(),
hashrate_target,
firmware_flash: miner.supports_upgrade_firmware(),
pools: miner.supports_pools_config(),
timezone: miner.supports_timezone_config(),
@@ -769,10 +845,28 @@ async fn to_row(miner: &dyn Miner) -> MinerRow {
board_hashrates,
efficiency: data.efficiency.unwrap_or(0.0),
power_w,
// PSU output V/A is not yet exposed by asic-rs (roadmap G15); the tooltip
// falls back to a status string until it is.
psu_out_voltage_v: None,
psu_out_current_a: None,
// PSU info (round 17 R5/G15; ePIC exposes it today). A reported-but-zero
// output current (ePIC leaves it 0) is treated as absent so the R2 tooltip
// shows just the voltage.
psu_out_voltage_v: data.psu.as_ref().and_then(|p| p.output_voltage).filter(|&v| v > 0.0),
psu_out_current_a: data.psu.as_ref().and_then(|p| p.output_current).filter(|&a| a > 0.0),
psu_version: data
.psu
.as_ref()
.map(|p| match (&p.model, &p.version) {
(Some(m), Some(v)) => format!("{v} ({m})"),
(None, Some(v)) => v.clone(),
(Some(m), None) => m.clone(),
(None, None) => String::new(),
})
.unwrap_or_default(),
psu_voltage_min_v: data.psu.as_ref().and_then(|p| p.voltage_min),
psu_voltage_max_v: data.psu.as_ref().and_then(|p| p.voltage_max),
tuning_target_label,
power_target_min_w,
power_target_max_w,
hashrate_target_min_ths,
hashrate_target_max_ths,
tuning_percent: data.tuning_percent,
chip_temp_c,
board_temps,
@@ -810,7 +904,8 @@ pub enum ConfigAction {
Restart,
Pause,
Resume,
PowerLimit(f64), // watts
PowerLimit(f64), // watts
HashRateTarget(f64), // TH/s -- structured hashrate target (round 17 C)
TuningPercent(u8),
Timezone(String), // IANA zone, e.g. "America/Edmonton" (round 17 B / G10)
ChangePassword(String), // new web/API password (round 17 B / G11)
@@ -826,7 +921,8 @@ impl ConfigAction {
ConfigAction::Restart => "restart".into(),
ConfigAction::Pause => "pause".into(),
ConfigAction::Resume => "resume".into(),
ConfigAction::PowerLimit(w) => format!("power limit {w:.0} W"),
ConfigAction::PowerLimit(w) => format!("power target {w:.0} W"),
ConfigAction::HashRateTarget(t) => format!("hashrate target {t:.0} TH/s"),
ConfigAction::TuningPercent(p) => format!("tuning {p}%"),
ConfigAction::Timezone(tz) => format!("timezone {tz}"),
ConfigAction::ChangePassword(_) => "change password".into(),
@@ -844,6 +940,7 @@ impl ConfigAction {
ConfigAction::Pause => "pausing…".into(),
ConfigAction::Resume => "resuming…".into(),
ConfigAction::PowerLimit(_) => "setting power…".into(),
ConfigAction::HashRateTarget(_) => "setting hashrate…".into(),
ConfigAction::TuningPercent(_) => "tuning…".into(),
ConfigAction::Timezone(_) => "setting timezone…".into(),
ConfigAction::ChangePassword(_) => "changing password…".into(),
@@ -878,6 +975,28 @@ async fn apply_action(miner: &dyn Miner, action: &ConfigAction) -> Result<bool,
ConfigAction::Pause => miner.pause(None).await,
ConfigAction::Resume => miner.resume(None).await,
ConfigAction::PowerLimit(w) => miner.set_power_limit(Power::from_watts(*w)).await,
ConfigAction::HashRateTarget(ths) => {
use asic_rs::core::config::tuning::TuningConfig;
use asic_rs::core::data::hashrate::HashRateUnit;
use asic_rs::core::data::miner::TuningTarget;
// Build a HashRate target by cloning the miner's current hashrate to
// inherit its algorithm (HashAlgorithm is not publicly nameable),
// overriding value + unit.
let data = miner.get_data().await;
let Some(mut hr) = data.hashrate.clone() else {
return Err("miner reports no current hashrate; cannot set a hashrate target".into());
};
hr.value = *ths;
hr.unit = HashRateUnit::TeraHash;
let mut cfg = TuningConfig::new(TuningTarget::HashRate(hr));
// Preserve the firmware's current tuning algorithm + scaling (ePIC
// requires both for set_tuning_config; other firmware ignore them).
if let Some(algo) = miner.get_tuning_config().await.ok().and_then(|c| c.algorithm) {
cfg = cfg.with_algorithm(algo);
}
let scaling = miner.get_scaling_config().await.ok();
miner.set_tuning_config(cfg, scaling).await
}
ConfigAction::TuningPercent(p) => miner.set_tuning_percent(*p).await,
ConfigAction::Timezone(tz) => {
use asic_rs::core::config::timezone::{Tz, TimezoneConfig};
+108 -9
View File
@@ -66,6 +66,7 @@ const ID_CTX_PAUSE: i32 = 725;
const ID_CTX_RESUME: i32 = 726;
const ID_CTX_TUNING: i32 = 727;
const ID_CTX_POWER: i32 = 728;
const ID_CTX_HASHRATE: i32 = 740; // Set hashrate target (round 17 C)
const ID_CTX_RESTART: i32 = 729;
// Round 17 B: timezone / change-password / factory-reset config actions.
const ID_CTX_TIMEZONE: i32 = 737;
@@ -97,6 +98,7 @@ const ID_ACTION_CANCEL: i32 = 741;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum PromptKind {
Power,
HashRateTarget,
Tuning,
Timezone,
Password,
@@ -213,9 +215,9 @@ fn firmware_color(family: &str) -> Option<(u8, u8, u8)> {
"braiins" => (150, 90, 210), // purple
"luxos" | "lux" => (185, 150, 20), // yellow/gold
"vnish" => (40, 165, 70), // green
"bixbit" => (225, 105, 175), // pink
"bixbit" => (223, 62, 102), // pinkish-red (Bixbit logo)
"epic" | "umc os" | "umcos" | "umc" => (70, 160, 225), // ePIC PowerPlay / UMC OS: light blue
"hive" | "hiveos" => (235, 140, 35), // orange
"hive" | "hiveos" | "hiveon" => (228, 112, 24), // Hiveon: darker logo orange
"alkane" => (80, 100, 205), // navy
_ => return None, // Stock / unknown -> theme default
})
@@ -1470,8 +1472,14 @@ impl App {
if !caps.is_empty() {
let sfx = if n == 1 { String::new() } else { format!(" ({n})") };
if caps.fault_light {
menu.menu_append(ID_CTX_LIGHT_ON, &format!("Flash lights on{sfx}"));
menu.menu_append(ID_CTX_LIGHT_OFF, &format!("Flash lights off{sfx}"));
// A single state-based toggle (round 18 #9): if any selected miner's
// locate light is on, offer to stop; otherwise offer to flash.
let any_on = selected.iter().any(|r| r.light_flashing == Some(true));
if any_on {
menu.menu_append(ID_CTX_LIGHT_OFF, &format!("Stop flashing lights{sfx}"));
} else {
menu.menu_append(ID_CTX_LIGHT_ON, &format!("Flash lights{sfx}"));
}
}
if caps.pause {
menu.menu_append(ID_CTX_PAUSE, &format!("Pause mining{sfx}"));
@@ -1483,7 +1491,10 @@ impl App {
menu.menu_append(ID_CTX_TUNING, &format!("Set tuning %...{sfx}"));
}
if caps.power_limit {
menu.menu_append(ID_CTX_POWER, &format!("Set power limit...{sfx}"));
menu.menu_append(ID_CTX_POWER, &format!("Set power target...{sfx}"));
}
if caps.hashrate_target {
menu.menu_append(ID_CTX_HASHRATE, &format!("Set hashrate target...{sfx}"));
}
if caps.restart {
menu.menu_append(ID_CTX_RESTART, &format!("Restart{sfx}"));
@@ -2115,6 +2126,7 @@ impl App {
ID_CTX_RESTART => return Some(self.build_confirm_dialog(scan::ConfigAction::Restart)),
// Value entry is itself the confirmation.
ID_CTX_POWER => return Some(self.build_action_prompt(PromptKind::Power)),
ID_CTX_HASHRATE => return Some(self.build_action_prompt(PromptKind::HashRateTarget)),
ID_CTX_TUNING => return Some(self.build_action_prompt(PromptKind::Tuning)),
ID_CTX_TIMEZONE => return Some(self.build_action_prompt(PromptKind::Timezone)),
ID_CTX_PASSWORD => return Some(self.build_action_prompt(PromptKind::Password)),
@@ -2165,21 +2177,81 @@ impl App {
/// A small modal to enter a power limit (watts) or tuning percent for the
/// selection. Built here, shown modally by `dispatch` outside the App borrow.
/// The tightest common tuning envelope (max of the mins .. min of the maxes)
/// across the captured-selection miners that advertise one, plus their shared
/// current-target label ("varies" if they differ), for the target prompts
/// (round 17 C). `get` picks the (min, max) pair for the target kind.
fn selected_envelope(
&self,
get: impl Fn(&MinerRow) -> (Option<f64>, Option<f64>),
) -> (Option<(f64, f64)>, Option<String>) {
let sel = self
.rows
.iter()
.filter(|r| self.action_ips.contains(&r.ip));
let mut lo: Option<f64> = None;
let mut hi: Option<f64> = None;
let mut labels: std::collections::HashSet<String> = std::collections::HashSet::new();
for r in sel {
let (mn, mx) = get(r);
if let Some(m) = mn {
lo = Some(lo.map_or(m, |v: f64| v.max(m)));
}
if let Some(m) = mx {
hi = Some(hi.map_or(m, |v: f64| v.min(m)));
}
if let Some(l) = &r.tuning_target_label {
labels.insert(l.clone());
}
}
let range = match (lo, hi) {
(Some(a), Some(b)) if a <= b => Some((a, b)),
_ => None,
};
let label = match labels.len() {
0 => None,
1 => labels.into_iter().next(),
_ => Some("varies".to_string()),
};
(range, label)
}
fn build_action_prompt(&mut self, kind: PromptKind) -> Widget {
self.action_ips = self.selected_ip_list();
self.action_kind = kind;
let n = self.action_ips.len();
let frame = Widget::main_frame();
let title = match kind {
PromptKind::Power => "Set power limit",
PromptKind::Power => "Set power target",
PromptKind::HashRateTarget => "Set hashrate target",
PromptKind::Tuning => "Set tuning percent",
PromptKind::Timezone => "Set timezone",
PromptKind::Password => "Change password",
};
let dlg = Widget::dialog(frame, title);
let root = Widget::box_sizer(true);
// Append the current target and the advertised valid range to the target
// prompts (round 17 C), so the operator sees what the firmware will accept.
let target_hint = |range: Option<(f64, f64)>, cur: Option<String>, unit: &str| {
let mut s = String::new();
if let Some(c) = cur {
s.push_str(&format!("\nCurrent: {c}."));
}
if let Some((a, b)) = range {
s.push_str(&format!(" Valid range: {a:.0}-{b:.0} {unit}."));
}
s
};
let lbl = match kind {
PromptKind::Power => format!("Power limit in watts for {n} miner(s):"),
PromptKind::Power => {
let (range, cur) = self.selected_envelope(|r| (r.power_target_min_w, r.power_target_max_w));
format!("Power target in watts for {n} miner(s):{}", target_hint(range, cur, "W"))
}
PromptKind::HashRateTarget => {
let (range, cur) =
self.selected_envelope(|r| (r.hashrate_target_min_ths, r.hashrate_target_max_ths));
format!("Hashrate target in TH/s for {n} miner(s):{}", target_hint(range, cur, "TH/s"))
}
PromptKind::Tuning => format!("Tuning percent (0-100) for {n} miner(s):"),
PromptKind::Timezone => format!("IANA timezone (e.g. America/Edmonton) for {n} miner(s):"),
PromptKind::Password => format!("New web/API password for {n} miner(s):"),
@@ -2206,9 +2278,35 @@ impl App {
/// captured selection) so the operator can correct it.
fn apply_action_prompt(&mut self) {
let val = self.action_input.get_value();
// A target must be positive, finite, and within the advertised range when
// one exists (round 17 C).
let in_range = |v: f64, range: Option<(f64, f64)>| {
v > 0.0 && v.is_finite() && range.map_or(true, |(a, b)| v >= a && v <= b)
};
let action = match self.action_kind {
PromptKind::Power => match val.trim().parse::<f64>() {
Ok(w) if w > 0.0 && w.is_finite() => Some(scan::ConfigAction::PowerLimit(w)),
Ok(w)
if in_range(
w,
self.selected_envelope(|r| (r.power_target_min_w, r.power_target_max_w)).0,
) =>
{
Some(scan::ConfigAction::PowerLimit(w))
}
_ => None,
},
PromptKind::HashRateTarget => match val.trim().parse::<f64>() {
Ok(t)
if in_range(
t,
self.selected_envelope(|r| {
(r.hashrate_target_min_ths, r.hashrate_target_max_ths)
})
.0,
) =>
{
Some(scan::ConfigAction::HashRateTarget(t))
}
_ => None,
},
PromptKind::Tuning => match val.trim().parse::<u8>() {
@@ -2237,7 +2335,8 @@ impl App {
}
None => {
let hint = match self.action_kind {
PromptKind::Power => "enter a positive number of watts",
PromptKind::Power => "enter a number of watts within the valid range",
PromptKind::HashRateTarget => "enter a hashrate in TH/s within the valid range",
PromptKind::Tuning => "enter a percent from 0 to 100",
PromptKind::Timezone => "enter a valid IANA zone, e.g. America/Edmonton",
PromptKind::Password => "enter a non-empty password",
+202
View File
@@ -0,0 +1,202 @@
Subject: [PATCH 0018] core + epic: PSU info scan (identity, rated envelope, output V/A)
Round 17 R5/G15. asic-rs had no PSU telemetry. Adds a PsuInfo type (model,
version, rated voltage min/max, live output voltage/current) as an optional
MinerData.psu field, a DataField::Psu, and a default parse_psu(&data) -> None
that backends override.
ePIC (PowerPlay v1) populates it: DataField::Psu merges the summary "Power Supply
Stats" (tag "stats") and the capabilities "Psu Info" (tag "info"); parse_psu reads
model/FW + Min/Max Vout (millivolts -> volts) + live Output Voltage/Current.
Verified live on ePIC S19j Pro (10.4.1.6/.10): model 117, fw 22, Vmin 11.877 V,
Vmax 15.182 V, output ~13.2-13.4 V. Feeds the new PSU version/Vmin/Vmax columns
and the R2 power tooltip (output V/A). Other backends leave psu None until they
add their own parse_psu.
diff --git a/vendor/asic-rs-core/src/data/collector.rs b/vendor/asic-rs-core/src/data/collector.rs
index 93a0111a..d1456548 100644
--- a/vendor/asic-rs-core/src/data/collector.rs
+++ b/vendor/asic-rs-core/src/data/collector.rs
@@ -74,6 +74,9 @@ pub enum DataField {
/// Current power consumption in watts.
#[cfg_attr(feature = "python", pydantic(value = "Wattage"))]
Wattage,
+ /// Power-supply info (identity, rated voltage envelope, live output V/A).
+ #[cfg_attr(feature = "python", pydantic(value = "Psu"))]
+ Psu,
/// manual tuning percent of full power (100 = unthrottled).
#[cfg_attr(feature = "python", pydantic(value = "TuningPercent"))]
TuningPercent,
diff --git a/vendor/asic-rs-core/src/data/miner.rs b/vendor/asic-rs-core/src/data/miner.rs
index be6f4c8f..b2b8a578 100644
--- a/vendor/asic-rs-core/src/data/miner.rs
+++ b/vendor/asic-rs-core/src/data/miner.rs
@@ -16,6 +16,7 @@ use super::{
message::MinerMessage,
operating_state::OperatingState,
pool::PoolGroupData,
+ psu::PsuInfo,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -192,6 +193,9 @@ pub struct MinerData {
#[serde(serialize_with = "serialize_power")]
#[ts(type = "number | null")]
pub wattage: Option<Power>,
+ /// Power-supply info (identity, rated voltage envelope, live output V/A),
+ /// when the firmware reports it.
+ pub psu: Option<PsuInfo>,
/// The current manual tuning percent of full power (100 = unthrottled), where supported
pub tuning_percent: Option<u8>,
/// The current tuning target of the miner, such as power target or hashrate target
diff --git a/vendor/asic-rs-core/src/data/mod.rs b/vendor/asic-rs-core/src/data/mod.rs
index c69c43eb..3b7f98c0 100644
--- a/vendor/asic-rs-core/src/data/mod.rs
+++ b/vendor/asic-rs-core/src/data/mod.rs
@@ -15,5 +15,6 @@ pub mod message;
pub mod miner;
pub mod operating_state;
pub mod pool;
+pub mod psu;
pub(crate) mod serialize;
pub mod share;
diff --git a/vendor/asic-rs-core/src/data/psu.rs b/vendor/asic-rs-core/src/data/psu.rs
new file mode 100644
index 00000000..810ba47c
--- /dev/null
+++ b/vendor/asic-rs-core/src/data/psu.rs
@@ -0,0 +1,30 @@
+//! Power-supply (PSU) information reported by a miner's firmware.
+//!
+//! A backend fills in only what its firmware actually exposes; every field is
+//! optional. Some firmware reports the PSU's identity and rated voltage envelope
+//! (min/max output voltage), others also report the live output voltage and
+//! current. Voltages are in volts and currents in amps.
+
+#[cfg(feature = "python")]
+use pyo3::pyclass;
+use serde::{Deserialize, Serialize};
+use ts_rs::TS;
+
+/// Power-supply identity and voltage telemetry for one miner.
+#[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 PsuInfo {
+ /// PSU model / type identifier, when reported.
+ pub model: Option<String>,
+ /// PSU firmware/hardware version, when reported.
+ pub version: Option<String>,
+ /// Minimum rated output voltage in volts, when reported.
+ pub voltage_min: Option<f64>,
+ /// Maximum rated output voltage in volts, when reported.
+ pub voltage_max: Option<f64>,
+ /// Live output voltage in volts, when reported.
+ pub output_voltage: Option<f64>,
+ /// Live output current in amps, when reported.
+ pub output_current: Option<f64>,
+}
diff --git a/vendor/asic-rs-core/src/traits/miner.rs b/vendor/asic-rs-core/src/traits/miner.rs
index d08b1b5a..db1ba653 100644
--- a/vendor/asic-rs-core/src/traits/miner.rs
+++ b/vendor/asic-rs-core/src/traits/miner.rs
@@ -33,6 +33,7 @@ use crate::{
miner::{MinerData, TuningTarget},
operating_state::OperatingState,
pool::PoolGroupData,
+ psu::PsuInfo,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -272,6 +273,7 @@ impl<
let hashrate = self.parse_hashrate(&data);
let expected_hashrate = self.parse_expected_hashrate(&data);
let wattage = self.parse_wattage(&data);
+ let psu = self.parse_psu(&data);
let tuning_percent = self.parse_tuning_percent(&data);
let tuning_target = self.parse_tuning_target(&data);
let scaled_tuning_target = self.parse_scaled_tuning_target(&data);
@@ -367,6 +369,7 @@ impl<
// Power information
wattage,
+ psu,
tuning_percent,
tuning_target,
scaled_tuning_target,
@@ -720,6 +723,10 @@ pub trait GetWattage: CollectData {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
None
}
+ #[allow(unused_variables)]
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ None
+ }
}
// Tuning Percent
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 c21e05b1..3365824d 100644
--- a/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-epic/src/backends/v1/mod.rs
@@ -24,6 +24,7 @@ use asic_rs_core::{
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::unix_timestamp_secs,
@@ -436,6 +437,26 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
+ // PSU: live stats from summary + rated envelope/identity from
+ // capabilities, tagged so parse_psu can read both (round 17 R5/G15).
+ DataField::Psu => vec![
+ (
+ WEB_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Power Supply Stats"),
+ tag: Some("stats"),
+ },
+ ),
+ (
+ WEB_CAPABILITIES,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Psu Info"),
+ tag: Some("info"),
+ },
+ ),
+ ],
DataField::TuningTarget => vec![(
WEB_SUMMARY,
DataExtractor {
@@ -1095,6 +1116,25 @@ impl GetWattage for PowerPlayV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // DataField::Psu is the merged {stats: Power Supply Stats, info: Psu Info}
+ // (see get_locations). capabilities Vout + summary Target Voltage are in
+ // millivolts; summary Output Voltage/Current are already volts/amps.
+ let d = data.get(&DataField::Psu)?;
+ let stats = d.pointer("/stats");
+ let info = d.pointer("/info");
+ let f = |v: Option<&Value>, key: &str| v.and_then(|o| o.pointer(key)).and_then(tuning_value_as_f64);
+ let psu = PsuInfo {
+ model: f(info, "/PSU Type").map(|n| format!("{n:.0}")),
+ version: f(info, "/FW").map(|n| format!("{n:.0}")),
+ voltage_min: f(info, "/Min Vout").map(|mv| mv / 1000.0),
+ voltage_max: f(info, "/Max Vout").map(|mv| mv / 1000.0),
+ output_voltage: f(stats, "/Output Voltage"),
+ output_current: f(stats, "/Output Current"),
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
fn tuning_value_as_f64(value: &Value) -> Option<f64> {
@@ -0,0 +1,128 @@
Subject: [PATCH 0019] antminer v2023_07: best-share + Bixbit "Power Estimated" wattage
Round 17 R7 (found by flashing Bixbit onto fleet units). The v2023_07 stock
backend scanned hashrate/boards/temps/fans fine but reported no best-share for the
WHOLE Antminer fleet (DataField::BestShare had no get_locations entry, so it was
never fetched) and no wattage for Bixbit-based firmware (it reads the cgminer
stats power, which Bixbit leaves 0, putting the real figure in the summary as
"Power Estimated").
- Map DataField::BestShare / SessionBestShare to the cgminer summary
("Best Share" / "Best Session Share") and implement GetBestShare /
GetSessionBestShare (guard 0 -> None).
- Add the summary to DataField::Wattage under a "summary" tag and fall back to
"Power Estimated" in parse_wattage when the stats power is 0/absent. Stock
behaviour is preserved (a non-zero stats power still wins; a present-but-zero
power still reads 0 W).
Verified live: Bixbit S19j Pro (10.4.1.70) now reads wattage 2615 W + best-share
178930671 (was both blank); stock S21 Pro (10.4.1.90) now reads best-share
299464394 (was blank). 36 antminer backend tests pass; no wattage regression.
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 6d6dc593..1ac2bad1 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
@@ -521,8 +521,40 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
),
+ // Bixbit-based firmware reports Power=0 in stats but the real
+ // figure as "Power Estimated" in the cgminer summary; carry it
+ // under a "summary" tag so parse_wattage can fall back to it
+ // without colliding with the stats keys (round 17 R7).
+ (
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0"),
+ tag: Some("summary"),
+ },
+ ),
]
}
+ // Best share (all-time / session) from the cgminer summary. Antminer
+ // stock, Bixbit, and other cgminer-based firmware all report it here;
+ // it was previously unmapped, so best-share was blank fleet-wide
+ // (round 17 R7).
+ DataField::BestShare => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0/Best Share"),
+ tag: None,
+ },
+ )],
+ DataField::SessionBestShare => vec![(
+ RPC_SUMMARY,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/SUMMARY/0/Best Session Share"),
+ tag: None,
+ },
+ )],
DataField::SerialNumber => vec![
(
WEB_SYSTEM_INFO,
@@ -778,8 +810,6 @@ impl GetUptime for AntMinerV202307 {
}
}
-impl GetBestShare for AntMinerV202307 {}
-impl GetSessionBestShare for AntMinerV202307 {}
impl GetOperatingState for AntMinerV202307 {}
@@ -888,14 +918,30 @@ impl GetWattage for AntMinerV202307 {
}
}
- if let Some(power) = stats_data
+ let primary = stats_data
.get("power")
.or_else(|| stats_data.get("Power"))
// Same firmware version spells this differently per model: the
// L9 reports `power`, the L11 `watt`.
.or_else(|| stats_data.get("watt"))
+ .and_then(|v| v.as_f64());
+ if let Some(power) = primary
+ && power > 0.0
+ {
+ return Some(Power::from_watts(power));
+ }
+ // Bixbit-based firmware leaves the stats power at 0 and reports the
+ // real draw as "Power Estimated" in the summary (round 17 R7).
+ if let Some(est) = stats_data
+ .pointer("/summary/Power Estimated")
.and_then(|v| v.as_f64())
+ && est > 0.0
{
+ return Some(Power::from_watts(est));
+ }
+ // Preserve the prior behaviour: a present-but-zero stats power still
+ // reads as 0 W rather than blank.
+ if let Some(power) = primary {
return Some(Power::from_watts(power));
}
}
@@ -903,6 +949,21 @@ impl GetWattage for AntMinerV202307 {
}
}
+impl GetBestShare for AntMinerV202307 {
+ fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ // cgminer summary "Best Share" (all-time). Guard against a firmware that
+ // reports 0 when it has never found a share (round 17 R7).
+ data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
+ }
+}
+
+impl GetSessionBestShare for AntMinerV202307 {
+ fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
+ data.extract::<f64>(DataField::SessionBestShare)
+ .filter(|&v| v > 0.0)
+ }
+}
+
impl GetTuningTarget for AntMinerV202307 {
fn parse_tuning_target(&self, data: &HashMap<DataField, Value>) -> Option<TuningTarget> {
data.get(&DataField::TuningTarget)
+59
View File
@@ -0,0 +1,59 @@
Subject: [PATCH 0020] braiins v26_04: PSU info (type + rated voltage envelope)
Round 17 R5/G15 extension. BOS reports PSU info at miner/details -> psu_info
{version, min_voltage.volt, max_voltage.volt}. Map DataField::Psu to it and parse
model (the "version" type code, 117 = the same APW12 ePIC reports) + voltage
min/max. Verified live on Braiins S19j Pro (10.4.1.83/.27): model 117, Vmin
11.96 V, Vmax 15.2 V.
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 e65fb201..9b72ed94 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
@@ -22,6 +22,7 @@ use asic_rs_core::{
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
};
@@ -294,6 +295,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
+ // PSU identity + rated voltage envelope (round 17 R5/G15). BOS reports
+ // it at miner/details -> psu_info {version, min_voltage, max_voltage}.
+ DataField::Psu => vec![(
+ WEB_MINER_DETAILS,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/psu_info"),
+ tag: None,
+ },
+ )],
DataField::TuningTarget => vec![
(
WEB_MINER_CONFIGURATION,
@@ -663,6 +674,22 @@ impl GetWattage for BraiinsV2604 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<i64, _>(DataField::Wattage, |w| Power::from_watts(w as f64))
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // BOS miner/details -> psu_info {version, min_voltage.volt, max_voltage.volt}.
+ // "version" is the PSU type code (117 = the APW12 ePIC also reports as model
+ // 117), so expose it as the model for consistency across firmwares.
+ let d = data.get(&DataField::Psu)?;
+ let psu = PsuInfo {
+ model: d.pointer("/version").and_then(|v| v.as_i64()).map(|n| n.to_string()),
+ version: None,
+ voltage_min: d.pointer("/min_voltage/volt").and_then(|v| v.as_f64()),
+ voltage_max: d.pointer("/max_voltage/volt").and_then(|v| v.as_f64()),
+ output_voltage: None,
+ output_current: None,
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
impl GetTuningTarget for BraiinsV2604 {
@@ -0,0 +1,173 @@
Subject: [PATCH 0021] whatsminer v1/v2: PSU info + fix pre-existing parse_messages test
Round 17 R5/G15 extension. get_psu /Msg exposes the PSU model + hw/sw version
(no DC output voltage or rated envelope). Map DataField::Psu to it in v1 and v2
and parse model + version. Verified live on a WhatsMiner M30S+ (10.8.1.214, v2):
model P221C, version H20201205. (v3 uses a different /msg/power shape and no v3
unit was available to verify, so it is left for a follow-up.)
Also fixes a pre-existing test bug: test_whatsminer_v1_parse_messages asserted 2
messages but never mocked get_error_code (its only source since patch 0012), so it
returned 0 and failed whenever the vendored backend tests were run (CI runs only
the GUI selftest, so it went unnoticed). Adds a get_error_code.json mock. v1 tests
now 41/41.
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 67907049..3c8512ad 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v1/mod.rs
@@ -18,6 +18,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
};
@@ -193,6 +194,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
+ // PSU identity from get_psu (round 17 R5/G15). WhatsMiner exposes the
+ // model + hw/sw version but not a DC output voltage or rated envelope.
+ DataField::Psu => vec![(
+ RPC_GET_PSU,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Msg"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
RPC_DEVS,
DataExtractor {
@@ -463,6 +474,22 @@ impl GetWattage for WhatsMinerV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // get_psu /Msg -> {model, hw_version, sw_version, ...} (values are strings).
+ // No DC output voltage or rated envelope is exposed, so only identity is set.
+ let d = data.get(&DataField::Psu)?;
+ let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
+ let psu = PsuInfo {
+ model: s("/model").or_else(|| s("/name")),
+ version: s("/hw_version").or_else(|| s("/sw_version")),
+ voltage_min: None,
+ voltage_max: None,
+ output_voltage: None,
+ output_current: None,
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
impl GetTuningTarget for WhatsMinerV1 {
fn parse_tuning_target(&self, data: &HashMap<DataField, Value>) -> Option<TuningTarget> {
@@ -805,8 +832,8 @@ mod integration_tests {
use super::*;
use crate::test::json::v1::{
- DEVS_COMMAND, GET_PSU_COMMAND, GET_VERSION_COMMAND, POOLS_COMMAND, STATUS_COMMAND,
- SUMMARY_COMMAND, SUMMARY_WITH_ERRORS_COMMAND,
+ DEVS_COMMAND, GET_ERROR_CODE_COMMAND, GET_PSU_COMMAND, GET_VERSION_COMMAND, POOLS_COMMAND,
+ STATUS_COMMAND, SUMMARY_COMMAND, SUMMARY_WITH_ERRORS_COMMAND,
};
#[tokio::test]
@@ -943,6 +970,13 @@ mod integration_tests {
},
Value::from_str(GET_PSU_COMMAND)?,
);
+ results.insert(
+ MinerCommand::RPC {
+ command: "get_error_code",
+ parameters: None,
+ },
+ Value::from_str(GET_ERROR_CODE_COMMAND)?,
+ );
let mock_api = MockAPIClient::new(results);
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 096b2fcb..de36a126 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/backends/v2/mod.rs
@@ -20,6 +20,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
+ psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -205,6 +206,15 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
+ // PSU identity from get_psu (round 17 R5/G15): model + hw/sw version.
+ DataField::Psu => vec![(
+ RPC_GET_PSU,
+ DataExtractor {
+ func: get_by_pointer,
+ key: Some("/Msg"),
+ tag: None,
+ },
+ )],
DataField::Hashboards => vec![(
RPC_DEVS,
DataExtractor {
@@ -471,6 +481,22 @@ impl GetWattage for WhatsMinerV2 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
+
+ fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
+ // get_psu /Msg -> {model, hw_version, sw_version} (string values). No DC
+ // output voltage or rated envelope is exposed, so only identity is set.
+ let d = data.get(&DataField::Psu)?;
+ let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
+ let psu = PsuInfo {
+ model: s("/model").or_else(|| s("/name")),
+ version: s("/hw_version").or_else(|| s("/sw_version")),
+ voltage_min: None,
+ voltage_max: None,
+ output_voltage: None,
+ output_current: None,
+ };
+ (psu != PsuInfo::default()).then_some(psu)
+ }
}
/// Parses tuning target from V2 summary data.
/// Low/High → MiningMode, Normal/unknown/empty → Power(limit).
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/get_error_code.json b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/get_error_code.json
new file mode 100644
index 00000000..1d87b18b
--- /dev/null
+++ b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/get_error_code.json
@@ -0,0 +1,16 @@
+{
+ "Code": 131,
+ "Description": "",
+ "Msg": {
+ "error_code": [
+ {
+ "110": "2024-06-15 09:15:00"
+ },
+ {
+ "600": "2024-06-15 10:30:00"
+ }
+ ]
+ },
+ "STATUS": "S",
+ "When": 1773871985
+}
diff --git a/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs
index 0b3442db..c94c354f 100644
--- a/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs
+++ b/vendor/asic-rs-firmwares-whatsminer/src/test/json/v1/mod.rs
@@ -6,4 +6,5 @@ pub(crate) const POOLS_COMMAND: &str = include_str!("pools.json");
pub(crate) const DEVS_COMMAND: &str = include_str!("devs.json");
pub(crate) const GET_VERSION_COMMAND: &str = include_str!("get_version.json");
pub(crate) const GET_PSU_COMMAND: &str = include_str!("get_psu.json");
+pub(crate) const GET_ERROR_CODE_COMMAND: &str = include_str!("get_error_code.json");
pub(crate) const SUMMARY_WITH_ERRORS_COMMAND: &str = include_str!("summary_with_errors.json");
@@ -335,14 +335,15 @@ int DrawShape(wxDC* dc, wxUniChar shape, wxCoord x, const wxRect& cell,
if (h < 8) h = 8;
int w = (sv->vbh > 0) ? (int)((double)h * sv->vbw / sv->vbh + 0.5) : h;
if (w < 1) w = 1;
// The Font Awesome fan glyph fills its square box more than the other health
// icons (brain/chip/bolt), so at the shared size it reads as oversized. Draw
// it a bit smaller, centred in its full-size slot, so the slot advance and the
// per-icon tooltip hit-test (both keyed to the full width) are unchanged
// (round 17 R1).
// The Font Awesome fan and brain glyphs fill their square box more than the
// other health icons (chip/bolt), so at the shared size they read as oversized.
// Draw them a bit smaller, centred in their full-size slot, so the slot advance
// and the per-icon tooltip hit-test (both keyed to the full width) are
// unchanged (round 17 R1; round 18 #1 brain).
int dw = w, dh = h;
if (shape == SHAPE_FAN) {
dh = (int)(h * 0.80 + 0.5);
double glyph_scale = (shape == SHAPE_FAN) ? 0.80 : (shape == SHAPE_BRAIN) ? 0.82 : 1.0;
if (glyph_scale < 1.0) {
dh = (int)(h * glyph_scale + 0.5);
if (dh < 8) dh = 8;
dw = (sv->vbh > 0) ? (int)((double)dh * sv->vbw / sv->vbh + 0.5) : dh;
if (dw < 1) dw = 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":"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":"d6816919357d770f9ae6dedea66bbfdec9ab0f4c8391f9928b90039b668ee026","src/data/capabilities.rs":"29cbab6262fb8888b30b4674a30ef03983e005b4e18eefddfbbf9c568e1e1e17","src/data/collector.rs":"792489f8292863a7d57b9867096349d3257ddaf5bb0b5317e7a4366aa1b9dec9","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":"9d9e47a33753956fcfef7a5fb2a8eb315464aed41fe25be41acb36dd223a0880","src/data/message.rs":"7b399ab1a0b6e43e61a5461d29a2752beed2d1fd7b214eb891572f8994d47c11","src/data/miner.rs":"641ed29589112fdecf96a2065b05a1878af2a08bb60bff5e624bf56cc08e4a3a","src/data/mod.rs":"620b6876d0c88ad80c4aad1ed8ce8f8c4a76641c1e1c61e02cff115b1ab1da55","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":"b198869b22a5e56366014a4090946cb44e9cddda32e77c62e57a90ceec8f1348","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":"d6816919357d770f9ae6dedea66bbfdec9ab0f4c8391f9928b90039b668ee026","src/data/capabilities.rs":"29cbab6262fb8888b30b4674a30ef03983e005b4e18eefddfbbf9c568e1e1e17","src/data/collector.rs":"dea53811c7c4f6dc2ba0ae5aab3b7bae9a06dfc9df0eef79117074845a0bf91f","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":"9d9e47a33753956fcfef7a5fb2a8eb315464aed41fe25be41acb36dd223a0880","src/data/message.rs":"7b399ab1a0b6e43e61a5461d29a2752beed2d1fd7b214eb891572f8994d47c11","src/data/miner.rs":"b07fc087b56cdaba6202a0dd23a1bf14d82f1907a7e3a5424aa98113b73c4fe5","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":"7ed55e9b085ea156357d0519c42e2b622e89fa2f81458bc73c42b6cfc6a94819","src/traits/mod.rs":"61406c4d2603299e4bad57c6f90115cadf93cee50a857bbfbb00d99f3a6873ac","src/traits/model.rs":"efde2b5cae4c4f018436bb68b236f354b5a733f7dafdeaf3f1c534b469a22d64","src/util.rs":"53255c65e85b97236cb34b452e2cb522edf377f49d2232645e0e0e33c447bb23"},"package":"1f25e625fc4c645ce995c5609a9fdff6f047d6a5e4d6be9dc167999a43197f58"}
+3
View File
@@ -74,6 +74,9 @@ pub enum DataField {
/// Current power consumption in watts.
#[cfg_attr(feature = "python", pydantic(value = "Wattage"))]
Wattage,
/// Power-supply info (identity, rated voltage envelope, live output V/A).
#[cfg_attr(feature = "python", pydantic(value = "Psu"))]
Psu,
/// manual tuning percent of full power (100 = unthrottled).
#[cfg_attr(feature = "python", pydantic(value = "TuningPercent"))]
TuningPercent,
+4
View File
@@ -16,6 +16,7 @@ use super::{
message::MinerMessage,
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
};
use crate::data::{
deserialize::deserialize_macaddr,
@@ -192,6 +193,9 @@ pub struct MinerData {
#[serde(serialize_with = "serialize_power")]
#[ts(type = "number | null")]
pub wattage: Option<Power>,
/// Power-supply info (identity, rated voltage envelope, live output V/A),
/// when the firmware reports it.
pub psu: Option<PsuInfo>,
/// The current manual tuning percent of full power (100 = unthrottled), where supported
pub tuning_percent: Option<u8>,
/// The current tuning target of the miner, such as power target or hashrate target
+1
View File
@@ -15,5 +15,6 @@ pub mod message;
pub mod miner;
pub mod operating_state;
pub mod pool;
pub mod psu;
pub(crate) mod serialize;
pub mod share;
+30
View File
@@ -0,0 +1,30 @@
//! Power-supply (PSU) information reported by a miner's firmware.
//!
//! A backend fills in only what its firmware actually exposes; every field is
//! optional. Some firmware reports the PSU's identity and rated voltage envelope
//! (min/max output voltage), others also report the live output voltage and
//! current. Voltages are in volts and currents in amps.
#[cfg(feature = "python")]
use pyo3::pyclass;
use serde::{Deserialize, Serialize};
use ts_rs::TS;
/// Power-supply identity and voltage telemetry for one miner.
#[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 PsuInfo {
/// PSU model / type identifier, when reported.
pub model: Option<String>,
/// PSU firmware/hardware version, when reported.
pub version: Option<String>,
/// Minimum rated output voltage in volts, when reported.
pub voltage_min: Option<f64>,
/// Maximum rated output voltage in volts, when reported.
pub voltage_max: Option<f64>,
/// Live output voltage in volts, when reported.
pub output_voltage: Option<f64>,
/// Live output current in amps, when reported.
pub output_current: Option<f64>,
}
+7
View File
@@ -33,6 +33,7 @@ use crate::{
miner::{MinerData, TuningTarget},
operating_state::OperatingState,
pool::PoolGroupData,
psu::PsuInfo,
},
traits::firmware::MinerFirmware,
traits::model::MinerModel,
@@ -272,6 +273,7 @@ impl<
let hashrate = self.parse_hashrate(&data);
let expected_hashrate = self.parse_expected_hashrate(&data);
let wattage = self.parse_wattage(&data);
let psu = self.parse_psu(&data);
let tuning_percent = self.parse_tuning_percent(&data);
let tuning_target = self.parse_tuning_target(&data);
let scaled_tuning_target = self.parse_scaled_tuning_target(&data);
@@ -367,6 +369,7 @@ impl<
// Power information
wattage,
psu,
tuning_percent,
tuning_target,
scaled_tuning_target,
@@ -720,6 +723,10 @@ pub trait GetWattage: CollectData {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
None
}
#[allow(unused_variables)]
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
None
}
}
// Tuning Percent
+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":"efcaa6b186c8b6e79e9799a647291b895c5ff59f058722e98455ef68bc97c548","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":"278e4dd04a753858e12df96ead3522aef0616ebf6f27b3da4f1a12b064c19ee6","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":"efcaa6b186c8b6e79e9799a647291b895c5ff59f058722e98455ef68bc97c548","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"}
@@ -521,8 +521,40 @@ impl GetDataLocations for AntMinerV202307 {
tag: None,
},
),
// Bixbit-based firmware reports Power=0 in stats but the real
// figure as "Power Estimated" in the cgminer summary; carry it
// under a "summary" tag so parse_wattage can fall back to it
// without colliding with the stats keys (round 17 R7).
(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0"),
tag: Some("summary"),
},
),
]
}
// Best share (all-time / session) from the cgminer summary. Antminer
// stock, Bixbit, and other cgminer-based firmware all report it here;
// it was previously unmapped, so best-share was blank fleet-wide
// (round 17 R7).
DataField::BestShare => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0/Best Share"),
tag: None,
},
)],
DataField::SessionBestShare => vec![(
RPC_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/SUMMARY/0/Best Session Share"),
tag: None,
},
)],
DataField::SerialNumber => vec![
(
WEB_SYSTEM_INFO,
@@ -778,8 +810,6 @@ impl GetUptime for AntMinerV202307 {
}
}
impl GetBestShare for AntMinerV202307 {}
impl GetSessionBestShare for AntMinerV202307 {}
impl GetOperatingState for AntMinerV202307 {}
@@ -888,21 +918,52 @@ impl GetWattage for AntMinerV202307 {
}
}
if let Some(power) = stats_data
let primary = stats_data
.get("power")
.or_else(|| stats_data.get("Power"))
// Same firmware version spells this differently per model: the
// L9 reports `power`, the L11 `watt`.
.or_else(|| stats_data.get("watt"))
.and_then(|v| v.as_f64())
.and_then(|v| v.as_f64());
if let Some(power) = primary
&& power > 0.0
{
return Some(Power::from_watts(power));
}
// Bixbit-based firmware leaves the stats power at 0 and reports the
// real draw as "Power Estimated" in the summary (round 17 R7).
if let Some(est) = stats_data
.pointer("/summary/Power Estimated")
.and_then(|v| v.as_f64())
&& est > 0.0
{
return Some(Power::from_watts(est));
}
// Preserve the prior behaviour: a present-but-zero stats power still
// reads as 0 W rather than blank.
if let Some(power) = primary {
return Some(Power::from_watts(power));
}
}
None
}
}
impl GetBestShare for AntMinerV202307 {
fn parse_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
// cgminer summary "Best Share" (all-time). Guard against a firmware that
// reports 0 when it has never found a share (round 17 R7).
data.extract::<f64>(DataField::BestShare).filter(|&v| v > 0.0)
}
}
impl GetSessionBestShare for AntMinerV202307 {
fn parse_session_best_share(&self, data: &HashMap<DataField, Value>) -> Option<f64> {
data.extract::<f64>(DataField::SessionBestShare)
.filter(|&v| v > 0.0)
}
}
impl GetTuningTarget for AntMinerV202307 {
fn parse_tuning_target(&self, data: &HashMap<DataField, Value>) -> Option<TuningTarget> {
data.get(&DataField::TuningTarget)
File diff suppressed because one or more lines are too long
@@ -22,6 +22,7 @@ use asic_rs_core::{
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
};
@@ -294,6 +295,16 @@ impl GetDataLocations for BraiinsV2604 {
tag: None,
},
)],
// PSU identity + rated voltage envelope (round 17 R5/G15). BOS reports
// it at miner/details -> psu_info {version, min_voltage, max_voltage}.
DataField::Psu => vec![(
WEB_MINER_DETAILS,
DataExtractor {
func: get_by_pointer,
key: Some("/psu_info"),
tag: None,
},
)],
DataField::TuningTarget => vec![
(
WEB_MINER_CONFIGURATION,
@@ -663,6 +674,22 @@ impl GetWattage for BraiinsV2604 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<i64, _>(DataField::Wattage, |w| Power::from_watts(w as f64))
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
// BOS miner/details -> psu_info {version, min_voltage.volt, max_voltage.volt}.
// "version" is the PSU type code (117 = the APW12 ePIC also reports as model
// 117), so expose it as the model for consistency across firmwares.
let d = data.get(&DataField::Psu)?;
let psu = PsuInfo {
model: d.pointer("/version").and_then(|v| v.as_i64()).map(|n| n.to_string()),
version: None,
voltage_min: d.pointer("/min_voltage/volt").and_then(|v| v.as_f64()),
voltage_max: d.pointer("/max_voltage/volt").and_then(|v| v.as_f64()),
output_voltage: None,
output_current: None,
};
(psu != PsuInfo::default()).then_some(psu)
}
}
impl GetTuningTarget for BraiinsV2604 {
+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":"fff17902f8fa033d5b67c6131ea2ff01b80f9a9c8e02dd0511e1e87521d23e47","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":"dff1b68393fd0a065dc67a16219654f279cbfb9adad2eaea35caedea26df989f","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"}
+40
View File
@@ -24,6 +24,7 @@ use asic_rs_core::{
miner::TuningTarget,
operating_state::OperatingState,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::unix_timestamp_secs,
@@ -436,6 +437,26 @@ impl GetDataLocations for PowerPlayV1 {
tag: None,
},
)],
// PSU: live stats from summary + rated envelope/identity from
// capabilities, tagged so parse_psu can read both (round 17 R5/G15).
DataField::Psu => vec![
(
WEB_SUMMARY,
DataExtractor {
func: get_by_pointer,
key: Some("/Power Supply Stats"),
tag: Some("stats"),
},
),
(
WEB_CAPABILITIES,
DataExtractor {
func: get_by_pointer,
key: Some("/Psu Info"),
tag: Some("info"),
},
),
],
DataField::TuningTarget => vec![(
WEB_SUMMARY,
DataExtractor {
@@ -1095,6 +1116,25 @@ impl GetWattage for PowerPlayV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
// DataField::Psu is the merged {stats: Power Supply Stats, info: Psu Info}
// (see get_locations). capabilities Vout + summary Target Voltage are in
// millivolts; summary Output Voltage/Current are already volts/amps.
let d = data.get(&DataField::Psu)?;
let stats = d.pointer("/stats");
let info = d.pointer("/info");
let f = |v: Option<&Value>, key: &str| v.and_then(|o| o.pointer(key)).and_then(tuning_value_as_f64);
let psu = PsuInfo {
model: f(info, "/PSU Type").map(|n| format!("{n:.0}")),
version: f(info, "/FW").map(|n| format!("{n:.0}")),
voltage_min: f(info, "/Min Vout").map(|mv| mv / 1000.0),
voltage_max: f(info, "/Max Vout").map(|mv| mv / 1000.0),
output_voltage: f(stats, "/Output Voltage"),
output_current: f(stats, "/Output Current"),
};
(psu != PsuInfo::default()).then_some(psu)
}
}
fn tuning_value_as_f64(value: &Value) -> Option<f64> {
+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":"3a8bdecd1eb271de474b2aca85b5f8e598ba64fe5defc9c8dd9b8c66444a2ed4","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"68fd8c1762b424a7785174fdb3ae4fede1d599632657808d4b7c76bcfbfb202c","src/backends/v2/rpc.rs":"52f8d504c236009b020bf33b5550236e36d07b2c73a15bdcfcafa5188e4e1cb6","src/backends/v3/mod.rs":"f19e673c47c2cc366e2ff7782bca93daf750563d62221a12a043b3ee79a15251","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":"e79509eee78a1fef63735afe385299813726822c8259a02d1dcf5e8b4db9d04e","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":"1ada5892a5758e97d315b7e6550623bd1cf7062c84e701a7145fe4e9b84068a3","src/backends/v1/rpc.rs":"72f9b67c2389ab6e9968e0eb340bd2b6aad9aaf059f4429eb31398863bb87f42","src/backends/v2/mod.rs":"b9c23ad19f8921052b909d4f98e989ee0d0cecc4bd738f47e80404eb3d762656","src/backends/v2/rpc.rs":"52f8d504c236009b020bf33b5550236e36d07b2c73a15bdcfcafa5188e4e1cb6","src/backends/v3/mod.rs":"f19e673c47c2cc366e2ff7782bca93daf750563d62221a12a043b3ee79a15251","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"}
+36 -2
View File
@@ -18,6 +18,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::TuningTarget,
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
};
@@ -193,6 +194,16 @@ impl GetDataLocations for WhatsMinerV1 {
tag: None,
},
)],
// PSU identity from get_psu (round 17 R5/G15). WhatsMiner exposes the
// model + hw/sw version but not a DC output voltage or rated envelope.
DataField::Psu => vec![(
RPC_GET_PSU,
DataExtractor {
func: get_by_pointer,
key: Some("/Msg"),
tag: None,
},
)],
DataField::Hashboards => vec![(
RPC_DEVS,
DataExtractor {
@@ -463,6 +474,22 @@ impl GetWattage for WhatsMinerV1 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
// get_psu /Msg -> {model, hw_version, sw_version, ...} (values are strings).
// No DC output voltage or rated envelope is exposed, so only identity is set.
let d = data.get(&DataField::Psu)?;
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
let psu = PsuInfo {
model: s("/model").or_else(|| s("/name")),
version: s("/hw_version").or_else(|| s("/sw_version")),
voltage_min: None,
voltage_max: None,
output_voltage: None,
output_current: None,
};
(psu != PsuInfo::default()).then_some(psu)
}
}
impl GetTuningTarget for WhatsMinerV1 {
fn parse_tuning_target(&self, data: &HashMap<DataField, Value>) -> Option<TuningTarget> {
@@ -805,8 +832,8 @@ mod integration_tests {
use super::*;
use crate::test::json::v1::{
DEVS_COMMAND, GET_PSU_COMMAND, GET_VERSION_COMMAND, POOLS_COMMAND, STATUS_COMMAND,
SUMMARY_COMMAND, SUMMARY_WITH_ERRORS_COMMAND,
DEVS_COMMAND, GET_ERROR_CODE_COMMAND, GET_PSU_COMMAND, GET_VERSION_COMMAND, POOLS_COMMAND,
STATUS_COMMAND, SUMMARY_COMMAND, SUMMARY_WITH_ERRORS_COMMAND,
};
#[tokio::test]
@@ -943,6 +970,13 @@ mod integration_tests {
},
Value::from_str(GET_PSU_COMMAND)?,
);
results.insert(
MinerCommand::RPC {
command: "get_error_code",
parameters: None,
},
Value::from_str(GET_ERROR_CODE_COMMAND)?,
);
let mock_api = MockAPIClient::new(results);
@@ -20,6 +20,7 @@ use asic_rs_core::{
message::{MessageSeverity, MinerMessage},
miner::{MiningMode, TuningTarget},
pool::{PoolData, PoolGroupData, PoolURL},
psu::PsuInfo,
},
traits::{miner::*, model::MinerModel},
util::is_expected_write_error,
@@ -205,6 +206,15 @@ impl GetDataLocations for WhatsMinerV2 {
tag: None,
},
)],
// PSU identity from get_psu (round 17 R5/G15): model + hw/sw version.
DataField::Psu => vec![(
RPC_GET_PSU,
DataExtractor {
func: get_by_pointer,
key: Some("/Msg"),
tag: None,
},
)],
DataField::Hashboards => vec![(
RPC_DEVS,
DataExtractor {
@@ -471,6 +481,22 @@ impl GetWattage for WhatsMinerV2 {
fn parse_wattage(&self, data: &HashMap<DataField, Value>) -> Option<Power> {
data.extract_map::<f64, _>(DataField::Wattage, Power::from_watts)
}
fn parse_psu(&self, data: &HashMap<DataField, Value>) -> Option<PsuInfo> {
// get_psu /Msg -> {model, hw_version, sw_version} (string values). No DC
// output voltage or rated envelope is exposed, so only identity is set.
let d = data.get(&DataField::Psu)?;
let s = |k: &str| d.pointer(k).and_then(|v| v.as_str()).filter(|s| !s.is_empty()).map(str::to_string);
let psu = PsuInfo {
model: s("/model").or_else(|| s("/name")),
version: s("/hw_version").or_else(|| s("/sw_version")),
voltage_min: None,
voltage_max: None,
output_voltage: None,
output_current: None,
};
(psu != PsuInfo::default()).then_some(psu)
}
}
/// Parses tuning target from V2 summary data.
/// Low/High → MiningMode, Normal/unknown/empty → Power(limit).
@@ -0,0 +1,16 @@
{
"Code": 131,
"Description": "",
"Msg": {
"error_code": [
{
"110": "2024-06-15 09:15:00"
},
{
"600": "2024-06-15 10:30:00"
}
]
},
"STATUS": "S",
"When": 1773871985
}
@@ -6,4 +6,5 @@ pub(crate) const POOLS_COMMAND: &str = include_str!("pools.json");
pub(crate) const DEVS_COMMAND: &str = include_str!("devs.json");
pub(crate) const GET_VERSION_COMMAND: &str = include_str!("get_version.json");
pub(crate) const GET_PSU_COMMAND: &str = include_str!("get_psu.json");
pub(crate) const GET_ERROR_CODE_COMMAND: &str = include_str!("get_error_code.json");
pub(crate) const SUMMARY_WITH_ERRORS_COMMAND: &str = include_str!("summary_with_errors.json");