gui hex stuff

skot · Feb 26, 2024 · fb20a75 · fb20a75
1 parent e561f60
commit fb20a75
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
     "idf.flashType": "UART",
-    "idf.portWin": "COM30",
+    "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
@@ -96,11 +96,11 @@ <h5>Power</h5>
                         Power
                     </div>
 
-                    <div class="col-4">
-                        <p-knob [min]="4.5" [max]="5.5" [readonly]="true" [(ngModel)]="info.voltage"
-                            valueTemplate="{value}V"></p-knob>
+                    <div class="col-4" *ngIf="inputVoltage$ | async as inputVoltage">
+                        <p-knob [min]="inputVoltage.min" [max]="inputVoltage.max" [readonly]="true"
+                            [(ngModel)]="info.voltage" valueTemplate="{value}V"></p-knob>
                         Input Voltage
-                        <span class="danger" *ngIf="info.voltage < 4.8">&nbsp; Danger: Low voltage</span>
+
                     </div>
 
                     <div class="col-4">
@@ -201,4 +201,4 @@ <h5>Pool Information</h5>
     </div>
 
 
-</ng-container>
+</ng-container>
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
@@ -24,6 +24,8 @@ export class HomeComponent {
   public dataData: number[] = [];
   public chartData?: any;
 
+  public inputVoltage$: Observable<{ min: number, max: number }>;
+
   constructor(
     private systemService: SystemService
   ) {
@@ -134,17 +136,26 @@ export class HomeComponent {
     this.expectedHashRate$ = this.info$.pipe(map(info => {
       if (info.ASICModel === eASICModel.BM1366) {
         const version = parseInt(info.boardVersion);
-        if (version >= 400 && version < 500) {
-          return (info.frequency * ((894 * 6) / 1000))
+        if (version >= 300 && version < 400) {
+          return Math.floor((info.frequency * ((894 * 6) / 1000)))
         } else {
-          return (info.frequency * (894 / 1000))
+          return Math.floor((info.frequency * (894 / 1000)))
         }
       } else if (info.ASICModel === eASICModel.BM1397) {
-        return (info.frequency * (672 / 1000))
+        return Math.floor((info.frequency * (672 / 1000)))
       }
 
       return undefined;
 
+    }));
+
+    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(