Skip to content

Commit 4cc350a

Browse files
authored
Merge pull request #7 from Advanced-Crypto-Services/v2.5.1_Prerelease_Uptade1
V2.5.1 prerelease update1
2 parents cca078b + 9caeca5 commit 4cc350a

File tree

2 files changed

+11
-22
lines changed

2 files changed

+11
-22
lines changed

main/http_server/axe-os/src/app/components/settings/settings.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ export class SettingsComponent {
137137
const file = event.files[0];
138138
this.firmwareUpload.clear(); // clear the file upload component
139139

140-
if (file.name != 'esp-miner.bin') {
141-
this.toastrService.error('Incorrect file, looking for esp-miner.bin.', 'Error');
140+
if (file.name != 'acs-esp-miner.bin') {
141+
this.toastrService.error('Incorrect file, looking for acs-esp-miner.bin.', 'Error');
142142
return;
143143
}
144144

main/lvglDisplayBAP.c

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -404,18 +404,8 @@ esp_err_t lvglUpdateDisplayDeviceStatusBAP(GlobalState *GLOBAL_STATE)
404404
esp_err_t ret;
405405
bool hasChanges = false;
406406

407-
// LVGL_REG_FLAGS (0x50)
408-
uint8_t flags = (module->FOUND_BLOCK ? 0x01 : 0) |
409-
(module->startup_done ? 0x02 : 0) |
410-
(module->overheat_mode ? 0x04 : 0);
411-
412-
if (lastFlags != flags) {
413-
ret = sendRegisterDataBAP(LVGL_REG_FLAGS, &flags, 1);
414-
if (ret != ESP_OK) return ret;
415-
416-
lastFlags = flags;
417-
hasChanges = true;
418-
}
407+
// LVGL_REG_FLAGS (0x50) (No Longer used. See serperated flags)
408+
419409

420410
// LVGL_REG_DEVICE_INFO (0x52)
421411

@@ -434,16 +424,14 @@ esp_err_t lvglUpdateDisplayDeviceStatusBAP(GlobalState *GLOBAL_STATE)
434424
lastBoardInfo[sizeof(lastBoardInfo) - 1] = '\0';
435425
}
436426

437-
// LVGL_REG_CLOCK_SYNC (0x54)
438-
if (lastClockSync != module->lastClockSync) {
439-
if (sizeof(uint32_t) + 2 > MAX_BUFFER_SIZE_BAP) return ESP_ERR_NO_MEM;
440-
ret = sendRegisterDataBAP(LVGL_REG_CLOCK_SYNC, &module->lastClockSync, sizeof(uint32_t));
441-
if (ret != ESP_OK) return ret;
427+
// New Flags 0x0E to
442428

443-
lastClockSync = module->lastClockSync;
444-
hasChanges = true;
429+
if (GLOBAL_STATE->SYSTEM_MODULE.FOUND_BLOCK) {
430+
sendRegisterDataBAP(LVGL_FLAG_FOUND_BLOCK, &GLOBAL_STATE->SYSTEM_MODULE.FOUND_BLOCK, sizeof(uint8_t));
431+
}
432+
if (GLOBAL_STATE->SYSTEM_MODULE.overheat_mode) {
433+
sendRegisterDataBAP(LVGL_FLAG_OVERHEAT_MODE, &GLOBAL_STATE->SYSTEM_MODULE.overheat_mode, sizeof(uint8_t));
445434
}
446-
447435
return ESP_OK;
448436
}
449437

@@ -677,6 +665,7 @@ int16_t SERIAL_rx_BAP(uint8_t *buf, uint16_t size, uint16_t timeout_ms)
677665
break;
678666
default:
679667
ESP_LOGI("Serial BAP", "Received unknown register");
668+
ESP_LOGI("Serial BAP", "RAW HEX: %02X", buf[3]);
680669
break;
681670
}
682671
}

0 commit comments

Comments
 (0)