diff --git a/.vscode/settings.json b/.vscode/settings.json index c856832..270eaeb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "idf.flashType": "UART", - "idf.portWin": "COM3", + "idf.portWin": "COM72", "idf.adapterTargetName": "esp32s3", "idf.openOcdConfigs": [ "interface/ftdi/esp32_devkitj_v1.cfg", diff --git a/main/http_server/axe-os/only-gzip.js b/main/http_server/axe-os/only-gzip.js index 707e34c..bd78cec 100644 --- a/main/http_server/axe-os/only-gzip.js +++ b/main/http_server/axe-os/only-gzip.js @@ -4,13 +4,27 @@ const path = require('path'); const directory = './dist/axe-os'; fs.readdir(directory, (err, files) => { - if (err) throw err; + if (err) throw err; - for (const file of files) { - if (!file.endsWith('.gz')) { - fs.unlink(path.join(directory, file), err => { - if (err) throw err; - }); + for (const file of files) { + const filePath = path.join(directory, file); + + fs.stat(filePath, (err, stats) => { + if (err) throw err; + + if (stats.isDirectory()) { + // If it's a directory, call rmdir after deleting its contents + fs.rmdir(filePath, { recursive: true }, (err) => { + if (err) throw err; + console.log(`Removed directory: ${filePath}`); + }); + } else if (!file.endsWith('.gz')) { + // If it's a file and doesn't end with .gz, unlink it + fs.unlink(filePath, (err) => { + if (err) throw err; + console.log(`Removed file: ${filePath}`); + }); + } + }); } - } -}); \ No newline at end of file +}); 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 604700b..f3c7d7d 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 @@ -3,206 +3,172 @@ -
-
-
-
-
-
-
- Hash Rate -
{{info.hashRate * 1000000000 | hashSuffix}} -
-
-
- +
+
+
+
+
+ Hash Rate +
{{info.hashRate * 1000000000 | hashSuffix}}
- - {{expectedHashRate * 1000000000 | hashSuffix}} - expected -
+ + {{expectedHashRate * 1000000000 | + hashSuffix}} + expected +
-
-
-
-
- Shares -
{{info.sharesAccepted | number: '1.0-0'}}
-
-
- +
+
+
+
+
+ Efficiency +
+ {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH +
- {{info.sharesRejected | number: '1.0-0'}} - rejected
+ + {{info.power / (expectedHashRate/1000) | number: + '1.2-2'}} J/TH + + expected + +
-
-
-
-
- Efficiency -
- {{info.power / (info.hashRate/1000) | number: '1.2-2'}} J/TH - -
-
-
- +
+
+
+
+
+ Shares +
{{info.sharesAccepted | number: '1.0-0'}}
- - {{info.power / (expectedHashRate/1000) | number: '1.2-2'}} J/TH - - expected - -
+ {{info.sharesRejected | number: '1.0-0'}} + rejected
-
-
-
-
- Best Difficulty -
{{info.bestDiff}} - all-time best -
-
-
- -
-
- {{info.bestSessionDiff}} - since system boot - -
-
-
+
+
+
+
+ Best Difficulty +
{{info.bestDiff}} + all-time best +
+
+
+ {{info.bestSessionDiff}} + since system boot + +
+
+
+
+
+
-
+
-
Power
-
-
- - Power +

Power

+
+
+
Power {{info.power}} W
+ + +
-
- - Input Voltage +
+ +
Input Voltage {{info.voltage}} V
+ + + +   Danger: Low voltage
-
- - ASIC Voltage Requested +
+ + +
ASIC Frequency {{info.frequency}} Mhz
+ + +
+
+ +
Measured ASIC Voltage {{info.coreVoltageActual}} V
+ + + +
+
-
+
-
Heat
-
-
- - - ASIC Temperature +

Heat

+
+
+ +
ASIC Temperature {{info.temp}}°C
+ + +   Danger: High Temperature
-
- - Voltage Regulator Temperature +
+ +
Voltage Regulator Temperature {{info.vrTemp}}°C
+ + +   Danger: High Temperature
-
- - Fan % +
+
Fan Speed{{info.fanspeed}}% ({{info.fanrpm}} RPM)
+ + +
-
- - Fan RPM -
-
-
-
-
Performance
-
-
- - ASIC Frequency (MHz) -
-
- - ASIC Voltage Measured -
- - -
- -
-
- - -
@@ -212,7 +178,8 @@ URL: - {{info.stratumURL}} + {{info.stratumURL}} @@ -228,7 +195,9 @@ URL: - {{info.fallbackStratumURL}} + {{info.fallbackStratumURL}} @@ -248,4 +217,4 @@
- + \ No newline at end of file diff --git a/main/http_server/axe-os/src/app/layout/app.footer.component.html b/main/http_server/axe-os/src/app/layout/app.footer.component.html index 3311946..7b86dc3 100644 --- a/main/http_server/axe-os/src/app/layout/app.footer.component.html +++ b/main/http_server/axe-os/src/app/layout/app.footer.component.html @@ -1,3 +1,3 @@ -