diff --git a/.gitignore b/.gitignore index c66ca76d8..68b0db6d4 100644 --- a/.gitignore +++ b/.gitignore @@ -62,5 +62,5 @@ update/* /null.d test/test_env -image/Luts.bin +image/luts.bin image/assets/fonts/* diff --git a/module-bsp/board/rt1051/bsp/lpm/RT1051LPMCommon.cpp b/module-bsp/board/rt1051/bsp/lpm/RT1051LPMCommon.cpp index d0aa7e61d..2db5fb4e6 100644 --- a/module-bsp/board/rt1051/bsp/lpm/RT1051LPMCommon.cpp +++ b/module-bsp/board/rt1051/bsp/lpm/RT1051LPMCommon.cpp @@ -31,19 +31,19 @@ namespace bsp int32_t RT1051LPMCommon::Reboot(RebootType reason) { switch (reason) { - case RebootType::GoToUpdaterUpdate: + case RebootType::GoToRecoveryUpdate: set_boot_reason(boot_reason_code_update); break; - case RebootType::GoToUpdaterRecovery: + case RebootType::GoToRecoveryRecovery: set_boot_reason(boot_reason_code_recovery); break; - case RebootType::GoToUpdaterFactoryReset: + case RebootType::GoToRecoveryFactoryReset: set_boot_reason(boot_reason_code_factory); break; - case RebootType::GoToUpdaterBackup: + case RebootType::GoToRecoveryBackup: set_boot_reason(boot_reason_code_backup); break; - case RebootType::GoToUpdaterRestore: + case RebootType::GoToRecoveryRestore: set_boot_reason(boot_reason_code_restore); break; case RebootType::GoToUsbMscMode: diff --git a/module-bsp/bsp/lpm/bsp_lpm.hpp b/module-bsp/bsp/lpm/bsp_lpm.hpp index d33742cd8..462481a26 100644 --- a/module-bsp/bsp/lpm/bsp_lpm.hpp +++ b/module-bsp/bsp/lpm/bsp_lpm.hpp @@ -27,11 +27,11 @@ namespace bsp { NormalRestart, GoToUsbMscMode, // Reboot into USB MSC mode - GoToUpdaterUpdate, //! Goto updater into the update mode - GoToUpdaterFactoryReset, //! GOto updater into the factory reset mode - GoToUpdaterRecovery, //! Goto to updater into recovery mode - GoToUpdaterBackup, //! Goto to updater into backup mode - GoToUpdaterRestore //! Goto to updater into restore mode + GoToRecoveryUpdate, //! Goto recovery into the update mode + GoToRecoveryFactoryReset, //! GOto recovery into the factory reset mode + GoToRecoveryRecovery, //! Goto to recovery into recovery mode + GoToRecoveryBackup, //! Goto to recovery into backup mode + GoToRecoveryRestore //! Goto to recovery into restore mode }; diff --git a/module-services/service-desktop/endpoints/backup/BackupHelper.cpp b/module-services/service-desktop/endpoints/backup/BackupHelper.cpp index 20a4c08f3..434008061 100644 --- a/module-services/service-desktop/endpoints/backup/BackupHelper.cpp +++ b/module-services/service-desktop/endpoints/backup/BackupHelper.cpp @@ -38,7 +38,7 @@ namespace sdesktop::endpoints auto BackupHelper::executeBackupRequest([[maybe_unused]] Context &context) -> ProcessResult { - if (sys::SystemManagerCommon::RebootToUpdater(owner, sys::UpdaterReason::Backup)) { + if (sys::SystemManagerCommon::RebootToRecovery(owner, sys::RecoveryReason::Backup)) { return {sent::no, ResponseContext{.status = http::Code::NoContent}}; } diff --git a/module-services/service-desktop/endpoints/restore/RestoreHelper.cpp b/module-services/service-desktop/endpoints/restore/RestoreHelper.cpp index 7017ae9a4..d09cfa876 100644 --- a/module-services/service-desktop/endpoints/restore/RestoreHelper.cpp +++ b/module-services/service-desktop/endpoints/restore/RestoreHelper.cpp @@ -9,7 +9,7 @@ namespace sdesktop::endpoints { auto RestoreHelper::processPost([[maybe_unused]] Context &context) -> ProcessResult { - if (sys::SystemManagerCommon::RebootToUpdater(owner, sys::UpdaterReason::Restore)) { + if (sys::SystemManagerCommon::RebootToRecovery(owner, sys::RecoveryReason::Restore)) { return {sent::no, ResponseContext{.status = http::Code::NoContent}}; } diff --git a/module-services/service-desktop/endpoints/update/UpdateHelper.cpp b/module-services/service-desktop/endpoints/update/UpdateHelper.cpp index bc92e08a9..eb52b05f1 100644 --- a/module-services/service-desktop/endpoints/update/UpdateHelper.cpp +++ b/module-services/service-desktop/endpoints/update/UpdateHelper.cpp @@ -32,7 +32,7 @@ namespace sdesktop::endpoints return {sent::no, ResponseContext{.status = http::Code::NotFound}}; } - if (sys::SystemManagerCommon::RebootToUpdater(owner, sys::UpdaterReason::Update)) { + if (sys::SystemManagerCommon::RebootToRecovery(owner, sys::RecoveryReason::Update)) { return {sent::no, ResponseContext{.status = http::Code::NoContent}}; } diff --git a/module-sys/SystemManager/PowerManager.cpp b/module-sys/SystemManager/PowerManager.cpp index 03155917b..acea783f4 100644 --- a/module-sys/SystemManager/PowerManager.cpp +++ b/module-sys/SystemManager/PowerManager.cpp @@ -89,19 +89,19 @@ namespace sys return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToUsbMscMode); } - int32_t PowerManager::RebootToUpdater(UpdaterReason reason) + int32_t PowerManager::RebootToRecovery(RecoveryReason reason) { switch (reason) { - case UpdaterReason::FactoryReset: - return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToUpdaterFactoryReset); - case UpdaterReason::Recovery: - return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToUpdaterRecovery); - case UpdaterReason::Update: - return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToUpdaterUpdate); - case UpdaterReason::Backup: - return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToUpdaterBackup); - case UpdaterReason::Restore: - return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToUpdaterRestore); + case RecoveryReason::FactoryReset: + return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToRecoveryFactoryReset); + case RecoveryReason::Recovery: + return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToRecoveryRecovery); + case RecoveryReason::Update: + return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToRecoveryUpdate); + case RecoveryReason::Backup: + return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToRecoveryBackup); + case RecoveryReason::Restore: + return lowPowerControl->Reboot(bsp::LowPowerMode::RebootType::GoToRecoveryRestore); default: return -1; } diff --git a/module-sys/SystemManager/SystemManagerCommon.cpp b/module-sys/SystemManager/SystemManagerCommon.cpp index 4f6ff6e49..6405547a9 100644 --- a/module-sys/SystemManager/SystemManagerCommon.cpp +++ b/module-sys/SystemManager/SystemManagerCommon.cpp @@ -140,8 +140,8 @@ namespace sys case SystemManagerCommon::State::RebootToUsbMscMode: LOG_INFO(" ---> REBOOT TO USB MSC Mode <--- "); break; - case SystemManagerCommon::State::RebootToUpdater: - LOG_INFO(" ---> REBOOT TO UPDATER <--- "); + case SystemManagerCommon::State::RebootToRecovery: + LOG_INFO(" ---> REBOOT TO RECOVERY <--- "); break; case SystemManagerCommon::State::Running: case SystemManagerCommon::State::Suspend: @@ -164,8 +164,8 @@ namespace sys case State::RebootToUsbMscMode: powerManager->RebootToUsbMscMode(); break; - case State::RebootToUpdater: - powerManager->RebootToUpdater(updaterReason); + case State::RebootToRecovery: + powerManager->RebootToRecovery(recoveryReason); break; case SystemManagerCommon::State::Running: case SystemManagerCommon::State::Suspend: @@ -286,7 +286,8 @@ namespace sys bool SystemManagerCommon::FactoryReset(Service *s) { - return s->bus.sendUnicast(std::make_shared(Code::FactoryReset, CloseReason::FactoryReset), + return s->bus.sendUnicast(std::make_shared( + Code::FactoryReset, CloseReason::FactoryReset, RecoveryReason::FactoryReset), service::name::system_manager); } @@ -304,10 +305,10 @@ namespace sys return true; } - bool SystemManagerCommon::RebootToUpdater(Service *s, UpdaterReason updaterReason) + bool SystemManagerCommon::RebootToRecovery(Service *s, RecoveryReason recoveryReason) { s->bus.sendUnicast( - std::make_shared(Code::RebootToUpdater, CloseReason::Reboot, updaterReason), + std::make_shared(Code::RebootToRecovery, CloseReason::Reboot, recoveryReason), service::name::system_manager); return true; } @@ -578,14 +579,14 @@ namespace sys case Code::Reboot: RebootHandler(); break; - case Code::RebootToUpdater: - RebootToUpdaterHandler(data->updaterReason); + case Code::RebootToRecovery: + RebootToRecoveryHandler(data->recoveryReason); break; case Code::RebootToUsbMscMode: RebootToUsbMscModeHandler(State::RebootToUsbMscMode); break; case Code::FactoryReset: - CloseSystemHandler(CloseReason::FactoryReset); + RebootToRecoveryHandler(data->recoveryReason); break; case Code::None: break; @@ -733,7 +734,6 @@ namespace sys switch (closeReason) { case CloseReason::RegularPowerDown: - case CloseReason::FactoryReset: case CloseReason::SystemBrownout: case CloseReason::LowBattery: case CloseReason::RebootToUsbMscMode: @@ -744,9 +744,10 @@ namespace sys DestroyServices(sys::state::regularClose::whitelist); set(State::Reboot); break; - case CloseReason::RebootToUpdater: + case CloseReason::RebootToRecovery: + case CloseReason::FactoryReset: DestroyServices(sys::state::update::whitelist); - set(State::RebootToUpdater); + set(State::RebootToRecovery); break; } } @@ -772,10 +773,10 @@ namespace sys CloseSystemHandler(CloseReason::Reboot); } - void SystemManagerCommon::RebootToUpdaterHandler(UpdaterReason updaterReason) + void SystemManagerCommon::RebootToRecoveryHandler(RecoveryReason recoveryReason) { - CloseSystemHandler(CloseReason::RebootToUpdater); - this->updaterReason = updaterReason; + CloseSystemHandler(CloseReason::RebootToRecovery); + this->recoveryReason = recoveryReason; } void SystemManagerCommon::RebootToUsbMscModeHandler(State newState) diff --git a/module-sys/SystemManager/include/SystemManager/PowerManager.hpp b/module-sys/SystemManager/include/SystemManager/PowerManager.hpp index 519c56bee..f1f349188 100644 --- a/module-sys/SystemManager/include/SystemManager/PowerManager.hpp +++ b/module-sys/SystemManager/include/SystemManager/PowerManager.hpp @@ -51,7 +51,7 @@ namespace sys int32_t PowerOff(); int32_t Reboot(); int32_t RebootToUsbMscMode(); - int32_t RebootToUpdater(UpdaterReason reason); + int32_t RebootToRecovery(RecoveryReason reason); /// called periodically to calculate the CPU requirement /// diff --git a/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp b/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp index 664475313..4b5761c0a 100644 --- a/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp +++ b/module-sys/SystemManager/include/SystemManager/SystemManagerCommon.hpp @@ -42,7 +42,7 @@ namespace sys CloseSystem, Restore, Reboot, - RebootToUpdater, + RebootToRecovery, RebootToUsbMscMode, FactoryReset, None, @@ -57,16 +57,16 @@ namespace sys class SystemManagerCmd : public DataMessage { public: - explicit SystemManagerCmd(Code type = Code::None, - CloseReason closeReason = CloseReason::RegularPowerDown, - UpdaterReason updaterReason = UpdaterReason::Update) + explicit SystemManagerCmd(Code type = Code::None, + CloseReason closeReason = CloseReason::RegularPowerDown, + RecoveryReason recoveryReason = RecoveryReason::Update) : DataMessage(BusChannel::SystemManagerRequests), type(type), closeReason(closeReason), - updaterReason(updaterReason) + recoveryReason(recoveryReason) {} Code type; CloseReason closeReason; - UpdaterReason updaterReason; + RecoveryReason recoveryReason; }; class SystemManagerCommon : public Service @@ -81,7 +81,7 @@ namespace sys Shutdown, ShutdownReady, Reboot, - RebootToUpdater, + RebootToRecovery, RebootToUsbMscMode } state = State::Running; @@ -102,7 +102,7 @@ namespace sys static bool RebootToUsbMscMode(Service *s); - static bool RebootToUpdater(Service *s, UpdaterReason updaterReason); + static bool RebootToRecovery(Service *s, RecoveryReason recoveryReason); static bool SuspendService(const std::string &name, Service *caller); @@ -184,7 +184,7 @@ namespace sys void RebootHandler(); - void RebootToUpdaterHandler(UpdaterReason updaterReason); + void RebootToRecoveryHandler(RecoveryReason recoveryReason); void RebootToUsbMscModeHandler(State newState); @@ -197,7 +197,7 @@ namespace sys bool serviceListReversed{false}; CloseReason closeReason{CloseReason::RegularPowerDown}; - UpdaterReason updaterReason{UpdaterReason::Update}; + RecoveryReason recoveryReason{RecoveryReason::Update}; std::vector> systemServiceCreators; sys::TimerHandle freqTimer; sys::TimerHandle serviceCloseTimer; @@ -232,8 +232,8 @@ inline const char *c_str(sys::SystemManagerCommon::State state) return "Shutdown"; case sys::SystemManagerCommon::State::Reboot: return "Reboot"; - case sys::SystemManagerCommon::State::RebootToUpdater: - return "RebootToUpdater"; + case sys::SystemManagerCommon::State::RebootToRecovery: + return "RebootToRecovery"; case sys::SystemManagerCommon::State::RebootToUsbMscMode: return "RebootToUsbMscModeUpdate"; break; diff --git a/module-sys/common/include/system/Common.hpp b/module-sys/common/include/system/Common.hpp index 2c749dbd3..f155ec94a 100644 --- a/module-sys/common/include/system/Common.hpp +++ b/module-sys/common/include/system/Common.hpp @@ -49,7 +49,7 @@ namespace sys { RegularPowerDown, Reboot, - RebootToUpdater, + RebootToRecovery, RebootToUsbMscMode, FactoryReset, SystemBrownout, @@ -57,7 +57,7 @@ namespace sys }; // Updater reason code - enum class UpdaterReason + enum class RecoveryReason { Update, Recovery,