andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

restart option partitionname, console-command set service

Browse Source
This commit is contained in:
MichaelDvP
2024-03-15 14:42:47 +01:00
parent 77ad209ce1
commit eec3b3be7a
4 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/system.cpp
View File

@@ -261,31 +261,40 @@ void System::store_nvs_values() {
}
// restart EMS-ESP
void System::system_restart(const bool other_partition) {
if (other_partition) {
LOG_INFO("Restarting EMS-ESP to other partition...");
void System::system_restart(const char * partitionname) {
#ifndef EMSESP_STANDALONE
if (partitionname != nullptr) {
const esp_partition_t * partition = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_FACTORY, NULL);
if (partition && strcmp(partition->label, partitionname) == 0) {
esp_ota_set_boot_partition(partition);
} else if (strcmp(esp_ota_get_running_partition()->label, partitionname) != 0) {
partition = esp_ota_get_next_update_partition(NULL);
if (!partition) {
LOG_ERROR("Partition '%s' not found", partitionname);
return;
}
if (strcmp(partition->label, partitionname) != 0 && strcmp(partitionname, "boot") != 0) {
partition = esp_ota_get_next_update_partition(partition);
if (!partition || strcmp(partition->label, partitionname)) {
LOG_ERROR("Partition '%s' not found", partitionname);
return;
}
}
uint64_t buffer;
esp_partition_read(partition, 0, &buffer, 8);
if (buffer == 0xFFFFFFFFFFFFFFFF) { // partition empty
LOG_ERROR("Partition '%s' is empty, not bootable", partition->label);
return;
}
esp_ota_set_boot_partition(partition);
}
LOG_INFO("Restarting EMS-ESP from partition '%s'", partitionname);
} else {
LOG_INFO("Restarting EMS-ESP...");
}
store_nvs_values();
Shell::loop_all();
delay(1000); // wait a second
#ifndef EMSESP_STANDALONE
if (other_partition) {
// check for factory partiton
const esp_partition_t * partition = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_FACTORY, NULL);
if (!partition) {
partition = esp_ota_get_next_update_partition(NULL);
}
if (partition) {
uint64_t buffer;
esp_partition_read(partition, 0, &buffer, 8);
if (buffer != 0xFFFFFFFFFFFFFFFF) { // partition not empty
esp_ota_set_boot_partition(partition);
}
}
}
ESP.restart();
#endif
}
@@ -477,8 +486,8 @@ void System::button_OnDblClick(PButton & b) {
// button long press
void System::button_OnLongPress(PButton & b) {
LOG_NOTICE("Button pressed - long press - boot to other partition");
EMSESP::system_.system_restart(true);
LOG_NOTICE("Button pressed - long press - restart other partition");
EMSESP::system_.system_restart("boot");
}
// button indefinite press
@@ -1533,10 +1542,10 @@ bool System::load_board_profile(std::vector<int8_t> & data, const std::string &
// restart command - perform a hard reset
bool System::command_restart(const char * value, const int8_t id) {
if (value[0] == '1' || strcmp(value, "true") == 0 || strcmp(value, "other") == 0) {
EMSESP::system_.system_restart(true);
if (value != nullptr && value[0] == '\0') {
EMSESP::system_.system_restart(value);
} else {
EMSESP::system_.system_restart(false);
EMSESP::system_.system_restart();
}
return true;
}