consolidate fan rpm

skot · Nov 1, 2024 · a3e3f95 · a3e3f95
1 parent aa16c01
commit a3e3f95
Showing 1 changed file with 4 additions and 10 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
@@ -100,7 +100,9 @@ <h6>Power <span style="float: right;">{{info.power}} W</span></h6>
 
                         <h6>Input Voltage <span style="float: right;">{{info.voltage}} V</span></h6>
                         <p-progressBar [value]="(info.voltage / 5.5) * 100" [style]="{ height: '6px' }" >
-                            <ng-template pTemplate="content" let-value></ng-template>
+                            <ng-template pTemplate="content" let-value>
+                                test
+                            </ng-template>
                         </p-progressBar>
                         <span class="danger" *ngIf="info.voltage < 4.8">&nbsp; Danger: Low voltage</span>
                     </div>
@@ -157,19 +159,11 @@ <h6>Voltage Regulator Temperature <span style="float: right;">{{info.vrTemp}}&de
                             High Temperature</span>
                     </div>
                     <div class="col-12">
-                        <h6>Fan Speed<span style="float: right;">{{info.fanspeed}}%</span></h6>
+                        <h6>Fan Speed<span style="float: right;">{{info.fanspeed}}%  ({{info.fanrpm}} RPM)</span></h6>
                         <p-progressBar [value]="info.fanspeed" [style]="{ height: '6px' }" >
                             <ng-template pTemplate="content" let-value></ng-template>
                         </p-progressBar>
                     </div>
-                    <div class="col-12">
-
-
-                        <h6>Fan RPM <span style="float: right;">{{info.fanrpm}}RPM</span></h6>
-                        <p-progressBar [value]="(info.fanrpm / 8000) * 100" [style]="{ height: '6px' }" >
-                            <ng-template pTemplate="content" let-value></ng-template>
-                        </p-progressBar>
-                    </div>
                 </div>
             </div>
         </div>