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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions Cargo.lock

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

10 changes: 10 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ members = [
"asic-rs-makes/avalon",
"asic-rs-makes/bitaxe",
"asic-rs-makes/braiins",
"asic-rs-makes/elphapex",
"asic-rs-makes/epic",
"asic-rs-makes/futurebit",
"asic-rs-makes/nerdaxe",
Expand All @@ -45,6 +46,7 @@ members = [
"asic-rs-firmwares/avalonminer",
"asic-rs-firmwares/bitaxe",
"asic-rs-firmwares/braiins",
"asic-rs-firmwares/elphapex",
"asic-rs-firmwares/epic",
"asic-rs-firmwares/luxminer",
"asic-rs-firmwares/marathon",
Expand All @@ -68,6 +70,7 @@ asic-rs-makes-auradine = { path = "asic-rs-makes/auradine", version = "0.7.2" }
asic-rs-makes-avalon = { path = "asic-rs-makes/avalon", version = "0.7.2" }
asic-rs-makes-bitaxe = { path = "asic-rs-makes/bitaxe", version = "0.7.2" }
asic-rs-makes-braiins = { path = "asic-rs-makes/braiins", version = "0.7.2" }
asic-rs-makes-elphapex = { path = "asic-rs-makes/elphapex", version = "0.7.2" }
asic-rs-makes-epic = { path = "asic-rs-makes/epic", version = "0.7.2" }
asic-rs-makes-futurebit = { path = "asic-rs-makes/futurebit", version = "0.7.2" }
asic-rs-makes-nerdaxe = { path = "asic-rs-makes/nerdaxe", version = "0.7.2" }
Expand All @@ -83,6 +86,7 @@ asic-rs-firmwares-auradine = { path = "asic-rs-firmwares/auradine", version = "0
asic-rs-firmwares-avalonminer = { path = "asic-rs-firmwares/avalonminer", version = "0.7.2" }
asic-rs-firmwares-bitaxe = { path = "asic-rs-firmwares/bitaxe", version = "0.7.2" }
asic-rs-firmwares-braiins = { path = "asic-rs-firmwares/braiins", version = "0.7.2" }
asic-rs-firmwares-elphapex = { path = "asic-rs-firmwares/elphapex", version = "0.7.2" }
asic-rs-firmwares-epic = { path = "asic-rs-firmwares/epic", version = "0.7.2" }
asic-rs-firmwares-luxminer = { path = "asic-rs-firmwares/luxminer", version = "0.7.2" }
asic-rs-firmwares-marathon = { path = "asic-rs-firmwares/marathon", version = "0.7.2" }
Expand Down Expand Up @@ -152,6 +156,7 @@ default = [
"avalonminer",
"bitaxe",
"braiins",
"elphapex",
"epic",
"luxminer",
"marathon",
Expand All @@ -170,6 +175,7 @@ auradine = ["dep:asic-rs-firmwares-auradine"]
avalonminer = ["dep:asic-rs-firmwares-avalonminer"]
bitaxe = ["dep:asic-rs-firmwares-bitaxe"]
braiins = ["dep:asic-rs-firmwares-braiins"]
elphapex = ["dep:asic-rs-firmwares-elphapex"]
epic = ["dep:asic-rs-firmwares-epic"]
luxminer = ["dep:asic-rs-firmwares-luxminer"]
marathon = ["dep:asic-rs-firmwares-marathon"]
Expand All @@ -191,6 +197,7 @@ python = [
"asic-rs-makes-avalon/python",
"asic-rs-makes-bitaxe/python",
"asic-rs-makes-braiins/python",
"asic-rs-makes-elphapex/python",
"asic-rs-makes-epic/python",
"asic-rs-makes-futurebit/python",
"asic-rs-makes-nerdaxe/python",
Expand All @@ -205,6 +212,7 @@ python = [
"asic-rs-firmwares-avalonminer?/python",
"asic-rs-firmwares-bitaxe?/python",
"asic-rs-firmwares-braiins?/python",
"asic-rs-firmwares-elphapex?/python",
"asic-rs-firmwares-epic?/python",
"asic-rs-firmwares-luxminer?/python",
"asic-rs-firmwares-marathon?/python",
Expand All @@ -225,6 +233,7 @@ asic-rs-makes-auradine.workspace = true
asic-rs-makes-avalon.workspace = true
asic-rs-makes-bitaxe.workspace = true
asic-rs-makes-braiins.workspace = true
asic-rs-makes-elphapex.workspace = true
asic-rs-makes-epic.workspace = true
asic-rs-makes-futurebit.workspace = true
asic-rs-makes-nerdaxe.workspace = true
Expand All @@ -240,6 +249,7 @@ asic-rs-firmwares-auradine = { workspace = true, optional = true }
asic-rs-firmwares-avalonminer = { workspace = true, optional = true }
asic-rs-firmwares-bitaxe = { workspace = true, optional = true }
asic-rs-firmwares-braiins = { workspace = true, optional = true }
asic-rs-firmwares-elphapex = { workspace = true, optional = true }
asic-rs-firmwares-epic = { workspace = true, optional = true }
asic-rs-firmwares-luxminer = { workspace = true, optional = true }
asic-rs-firmwares-marathon = { workspace = true, optional = true }
Expand Down
6 changes: 3 additions & 3 deletions asic-rs-firmwares/bitaxe/src/backends/v2_0_0/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,17 @@ impl WebAPIClient for BitaxeWebAPI {
Ok(json_data) => return Ok(json_data),
Err(e) => {
if attempt == self.retries {
return Err(BitaxeError::ParseError(e.to_string()))?;
Err(BitaxeError::ParseError(e.to_string()))?;
}
}
}
} else if attempt == self.retries {
return Err(BitaxeError::HttpError(response.status().as_u16()))?;
Err(BitaxeError::HttpError(response.status().as_u16()))?;
}
}
Err(e) => {
if attempt == self.retries {
return Err(e)?;
Err(e)?;
}
}
}
Expand Down
29 changes: 29 additions & 0 deletions asic-rs-firmwares/elphapex/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[package]
name = "asic-rs-firmwares-elphapex"
version.workspace = true
edition.workspace = true
license.workspace = true
description = "Elphapex firmware implementation for asic-rs"

[lints]
workspace = true

[dependencies]
asic-rs-core.workspace = true
asic-rs-makes-elphapex.workspace = true

anyhow.workspace = true
async-trait.workspace = true
diqwest.workspace = true
macaddr.workspace = true
measurements.workspace = true
once_cell.workspace = true
reqwest.workspace = true
semver.workspace = true
serde_json.workspace = true
tokio.workspace = true

pyo3 = { workspace = true, optional = true }

[features]
python = ["dep:pyo3", "asic-rs-core/python"]
17 changes: 17 additions & 0 deletions asic-rs-firmwares/elphapex/src/backends/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
use std::net::IpAddr;

use asic_rs_core::traits::{
miner::{Miner, MinerConstructor},
model::MinerModel,
};
use v1::ElphapexV1;

pub mod v1;

pub struct Elphapex;

impl MinerConstructor for Elphapex {
fn new(ip: IpAddr, model: impl MinerModel, _: Option<semver::Version>) -> Box<dyn Miner> {
Box::new(ElphapexV1::new(ip, model))
}
}
Loading