From 8c243567653aebefd7a67970f20d85f9d20286e0 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 25 Feb 2024 23:37:55 -0500 Subject: [PATCH] gui hex stuff --- .vscode/settings.json | 2 +- .../src/app/components/home/home.component.html | 10 +++++----- .../axe-os/src/app/components/home/home.component.ts | 11 +++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c856832a..2a53c42a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "idf.flashType": "UART", - "idf.portWin": "COM3", + "idf.portWin": "COM49", "idf.adapterTargetName": "esp32s3", "idf.openOcdConfigs": [ "interface/ftdi/esp32_devkitj_v1.cfg", 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 d3432644..f8a00b89 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 @@ -100,11 +100,11 @@ Power -
- +
+ Input Voltage -   Danger: Low voltage +
@@ -274,4 +274,4 @@
- + \ No newline at end of file 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 f3ea5177..f72691fb 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 @@ -24,6 +24,8 @@ export class HomeComponent { public dataData: number[] = []; public chartData?: any; + public inputVoltage$: Observable<{ min: number, max: number }>; + constructor( private systemService: SystemService ) { @@ -133,6 +135,15 @@ export class HomeComponent { this.expectedHashRate$ = this.info$.pipe(map(info => { return Math.floor(info.frequency * ((info.coreCount * info.asicCount) / 1000)) + })); + + this.inputVoltage$ = this.info$.pipe(map(info => { + const version = parseInt(info.boardVersion); + if (version >= 300 && version < 400) { + return { min: 11, max: 13 }; + } else { + return { min: 4.5, max: 5.5 }; + } })) this.quickLink$ = this.info$.pipe(