From 198570ad9f4f4fdf0b1249aa8157d2099c53d0c7 Mon Sep 17 00:00:00 2001 From: mrv777 Date: Fri, 10 Jan 2025 22:49:21 -0600 Subject: [PATCH 1/3] fix: Move avg hash to card & add eff avg --- .../app/components/home/home.component.html | 33 +++++++++------- .../src/app/components/home/home.component.ts | 38 +++++++++---------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/main/http_server/axe-os/src/app/components/home/home.component.html b/main/http_server/axe-os/src/app/components/home/home.component.html index 17ded93d0..d89458b97 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.html +++ b/main/http_server/axe-os/src/app/components/home/home.component.html @@ -19,14 +19,20 @@

Loading...

Hash Rate -
{{info.hashRate * 1000000000 | hashSuffix}} +
+ {{info.hashRate * 1000000000 | hashSuffix}} + + ({{expectedHashRate * 1000000000 | hashSuffix}} expected) +
- - {{expectedHashRate * 1000000000 | - hashSuffix}} - expected + + + Average: + + {{calculateAverage(hashrateData) | hashSuffix}} +
@@ -36,19 +42,20 @@

Loading...

Efficiency
- {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH - + {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH + + ({{info.power / (expectedHashRate/1000) | number: '1.2-2'}} J/TH expected) +
- - {{info.power / (expectedHashRate/1000) | number: - '1.2-2'}} J/TH + + + Average: + + {{calculateEfficiencyAverage(hashrateData, powerData) | number: '1.2-2'}} J/TH - expected -
diff --git a/main/http_server/axe-os/src/app/components/home/home.component.ts b/main/http_server/axe-os/src/app/components/home/home.component.ts index b5fa507c0..13f72d8ce 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.ts +++ b/main/http_server/axe-os/src/app/components/home/home.component.ts @@ -23,7 +23,7 @@ export class HomeComponent { public dataLabel: number[] = []; public hashrateData: number[] = []; public temperatureData: number[] = []; - public dataDataAverage: number[] = []; + public powerData: number[] = []; public chartData?: any; public maxPower: number = 50; @@ -97,19 +97,6 @@ export class HomeComponent { yAxisID: 'y', fill: true, }, - { - type: 'line', - label: 'Average Hashrate', - data: [], - fill: false, - backgroundColor: primaryColor + '30', - borderColor: primaryColor + '60', - tension: 0, - pointRadius: 0, - borderWidth: 2, - borderDash: [5, 5], - yAxisID: 'y', - }, { type: 'line', label: 'ASIC Temp', @@ -203,21 +190,20 @@ export class HomeComponent { tap(info => { this.hashrateData.push(info.hashRate * 1000000000); this.temperatureData.push(info.temp); + this.powerData.push(info.power); this.dataLabel.push(new Date().getTime()); if (this.hashrateData.length >= 720) { this.hashrateData.shift(); + this.temperatureData.shift(); + this.powerData.shift(); this.dataLabel.shift(); } this.chartData.labels = this.dataLabel; this.chartData.datasets[0].data = this.hashrateData; - this.chartData.datasets[2].data = this.temperatureData; - - // Calculate average hashrate and fill the array with the same value for the average line - const averageHashrate = this.calculateAverage(this.hashrateData); - this.chartData.datasets[1].data = Array(this.hashrateData.length).fill(averageHashrate); + this.chartData.datasets[1].data = this.temperatureData; this.chartData = { ...this.chartData @@ -255,7 +241,7 @@ export class HomeComponent { } - private calculateAverage(data: number[]): number { + public calculateAverage(data: number[]): number { if (data.length === 0) return 0; const sum = data.reduce((sum, value) => sum + value, 0); return sum / data.length; @@ -283,4 +269,16 @@ export class HomeComponent { } return stratumURL.startsWith('http') ? stratumURL : `http://${stratumURL}`; } + + public calculateEfficiencyAverage(hashrateData: number[], powerData: number[]): number { + if (hashrateData.length === 0 || powerData.length === 0) return 0; + + // Calculate efficiency for each data point and average them + const efficiencies = hashrateData.map((hashrate, index) => { + const power = powerData[index] || 0; + return power / (hashrate/1000000000000); // Convert to J/TH + }); + + return this.calculateAverage(efficiencies); + } } From ed78904b59bbbe032bddfa619730102a26739ed3 Mon Sep 17 00:00:00 2001 From: mrv777 Date: Sat, 11 Jan 2025 14:27:11 -0600 Subject: [PATCH 2/3] fix: Try different layout --- .../app/components/home/home.component.html | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/main/http_server/axe-os/src/app/components/home/home.component.html b/main/http_server/axe-os/src/app/components/home/home.component.html index d89458b97..75c26a0b6 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.html +++ b/main/http_server/axe-os/src/app/components/home/home.component.html @@ -19,10 +19,13 @@

Loading...

Hash Rate -
- {{info.hashRate * 1000000000 | hashSuffix}} - - ({{expectedHashRate * 1000000000 | hashSuffix}} expected) +
+ + {{info.hashRate * 1000000000 | hashSuffix}} + + +
Expected
+
{{expectedHashRate * 1000000000 | hashSuffix}}
@@ -41,10 +44,13 @@

Loading...

Efficiency -
- {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH - - ({{info.power / (expectedHashRate/1000) | number: '1.2-2'}} J/TH expected) +
+ + {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH + + +
Expected
+
{{info.power / (expectedHashRate/1000) | number: '1.2-2'}} J/TH
@@ -63,7 +69,7 @@

Loading...

Shares -
{{info.sharesAccepted | number: '1.0-0'}} +
{{info.sharesAccepted | number: '1.0-0'}}
@@ -77,8 +83,8 @@

Loading...

Best Difficulty -
{{info.bestDiff}} - all-time best +
{{info.bestDiff}} + all-time best
From 9224bd80829a6b6fcd9ff47e82c64ee5217e11f7 Mon Sep 17 00:00:00 2001 From: mrv777 Date: Wed, 15 Jan 2025 22:46:26 -0600 Subject: [PATCH 3/3] fix: Move expected to under avg --- .../src/app/components/home/home.component.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main/http_server/axe-os/src/app/components/home/home.component.html b/main/http_server/axe-os/src/app/components/home/home.component.html index 75c26a0b6..104989a40 100644 --- a/main/http_server/axe-os/src/app/components/home/home.component.html +++ b/main/http_server/axe-os/src/app/components/home/home.component.html @@ -23,10 +23,6 @@

Loading...

{{info.hashRate * 1000000000 | hashSuffix}} - -
Expected
-
{{expectedHashRate * 1000000000 | hashSuffix}}
-
@@ -37,6 +33,10 @@

Loading...

{{calculateAverage(hashrateData) | hashSuffix}} + +
+ Expected: {{expectedHashRate * 1000000000 | hashSuffix}} +
@@ -48,10 +48,6 @@

Loading...

{{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH - -
Expected
-
{{info.power / (expectedHashRate/1000) | number: '1.2-2'}} J/TH
-
@@ -62,6 +58,10 @@

Loading...

{{calculateEfficiencyAverage(hashrateData, powerData) | number: '1.2-2'}} J/TH + +
+ Expected: {{info.power / (expectedHashRate/1000) | number: '1.2-2'}} J/TH +