11 files changed, 126 insertions(+), 4 deletions(-)

M image/user/db/settings_v2_002.sql
M module-apps/apps-common/Temperature.hpp
M module-services/service-evtmgr/EventManager.cpp
M module-services/service-evtmgr/service-evtmgr/EventManagerCommon.hpp
M products/BellHybrid/services/evtmgr/CMakeLists.txt
M products/BellHybrid/services/evtmgr/EventManager.cpp
M products/BellHybrid/services/evtmgr/include/evtmgr/EventManager.hpp
A products/BellHybrid/services/evtmgr/include/evtmgr/api/TemperatureApi.hpp
A products/BellHybrid/services/evtmgr/internal/StaticData.cpp
A products/BellHybrid/services/evtmgr/internal/StaticData.hpp
A products/BellHybrid/services/evtmgr/internal/TemperatureApi.cpp

@@ 38,6 38,7 @@ INSERT OR IGNORE INTO settings_tab (path, value) VALUES
     ('keypad_light_state', '0'),
     ('gs_current_timezone_name', ''),
     ('gs_current_timezone_rules', ''),
-    ('\ServiceTime\\gs_automatic_date_and_time_is_on', '1');
+    ('\ServiceTime\\gs_automatic_date_and_time_is_on', '1'),
+    ('temperature_unit', 'C');
 
 

@@ 33,10 33,10 @@ namespace gui::temperature
 
     inline std::optional<Temperature::Unit> strToUnit(std::string_view str)
     {
-        if (str == gui::temperature::celsiusDegreeSymbol) {
+        if ((str == gui::temperature::celsiusDegreeSymbol) || (str == celsiusSymbol)) {
             return gui::temperature::Temperature::Unit::Celsius;
         }
-        else if (str == gui::temperature::fahrenheitDegreeSymbol) {
+        else if ((str == gui::temperature::fahrenheitDegreeSymbol) || (str == fahrenheitSymbol)) {
             return gui::temperature::Temperature::Unit::Fahrenheit;
         }
 

@@ 283,6 283,9 @@ int EventManagerCommon::dumpLogsToFile()
 
 void EventManagerCommon::handleMinuteUpdate(time_t timestamp)
 {
+    if (onMinuteTick) {
+        onMinuteTick(timestamp);
+    }
     if (!targetApplication.empty()) {
         auto message       = std::make_shared<sevm::RtcMinuteAlarmMessage>(MessageType::EVMMinuteUpdated);
         message->timestamp = timestamp;

@@ 35,6 35,7 @@ class EventManagerCommon : public sys::Service
     sys::TimerHandle loggerTimer;
 
   protected:
+    std::function<void(const time_t)> onMinuteTick;
     virtual void handleKeyEvent(sys::Message *msg);
     virtual void initProductEvents();
     virtual auto createEventWorker() -> std::unique_ptr<WorkerEventCommon>;

@@ 1,19 1,28 @@
 add_library(evtmgr STATIC)
+add_library(bell::evtmgr ALIAS evtmgr)
 
 target_sources(evtmgr
     PRIVATE
         EventManager.cpp
+        internal/StaticData.cpp
+        internal/TemperatureApi.cpp
+
+        internal/StaticData.hpp
     PUBLIC
         include/evtmgr/EventManager.hpp
+        include/evtmgr/api/TemperatureApi.hpp
 )
 
 target_include_directories(evtmgr
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
 
 target_link_libraries(evtmgr
    PRIVATE
+        module-bsp
         module-utils
         service-evtmgr
 )

@@ 1,4 1,28 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include "internal/StaticData.hpp"
+
 #include <evtmgr/EventManager.hpp>
+#include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+
+namespace
+{
+    auto updateTemperature = [](hal::temperature::AbstractTemperatureSource &source) {
+        const auto temp = source.read();
+        if (not temp) {
+            LOG_FATAL("Error during reading from temperature source");
+        }
+        else {
+            evtmgr::internal::StaticData::get().setCurrentTemperature(*temp);
+        };
+    };
+}
+
+EventManager::EventManager(const std::string &name)
+    : EventManagerCommon(name), temperatureSource{hal::temperature::AbstractTemperatureSource::Factory::create()}
+{
+    updateTemperature(*temperatureSource);
+
+    onMinuteTick = [this](const time_t) { updateTemperature(*temperatureSource); };
+}

@@ 5,8 5,19 @@
 
 #include <service-evtmgr/EventManagerCommon.hpp>
 
+namespace hal::temperature
+{
+    class AbstractTemperatureSource;
+}
+
 class EventManager : public EventManagerCommon
-{};
+{
+  public:
+    explicit EventManager(const std::string &name = service::name::evt_manager);
+
+  private:
+    std::shared_ptr<hal::temperature::AbstractTemperatureSource> temperatureSource;
+};
 
 namespace sys
 {

@@ 0,0 1,11 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+
+namespace evtmgr::api
+{
+    hal::temperature::AbstractTemperatureSource::Temperature getCurrentTemperature();
+} // namespace evtmgr::api

@@ 0,0 1,22 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "StaticData.hpp"
+
+namespace evtmgr::internal
+{
+
+    void StaticData::setCurrentTemperature(hal::temperature::AbstractTemperatureSource::Temperature temperature)
+    {
+        currentTemperature = temperature;
+    }
+    hal::temperature::AbstractTemperatureSource::Temperature StaticData::getCurrentTemperature() const
+    {
+        return currentTemperature;
+    }
+    StaticData &StaticData::get()
+    {
+        static auto instance = StaticData{};
+        return instance;
+    }
+} // namespace evtmgr::internal

@@ 0,0 1,26 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
+
+namespace evtmgr::internal
+{
+    class StaticData
+    {
+      public:
+        StaticData(const StaticData &) = delete;
+        StaticData &operator=(const StaticData &) = delete;
+
+        static StaticData &get();
+
+        void setCurrentTemperature(hal::temperature::AbstractTemperatureSource::Temperature temperature);
+        [[nodiscard]] hal::temperature::AbstractTemperatureSource::Temperature getCurrentTemperature() const;
+
+      private:
+        StaticData() = default;
+
+        hal::temperature::AbstractTemperatureSource::Temperature currentTemperature;
+    };
+} // namespace evtmgr::internal

@@ 0,0 1,14 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include "internal/StaticData.hpp"
+
+#include <evtmgr/api/TemperatureApi.hpp>
+
+namespace evtmgr::api
+{
+    hal::temperature::AbstractTemperatureSource::Temperature getCurrentTemperature()
+    {
+        return internal::StaticData::get().getCurrentTemperature();
+    }
+} // namespace evtmgr::api