fix stm32g0 temperature (#86)

RaccoonlabDev · Nov 21, 2024 · deb4a14 · deb4a14
1 parent 5b3bf25
commit deb4a14
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 110 deletions.
diff --git a/Src/peripheral/adc/adc.hpp b/Src/peripheral/adc/adc.hpp
@@ -5,7 +5,6 @@
 #define SRC_PERIPHERY_ADC_ADC_HPP_
 
 #include <stdint.h>
-#include "peripheral/temperature_sensor/temperature_sensor.hpp"
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/Src/peripheral/adc/circuit_periphery.cpp b/Src/peripheral/adc/circuit_periphery.cpp
@@ -11,6 +11,9 @@
 #include "params.hpp"
 #include "peripheral/led/led.hpp"
 #include "peripheral/iwdg/iwdg.hpp"
+#ifdef STM32G0B1xx
+#include "adc.h"
+#endif
 
 static const std::array<std::pair<uint16_t, uint16_t>, (int)BoardType::BOARDS_AMOUNT> hw_info = {{
     {59, 69},
@@ -32,6 +35,20 @@ static const std::array<std::pair<const char*, uint16_t>, (int)BoardType::BOARDS
     {"co.rl.mini.v3", 14},
 }};
 
+uint16_t CircuitPeriphery::temperature() {
+    auto adc_12b = AdcPeriphery::get(AdcChannel::ADC_TEMPERATURE);
+    uint16_t temperature_kelvin;
+#ifdef STM32G0B1xx
+    temperature_kelvin = __HAL_ADC_CALC_TEMPERATURE(3300, adc_12b, ADC_RESOLUTION_12B) + 273;
+#else  // STM32F103xB
+    static const uint16_t TEMP_REF = 25;
+    static const uint16_t ADC_REF = 1750;   ///< v_ref / 3.3 * 4095
+    static const uint16_t AVG_SLOPE = 5;    ///< avg_slope/(3.3/4096)
+    temperature_kelvin = (ADC_REF - adc_12b) / AVG_SLOPE + TEMP_REF + 273;
+#endif
+    return temperature_kelvin;
+}
+
 BoardType CircuitPeriphery::detect_board_type() {
     auto hardware_version = CircuitPeriphery::hardware_version();
 

diff --git a/Src/peripheral/adc/circuit_periphery.hpp b/Src/peripheral/adc/circuit_periphery.hpp
@@ -7,7 +7,6 @@
 #include <stdint.h>
 #include <limits>
 #include <utility>
-#include "peripheral/temperature_sensor/temperature_sensor.hpp"
 #include "peripheral/adc/adc.hpp"
 
 #ifdef __cplusplus
@@ -32,10 +31,10 @@ class CircuitPeriphery{
         return AdcPeriphery::init();
     }
 
-    static uint16_t temperature() {
-        uint16_t temp = AdcPeriphery::get(AdcChannel::ADC_TEMPERATURE);
-        return stm32TemperatureParse(temp);
-    }
+    /**
+     * @return Temperature, Kelvin
+     */
+    static uint16_t temperature();
 
     /**
      * @return The current in Amperes if the hardware supports it, otherwise NaN.

diff --git a/Src/peripheral/temperature_sensor/temperature_sensor.hpp b/Src/peripheral/temperature_sensor/temperature_sensor.hpp
diff --git a/Src/platform/stm32f103/CMakeLists.txt b/Src/platform/stm32f103/CMakeLists.txt
@@ -16,7 +16,6 @@ add_executable(${EXECUTABLE}
     ${ROOT_DIR}/Src/platform/stm32/pwm/pwm.cpp
     ${CMAKE_CURRENT_LIST_DIR}/pwm.cpp
     ${ROOT_DIR}/Src/platform/stm32/iwdg/iwdg.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/temperature_sensor.cpp
     ${ROOT_DIR}/Src/platform/stm32/platform_specific.cpp
 
     ${coreSources}

diff --git a/Src/platform/stm32f103/temperature_sensor.cpp b/Src/platform/stm32f103/temperature_sensor.cpp
diff --git a/Src/platform/stm32g0b1/CMakeLists.txt b/Src/platform/stm32g0b1/CMakeLists.txt
@@ -24,7 +24,6 @@ add_executable(${EXECUTABLE}
     ${CMAKE_CURRENT_LIST_DIR}/gpio.cpp
     ${PLATFORM_DIR}/stm32g0b1/pwm.cpp
     ${ROOT_DIR}/Src/platform/stm32/iwdg/iwdg.cpp
-    ${PLATFORM_DIR}/stm32f103/temperature_sensor.cpp
     ${ROOT_DIR}/Src/platform/stm32/platform_specific.cpp
 
     ${coreSources}

diff --git a/Src/platform/ubuntu/CMakeLists.txt b/Src/platform/ubuntu/CMakeLists.txt
@@ -16,7 +16,6 @@ add_executable(${EXECUTABLE}
     ${CMAKE_CURRENT_LIST_DIR}/gpio.cpp
     ${CMAKE_CURRENT_LIST_DIR}/pwm.cpp
     ${CMAKE_CURRENT_LIST_DIR}/iwdg.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/temperature_sensor.cpp
     ${CMAKE_CURRENT_LIST_DIR}/platform_specific.cpp
 )
 

diff --git a/Src/platform/ubuntu/temperature_sensor.cpp b/Src/platform/ubuntu/temperature_sensor.cpp