56 convert adc input to analoginput

firmware/mcal/cli/periph/analog_input.hpp

@@ -0,0 +1,31 @@
+/// @author Samuel Shi
+/// @date 2024-11-17
+
+#pragma once
+
+#include <format>
+#include <iostream>
+
+#include "shared/periph/analog_input.hpp"
+
+namespace mcal::cli::periph {
+
+class AnalogInput : public shared::periph::AnalogInput {
+public:
+    AnalogInput(std::string name) : name_(name) {}
+
+    float ReadVoltage() override {
+        std::cout << std::format("Reading ADC {} ...", name_) << std::endl;
+        std::cout << " | Enter a voltage level: ";
+        float voltage;
+        std::cin >> voltage;
+        std::cout << std::format(" | Obtained value {:.3f} V", voltage)
+                  << std::endl;
+        return voltage;
+    }
+
+private:
+    std::string name_;
+};
+
+}  // namespace mcal::cli::periph

firmware/mcal/linux/periph/CMakeLists.txt

@@ -1,6 +1,7 @@
 target_sources(mcal-linux
     PRIVATE
     adc.cc
+    analog_input.cc
     can.cc
     digital_input.cc
     digital_output.cc

firmware/mcal/linux/periph/analog_input.cc

@@ -0,0 +1,24 @@
+/// @author Samuel Shi
+/// @date 2025-1-10
+
+#include <format>
+#include <iostream>
+
+#include "analog_input.hpp"
+
+
+namespace mcal::lnx::periph {
+
+AnalogInput::AnalogInput(std::string name) : name_(name) {}
+
+float AnalogInput::ReadVoltage() {
+    std::cout << std::format("Reading ADC {} ...", name_) << std::endl;
+    std::cout << " | Enter a voltage level: ";
+    float voltage;
+    std::cin >> voltage;
+    std::cout << std::format(" | Obtained value {:.3f} V", voltage)
+              << std::endl;
+    return voltage;
+}
+
+};  // namespace mcal::lnx::periph

firmware/mcal/linux/periph/analog_input.hpp

@@ -0,0 +1,22 @@
+/// @author Samuel Shi
+/// @date 2025-1-10
+
+#pragma once
+
+#include <iostream>
+
+#include "shared/periph/analog_input.hpp"
+
+namespace mcal::lnx::periph {
+
+class AnalogInput : public shared::periph::AnalogInput {
+public:
+    AnalogInput(std::string name);
+
+    float ReadVoltage() override;
+
+private:
+    std::string name_;
+};
+
+}  // namespace mcal::lnx::periph

firmware/mcal/stm32f767/periph/analog_input.hpp

@@ -0,0 +1,62 @@
+
+
+#pragma once
+
+#include <cstdint>
+
+#include "shared/periph/analog_input.hpp"
+#include "stm32f7xx_hal.h"
+#include "stm32f7xx_hal_adc.h"
+
+namespace mcal::stm32f767::periph {
+
+class AnalogInput : public shared::periph::AnalogInput {
+public:
+    AnalogInput(ADC_HandleTypeDef* hadc, uint32_t adc_channel,
+                float system_volts = 3.3f)
+        : hadc_(hadc),
+          adc_channel_(adc_channel),
+          system_volts_(system_volts) {};
+
+    float ReadVoltage() override {
+        Start();
+        HAL_ADC_PollForConversion(hadc_, 1000);
+        uint32_t adc_value = HAL_ADC_GetValue(hadc_);
+        HAL_ADC_Stop(hadc_);
+
+        return adc_value / GetDivisor() * system_volts_;
+    }
+
+private:
+    ADC_HandleTypeDef* hadc_;
+    uint32_t adc_channel_;
+    const float system_volts_;
+
+    void Start() {
+        ADC_ChannelConfTypeDef adc_config = {
+            .Channel = adc_channel_,
+            .Rank = ADC_REGULAR_RANK_1,
+            .SamplingTime = ADC_SAMPLETIME_28CYCLES,
+            .Offset = 0};
+
+        HAL_ADC_ConfigChannel(hadc_, &adc_config);
+        HAL_ADC_Start(hadc_);
+    }
+
+    float GetDivisor() {
+        switch (ADC_GET_RESOLUTION(hadc_)) {
+            case ADC_RESOLUTION_6B:
+                return 63.0f;
+            case ADC_RESOLUTION_8B:
+                return 255.0f;
+            case ADC_RESOLUTION_10B:
+                return 1023.0f;
+            case ADC_RESOLUTION_12B:
+                return 4095.0f;
+            default:
+                return 4095.0f;
+        }
+    };
+};
+
+}  // namespace mcal::stm32f767::periph

firmware/projects/Demo/AnalogInput/CMakeLists.txt

@@ -0,0 +1 @@
+target_sources(main PUBLIC main.cc)

firmware/projects/Demo/AnalogInput/bindings.hpp

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "shared/periph/analog_input.hpp"
+
+namespace bindings {
+
+extern shared::periph::AnalogInput& analog_input;
+
+extern void Init();
+
+}  // namespace bindings

firmware/projects/Demo/AnalogInput/main.cc

@@ -0,0 +1,10 @@
+#include "bindings.hpp"
+
+int main() {
+    bindings::Init();
+
+    while (true) {
+        bindings::analog_input.ReadVoltage();
+    }
+    return 0;
+}

firmware/projects/Demo/AnalogInput/platforms/cli/CMakeLists.txt

@@ -0,0 +1,2 @@
+target_sources(main PRIVATE bindings.cc)
+target_link_libraries(main PUBLIC mcal-cli)

firmware/projects/Demo/AnalogInput/platforms/cli/bindings.cc

@@ -0,0 +1,21 @@
+#include <iostream>
+
+#include "../../bindings.hpp"
+#include "mcal/cli/periph/analog_input.hpp"
+#include "shared/periph/analog_input.hpp"
+
+namespace mcal {
+
+cli::periph::AnalogInput analog_input{"analog input"};
+
+}  // namespace mcal
+
+namespace bindings {
+
+shared::periph::AnalogInput& analog_input = mcal::analog_input;
+
+void Init() {
+    std::cout << "Initializing the CLI..." << std::endl;
+}
+
+}  // namespace bindings

firmware/projects/Demo/AnalogInput/platforms/cli/mcal_conf.cmake

@@ -0,0 +1 @@
+set(MCAL cli)

firmware/projects/Demo/AnalogInput/platforms/linux/CMakeLists.txt

@@ -0,0 +1,2 @@
+target_sources(main PRIVATE bindings.cc)
+target_link_libraries(main PRIVATE mcal-linux)  

firmware/projects/Demo/AnalogInput/platforms/linux/bindings.cc

@@ -0,0 +1,21 @@
+#include <iostream>
+
+#include "../../bindings.hpp"
+#include "mcal/linux/periph/analog_input.hpp"
+#include "shared/periph/analog_input.hpp"
+
+namespace mcal {
+
+lnx::periph::AnalogInput analog_input{"analog input"};
+
+}  // namespace mcal
+
+namespace bindings {
+
+shared::periph::AnalogInput& analog_input = mcal::analog_input;
+
+void Init() {
+    std::cout << "Initializing the CLI..." << std::endl;
+}
+
+}  // namespace bindings

firmware/projects/Demo/AnalogInput/platforms/linux/mcal_conf.cmake

@@ -0,0 +1 @@
+set(MCAL linux)

firmware/projects/Demo/AnalogInput/platforms/stm32f767/CMakeLists.txt

@@ -0,0 +1,5 @@
+target_sources(main PRIVATE bindings.cc)
+target_link_libraries(main PUBLIC mcal-stm32f767)
+
+add_subdirectory(cubemx/cmake/stm32cubemx)
+target_link_libraries(main PRIVATE stm32cubemx)