Merge branch 'skot:master' into screensaver_timeout

skot · Nov 28, 2024 · f3b42be · f3b42be
2 parents b6f7d12 + a26cacf
commit f3b42be
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 104 deletions.
diff --git a/components/stratum/stratum_api.c b/components/stratum/stratum_api.c
@@ -37,11 +37,11 @@ void STRATUM_V1_initialize_buffer()
 {
     json_rpc_buffer = malloc(BUFFER_SIZE);
     json_rpc_buffer_size = BUFFER_SIZE;
-    memset(json_rpc_buffer, 0, BUFFER_SIZE);
     if (json_rpc_buffer == NULL) {
         printf("Error: Failed to allocate memory for buffer\n");
         exit(1);
     }
+    memset(json_rpc_buffer, 0, BUFFER_SIZE);
 }
 
 void cleanup_stratum_buffer()
@@ -235,7 +235,7 @@ void STRATUM_V1_parse(StratumApiV1Message * message, const char * stratum_json)
         }
         new_work->merkle_branches = malloc(HASH_SIZE * new_work->n_merkle_branches);
         for (size_t i = 0; i < new_work->n_merkle_branches; i++) {
-            hex2bin(cJSON_GetArrayItem(merkle_branch, i)->valuestring, new_work->merkle_branches + HASH_SIZE * i, HASH_SIZE * 2);
+            hex2bin(cJSON_GetArrayItem(merkle_branch, i)->valuestring, new_work->merkle_branches + HASH_SIZE * i, HASH_SIZE);
         }
 
         new_work->version = strtoul(cJSON_GetArrayItem(params, 5)->valuestring, NULL, 16);

diff --git a/main/http_server/axe-os/src/app/components/network/network.component.scss b/main/http_server/axe-os/src/app/components/network/network.component.scss
@@ -1,35 +0,0 @@
-input[type="text"],
-input[type="number"],
-input[type="password"],
-input[type="range"] {
-    min-width: 250px;
-    max-width: 90%;
-}
-
-select {
-    min-width: 268px;
-    max-width: 90%;
-}
-
-.restart {
-    margin-bottom: 1.5rem;
-
-}
-
-@media only screen and (min-width:900px) {
-
-    input[type="text"],
-    input[type="password"],
-    input[type="number"],
-    input[type="range"] {
-        min-width: 500px
-    }
-
-    select {
-        min-width: 518px
-    }
-}
-
-a {
-    color: white;
-}

diff --git a/main/http_server/axe-os/src/app/components/network/network.component.ts b/main/http_server/axe-os/src/app/components/network/network.component.ts
@@ -1,62 +1,10 @@
-import { HttpErrorResponse, HttpEventType } from '@angular/common/http';
 import { Component } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ToastrService } from 'ngx-toastr';
-import { map, Observable, shareReplay, startWith } from 'rxjs';
-import { LoadingService } from 'src/app/services/loading.service';
-import { SystemService } from 'src/app/services/system.service';
 
 @Component({
   selector: 'app-network',
   templateUrl: './network.component.html',
-  styleUrls: ['./network.component.scss']
+  styleUrls: ['./network.component.scss'],
 })
 export class NetworkComponent {
-
-  public form!: FormGroup;
-
-  public info$: Observable<any>;
-
-  constructor(
-    private fb: FormBuilder,
-    private systemService: SystemService,
-    private toastr: ToastrService,
-    private toastrService: ToastrService,
-    private loadingService: LoadingService,
-  ) {
-    this.info$ = this.systemService.getInfo().pipe(shareReplay({refCount: true, bufferSize: 1}))
-
-      this.info$.pipe(this.loadingService.lockUIUntilComplete())
-      .subscribe(info => {
-        this.form = this.fb.group({
-          hostname: [info.hostname, [Validators.required]],
-          ssid: [info.ssid, [Validators.required]],
-          wifiPass: ['*****'],
-        });
-      });
-
-  }
-
-  public updateSystem() {
-
-    const form = this.form.getRawValue();
-
-    // Allow an empty wifi password
-    form.wifiPass = form.wifiPass == null ? '' : form.wifiPass;
-
-    if (form.wifiPass === '*****') {
-      delete form.wifiPass;
-    }
-
-    this.systemService.updateSystem(undefined, form)
-      .pipe(this.loadingService.lockUIUntilComplete())
-      .subscribe({
-        next: () => {
-          this.toastr.success('Success!', 'Saved.');
-        },
-        error: (err: HttpErrorResponse) => {
-          this.toastr.error('Error.', `Could not save. ${err.message}`);
-        }
-      });
-  }
+  constructor() {}
 }
diff --git a/main/http_server/axe-os/src/app/components/settings/settings.component.html b/main/http_server/axe-os/src/app/components/settings/settings.component.html
@@ -35,7 +35,7 @@ <h2>Latest Release: {{latestRelease.name}}</h2>
         <div class="card">
             <h2>Update Firmware <span *ngIf="firmwareUpdateProgress != null">{{firmwareUpdateProgress}}%</span></h2>
             <!-- <input type="file" id="file" (change)="otaUpdate($event)" accept=".bin"> -->
