7 files changed, 13 insertions(+), 42 deletions(-)

M module-bsp/board/rt1051/CMakeLists.txt
M module-bsp/board/rt1051/bellpx/CMakeLists.txt
R module-bsp/board/rt1051/{ => bellpx}/bsp/bell_temp_sensor/CT7117.hpp
R module-bsp/board/rt1051/{ => bellpx}/bsp/bell_temp_sensor/bell_temp_sensor.cpp
M module-bsp/board/rt1051/bellpx/hal/temperature_source/TemperatureSource.cpp
D module-bsp/board/rt1051/bsp/bell_temp_sensor/TemperatureSource.cpp
M module-bsp/board/rt1051/puretx/board/BoardDefinitions.hpp

@@ 31,8 31,6 @@ target_sources(module-bsp
 		bsp/torch/torch.cpp
 		bsp/vibrator/vibrator.cpp
 		bsp/watchdog/watchdog.cpp
-		bsp/bell_temp_sensor/bell_temp_sensor.cpp
-		bsp/bell_temp_sensor/TemperatureSource.cpp
 		common/audio.cpp
 		common/board.cpp
 		common/chip.cpp

@@ 12,8 12,9 @@ target_sources(
     PRIVATE
         hal/temperature_source/TemperatureSource.cpp
         hal/battery_charger/BatteryCharger.cpp
-	hal/key_input/KeyInput.cpp
-	bsp/eink/eink_pin_config.cpp
+	    hal/key_input/KeyInput.cpp
+	    bsp/eink/eink_pin_config.cpp
+        bsp/bell_temp_sensor/bell_temp_sensor.cpp
         pin_mux.c
         clock_config.cpp
         irq_gpio.cpp

@@ 9,7 9,6 @@
 
 #include "fsl_common.h"
 #include <log.hpp>
-#include <sstream>
 
 namespace bsp::bell_temp_sensor
 {

@@ 3,21 3,26 @@
 
 #include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
 #include <hal/GenericFactory.hpp>
+#include "bsp/bell_temp_sensor/bell_temp_sensor.hpp"
 
 namespace hal::temperature
 {
-
-    class RT1051TemperatureSource : public AbstractTemperatureSource
+    class BellTemperatureSource : public AbstractTemperatureSource
     {
       public:
-        Result read() override
+        Result read()
         {
-            return hal::temperature::AbstractTemperatureSource::Result();
+            temperature = bsp::bell_temp_sensor::readout();
+            return temperature;
         }
+
+      private:
+        AbstractTemperatureSource::Temperature temperature{};
     };
 
     std::shared_ptr<AbstractTemperatureSource> AbstractTemperatureSource::Factory::create()
     {
-        return hal::impl::factory<RT1051TemperatureSource, AbstractTemperatureSource>();
+        bsp::bell_temp_sensor::init();
+        return hal::impl::factory<BellTemperatureSource, AbstractTemperatureSource>();
     }
 } // namespace hal::temperature

@@ 1,28 0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#include <module-bsp/hal/temperature_source/TemperatureSource.hpp>
-#include <hal/GenericFactory.hpp>
-#include "bsp/bell_temp_sensor/bell_temp_sensor.hpp"
-
-namespace hal::temperature
-{
-    class BellTemperatureSource : public AbstractTemperatureSource
-    {
-      public:
-        Result read()
-        {
-            temperature = bsp::bell_temp_sensor::readout();
-            return temperature;
-        }
-
-      private:
-        AbstractTemperatureSource::Temperature temperature{};
-    };
-
-    std::shared_ptr<AbstractTemperatureSource> AbstractTemperatureSource::Factory::create()
-    {
-        bsp::bell_temp_sensor::init();
-        return hal::impl::factory<BellTemperatureSource, AbstractTemperatureSource>();
-    }
-} // namespace hal::temperature

@@ 138,8 138,4 @@ enum class BoardDefinitions
 
     EEPROM_I2C          = AUDIOCODEC_I2C,
     EEPROM_I2C_BAUDRATE = I2C_STD_BAUDRATE,
-
-    // Added here because driver subsystem is not separated and without these defines it won't compile
-    BELL_TEMP_SENSOR_I2C          = static_cast<int>(drivers::I2CInstances ::I2C4),
-    BELL_TEMP_SENSOR_I2C_BAUDRATE = I2C_STD_BAUDRATE,
 };