highperfocused/ESP-Miner
1
0
Fork 0
mirror of https://github.com/skot/ESP-Miner.git synced 2025-03-26 17:51:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix naming discrepancy

Browse Source
This commit is contained in:
WantClue 2024-08-09 21:55:13 +02:00
parent 6101b3e6c2
commit 7c46ad3ed0
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/http_server/axe-os/src/app/components/edit/edit.component.html
View File

@ -149,9 +149,9 @@
<div class="col-12 md:col-4" *ngIf="form.get('overheat')?.value === 1">
<div class="field-checkbox">
<p-checkbox name="overheat" formControlName="overheat" inputId="overheat"
<p-checkbox name="overheat_mode" formControlName="overheat_mode" inputId="overheat_mode"
[binary]="true"></p-checkbox>
<label for="overheat">Disable Overheat Mode. Make sure to reset Frequency and Voltage</label>
<label for="overheat_mode">Disable Overheat Mode. Make sure to reset Frequency and Voltage</label>
</div>
</div>

4
main/http_server/axe-os/src/app/components/edit/edit.component.ts
View File

@ -137,7 +137,7 @@ export class EditComponent implements OnInit {
autofanspeed: [info.autofanspeed == 1, [Validators.required]],
invertfanpolarity: [info.invertfanpolarity == 1, [Validators.required]],
fanspeed: [info.fanspeed, [Validators.required]],
overheat: [info.overheat, [Validators.required]]
overheat_mode: [info.overheat_mode, [Validators.required]]
});
this.form.controls['autofanspeed'].valueChanges.pipe(
@ -175,7 +175,7 @@ export class EditComponent implements OnInit {
delete form.stratumPassword;
}
form.overheat = form.overheat ? 1 : 0;
form.overheat_mode = form.overheat_mode ? 1 : 0;
this.systemService.updateSystem(this.uri, form)
.pipe(this.loadingService.lockUIUntilComplete())

2
main/http_server/axe-os/src/app/services/system.service.ts
View File

@ -57,7 +57,7 @@ export class SystemService {
boardtemp1: 30,
boardtemp2: 40,
overheat: 0
overheat_mode: 0
}
).pipe(delay(1000));
}

2
main/http_server/axe-os/src/models/ISystemInfo.ts
View File

@ -37,5 +37,5 @@ export interface ISystemInfo {
boardtemp1?: number,
boardtemp2?: number,
overheat: number
overheat_mode: number
}

4
main/http_server/http_server.c
View File

@ -296,7 +296,7 @@ static esp_err_t PATCH_update_settings(httpd_req_t * req)
if ((item = cJSON_GetObjectItem(root, "flipscreen")) != NULL) {
nvs_config_set_u16(NVS_CONFIG_FLIP_SCREEN, item->valueint);
}
if ((item = cJSON_GetObjectItem(root, "overheat")) != NULL) {
if ((item = cJSON_GetObjectItem(root, "overheat_mode")) != NULL) {
nvs_config_set_u16(NVS_CONFIG_OVERHEAT_MODE, 0);
}
if ((item = cJSON_GetObjectItem(root, "invertscreen")) != NULL) {
@ -415,7 +415,7 @@ static esp_err_t GET_system_info(httpd_req_t * req)
cJSON_AddStringToObject(root, "runningPartition", esp_ota_get_running_partition()->label);
cJSON_AddNumberToObject(root, "flipscreen", nvs_config_get_u16(NVS_CONFIG_FLIP_SCREEN, 1));
cJSON_AddNumberToObject(root, "overheat", nvs_config_get_u16(NVS_CONFIG_OVERHEAT_MODE,0));
cJSON_AddNumberToObject(root, "overheat_mode", nvs_config_get_u16(NVS_CONFIG_OVERHEAT_MODE,0));
cJSON_AddNumberToObject(root, "invertscreen", nvs_config_get_u16(NVS_CONFIG_INVERT_SCREEN, 0));
cJSON_AddNumberToObject(root, "invertfanpolarity", nvs_config_get_u16(NVS_CONFIG_INVERT_FAN_POLARITY, 1));