-            <p-fileUpload [customUpload]="true" mode="basic" accept=".bin" (uploadHandler)="otaUpdate($event)"
+            <p-fileUpload #firmwareUpload [customUpload]="true" mode="basic" accept=".bin" (uploadHandler)="otaUpdate($event)"
                 [auto]="true" chooseLabel="Browse"></p-fileUpload>
 
             <small>(esp-miner.bin)</small>
@@ -46,7 +46,7 @@ <h2>Update Firmware <span *ngIf="firmwareUpdateProgress != null">{{firmwareUpdat
         <div class="card">
             <h2>Update Website <span *ngIf="websiteUpdateProgress != null">{{websiteUpdateProgress}}%</span></h2>
 
-            <p-fileUpload [customUpload]="true" mode="basic" accept=".bin" (uploadHandler)="otaWWWUpdate($event)"
+            <p-fileUpload #websiteUpload [customUpload]="true" mode="basic" accept=".bin" (uploadHandler)="otaWWWUpdate($event)"
                 [auto]="true" chooseLabel="Browse"></p-fileUpload>
 
             <small>(www.bin)</small>

diff --git a/main/http_server/axe-os/src/app/components/settings/settings.component.ts b/main/http_server/axe-os/src/app/components/settings/settings.component.ts
@@ -1,8 +1,8 @@
 import { HttpErrorResponse, HttpEventType } from '@angular/common/http';
-import { Component } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ToastrService } from 'ngx-toastr';
-import { FileUploadHandlerEvent } from 'primeng/fileupload';
+import { FileUploadHandlerEvent, FileUpload } from 'primeng/fileupload';
 import { map, Observable, shareReplay, startWith } from 'rxjs';
 import { GithubUpdateService } from 'src/app/services/github-update.service';
 import { LoadingService } from 'src/app/services/loading.service';
@@ -31,6 +31,9 @@ export class SettingsComponent {
 
   public info$: Observable<any>;
 
+  @ViewChild('firmwareUpload') firmwareUpload!: FileUpload;
+  @ViewChild('websiteUpload') websiteUpload!: FileUpload;
+
   constructor(
     private fb: FormBuilder,
     private systemService: SystemService,
@@ -133,7 +136,8 @@ export class SettingsComponent {
 
   otaUpdate(event: FileUploadHandlerEvent) {
     const file = event.files[0];
-
+    this.firmwareUpload.clear(); // clear the file upload component
+
     if (file.name != 'esp-miner.bin') {
       this.toastrService.error('Incorrect file, looking for esp-miner.bin.', 'Error');
       return;
@@ -169,6 +173,8 @@ export class SettingsComponent {
 
   otaWWWUpdate(event: FileUploadHandlerEvent) {
     const file = event.files[0];
+    this.websiteUpload.clear(); // clear the file upload component
+
     if (file.name != 'www.bin') {
       this.toastrService.error('Incorrect file, looking for www.bin.', 'Error');
       return;
@@ -183,22 +189,23 @@ export class SettingsComponent {
             this.websiteUpdateProgress = Math.round((event.loaded / (event.total as number)) * 100);
           } else if (event.type === HttpEventType.Response) {
             if (event.ok) {
+              this.toastrService.success('Website updated', 'Success!');
               setTimeout(() => {
-                this.toastrService.success('Website updated', 'Success!');
                 window.location.reload();
-              }, 1000);
-
+              }, 2000);
             } else {
               this.toastrService.error(event.statusText, 'Error');
             }
           }
           else if (event instanceof HttpErrorResponse)
           {
-            this.toastrService.error(event.error, 'Error');
+            const errorMessage = event.error?.message || event.message || 'Unknown error occurred';
+            this.toastrService.error(errorMessage, 'Error');
           }
         },
         error: (err) => {
-          this.toastrService.error(err.error, 'Error');
+          const errorMessage = err.error?.message || err.message || 'Unknown error occurred';
+          this.toastrService.error(errorMessage, 'Error');
         },
         complete: () => {
           this.websiteUpdateProgress = null;

diff --git a/main/http_server/axe-os/src/app/services/system.service.ts b/main/http_server/axe-os/src/app/services/system.service.ts
@@ -93,14 +93,13 @@ export class SystemService {
             'Content-Type': 'application/octet-stream', // Set the content type
           },
         }).subscribe({
-          next: (e) => {
-
+          next: (event) => {
+            subscriber.next(event);
           },
           error: (err) => {
             subscriber.error(err)
           },
           complete: () => {
-            subscriber.next()
             subscriber.complete();
           }
         });

diff --git a/main/tasks/power_management_task.c b/main/tasks/power_management_task.c
@@ -171,6 +171,7 @@ void POWER_MANAGEMENT_task(void * pvParameters)
                     nvs_config_set_u16(NVS_CONFIG_ASIC_FREQ, 50);
                     nvs_config_set_u16(NVS_CONFIG_FAN_SPEED, 100);
                     nvs_config_set_u16(NVS_CONFIG_AUTO_FAN_SPEED, 0);
+                    nvs_config_set_u16(NVS_CONFIG_OVERHEAT_MODE, 1);
                     exit(EXIT_FAILURE);
                 }
                 break;