M harmony_changelog.md => harmony_changelog.md +1 -0
@@ 35,6 35,7 @@
* Added Harmony version information in about section
* Added system shutdown if there is no user activity for 180 seconds on the language selection screen
* Files not fully transferred via Center will be now removed when USB cable is unplugged
+* Added a log when manual reset is performed
### Changed / Improved
M module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp => module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp +5 -5
@@ 61,11 61,6 @@ class EventManagerCommon : public sys::Service
LogDumpFunction logDumpFunction;
- /// @return: < 0 - error occured during log flush
- /// @return: 0 - log flush did not happen
- /// @return: 1 - log flush successflul
- int dumpLogsToFile();
-
protected:
std::function<void(const time_t)> onMinuteTick;
virtual void handleKeyEvent(sys::Message *msg);
@@ 83,4 78,9 @@ class EventManagerCommon : public sys::Service
// ID of alarm waiting to trigger
uint32_t alarmID;
const EventManagerParams eventManagerParams;
+
+ /// @return: < 0 - error occured during log flush
+ /// @return: 0 - log flush did not happen
+ /// @return: 1 - log flush successflul
+ int dumpLogsToFile();
};
M products/BellHybrid/services/evtmgr/EventManager.cpp => products/BellHybrid/services/evtmgr/EventManager.cpp +2 -2
@@ 173,8 173,8 @@ void EventManager::buildKeySequences()
auto resetSeq = std::make_unique<ResetSequence>(*this);
resetSeq->onAction = [this]() {
- app::manager::Controller::sendAction(
- this, app::manager::actions::ShowPopup, std::make_unique<RebootPopupRequestParams>());
+ LOG_INFO("Incoming manual reset caused by user!");
+ EventManagerCommon::dumpLogsToFile();
};
collection.emplace_back(std::move(resetSeq));
M products/BellHybrid/services/evtmgr/internal/key_sequences/ResetSequence.hpp => products/BellHybrid/services/evtmgr/internal/key_sequences/ResetSequence.hpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 11,7 11,7 @@ class ResetSequence : public GenericLongPressSequence<KeyMap::Back, KeyMap::Fron
public:
explicit ResetSequence(sys::Service &service)
: GenericLongPressSequence<KeyMap::Back, KeyMap::Frontlight>{sys::TimerFactory::createSingleShotTimer(
- &service, "rseq", std::chrono::milliseconds{10000}, [this](auto &) { handleTimer(); })}
+ &service, "rseq", std::chrono::milliseconds{5500}, [this](auto &) { handleTimer(); })}
{}
};