Code refactor

Author: kwarc93

.cproject

@@ -188,8 +188,8 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.1028387022" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.arch.armv7e-m" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id.1780260696" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id" useByScannerDiscovery="false" value="962691777" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn.1233743181" name="Enable all common warnings (-Wall)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn" useByScannerDiscovery="true" value="true" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto.1183045901" name="Link-time optimizer (-flto)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto" value="false" valueType="boolean"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant.417076202" name="Single precision constants (-fsingle-precision-constant)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto.1183045901" name="Link-time optimizer (-flto)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto" useByScannerDiscovery="true" value="false" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant.417076202" name="Single precision constants (-fsingle-precision-constant)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.spconstant" useByScannerDiscovery="true" value="true" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1269353534" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
 							<builder buildPath="${workspace_loc:/spl-meter}/Debug" id="ilg.gnuarmeclipse.managedbuild.cross.builder.97973665" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.206879582" name="GNU ARM Cross Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">

.settings/.gitignore

@@ -0,0 +1 @@
+/language.settings.xml

app/model/meter.cpp

@@ -16,7 +16,7 @@ using namespace spl;
 //---------------------------------------------------------------------------
 /* private */
 
-/* warning: This function is called from ISR */
+/* WARNING: This function is called from ISR */
 void meter::mic_data_ready(const int16_t *data, uint16_t data_len)
 {
     if (this->dsp_buffer_ready)
@@ -53,19 +53,19 @@ meter::meter(hal::microphone &microphone, const new_data_cb_t &new_data_cb) : mi
     this->new_spl_data_cb = new_data_cb;
     this->spl_data.spl_min = 120;
     this->spl_data.spl_max = 0;
+    this->spl_data.spl = 0;
     this->spl_data_period = static_cast<float32_t>(this->dsp_buffer.size()) / this->mic.get_sampling_frequency();
 
     this->spl_data.weighting = weighting_t::a;
-    this->weighting_filter = new a_weighting();
+    this->weighting_filter = std::make_unique<spl::a_weighting>();
 
     this->spl_data.averaging = averaging_t::slow;
-    this->averaging_filter = new slow_averaging(this->spl_data_period, this->spl_data.spl);
+    this->averaging_filter = std::make_unique<spl::slow_averaging>(this->spl_data_period, this->spl_data.spl);
 }
 
 meter::~meter()
 {
-    delete this->weighting_filter;
-    delete this->averaging_filter;
+
 }
 
 void meter::enable(void)
@@ -77,47 +77,47 @@ void meter::enable(void)
 void meter::process(void)
 {
     /* DSP processing takes around 2.68 msec at 48MHz */
-    if (this->dsp_buffer_ready)
-    {
-        auto &current_dsp_buffer = this->dsp_buffer;
+    if (!this->dsp_buffer_ready)
+        return;
 
-        /* Apply weighting filter */
-        this->weighting_filter->process(current_dsp_buffer, this->aux_dsp_buffer);
-        this->dsp_buffer_ready = false;
+    auto &current_dsp_buffer = this->dsp_buffer;
 
-        current_dsp_buffer = this->aux_dsp_buffer;
+    /* Apply weighting filter */
+    this->weighting_filter->process(current_dsp_buffer, this->aux_dsp_buffer);
+    this->dsp_buffer_ready = false;
 
-        /* Delete offset */
-        float32_t mean;
-        arm_mean_f32(current_dsp_buffer.data(), current_dsp_buffer.size(), &mean);
-        arm_offset_f32(current_dsp_buffer.data(), -mean, current_dsp_buffer.data(), current_dsp_buffer.size());
+    current_dsp_buffer = this->aux_dsp_buffer;
 
-        /* Calculate RMS value */
-        float32_t rms;
-        arm_rms_f32(current_dsp_buffer.data(), current_dsp_buffer.size(), &rms);
+    /* Delete offset */
+    float32_t mean;
+    arm_mean_f32(current_dsp_buffer.data(), current_dsp_buffer.size(), &mean);
+    arm_offset_f32(current_dsp_buffer.data(), -mean, current_dsp_buffer.data(), current_dsp_buffer.size());
 
-        /* Normalize RMS value */
-        rms /= INT16_MAX;
+    /* Calculate RMS value */
+    float32_t rms;
+    arm_rms_f32(current_dsp_buffer.data(), current_dsp_buffer.size(), &rms);
 
-        /* Calculate dB SPL */
-        float32_t db_spl_raw = 94 - this->mic.get_sensitivity() + 20.0f * log10f(rms);
+    /* Normalize RMS value */
+    rms /= INT16_MAX;
 
-        /* Apply averaging */
-        float32_t db_spl = this->averaging_filter->process(db_spl_raw);
+    /* Calculate dB SPL */
+    float32_t db_spl_raw = 94 - this->mic.get_sensitivity() + 20.0f * log10f(rms);
 
-        const uint32_t averaging_period = this->averaging_filter->time_constant * 1000;
+    /* Apply averaging */
+    float32_t db_spl = this->averaging_filter->process(db_spl_raw);
 
-        if (hal::system::clock::is_elapsed(this->averaging_time_point, std::chrono::milliseconds(averaging_period)))
-        {
-            this->averaging_time_point = hal::system::clock::now();
+    const uint32_t averaging_period = this->averaging_filter->time_constant * 1000;
 
-            this->spl_data.spl_max = std::max(db_spl, this->spl_data.spl_max);
-            this->spl_data.spl_min = std::min(db_spl, this->spl_data.spl_min);
-            this->spl_data.spl = db_spl;
+    if (hal::system::clock::is_elapsed(this->averaging_time_point, std::chrono::milliseconds(averaging_period)))
+    {
+        this->averaging_time_point = hal::system::clock::now();
+
+        this->spl_data.spl_max = std::max(db_spl, this->spl_data.spl_max);
+        this->spl_data.spl_min = std::min(db_spl, this->spl_data.spl_min);
+        this->spl_data.spl = db_spl;
 
-            if (this->new_spl_data_cb != nullptr)
-                this->new_spl_data_cb(this->spl_data);
-        }
+        if (this->new_spl_data_cb != nullptr)
+            this->new_spl_data_cb(this->spl_data);
     }
 }
 
@@ -146,16 +146,13 @@ void meter::set_weighting(weighting_t weighting)
     switch (weighting)
     {
         case weighting_t::a:
-            delete this->weighting_filter;
-            this->weighting_filter = new a_weighting();
+            this->weighting_filter = std::make_unique<spl::a_weighting>();
             break;
         case weighting_t::c:
-            delete this->weighting_filter;
-            this->weighting_filter = new c_weighting();
+            this->weighting_filter = std::make_unique<spl::c_weighting>();
             break;
         case weighting_t::z:
-            delete this->weighting_filter;
-            this->weighting_filter = new z_weighting();
+            this->weighting_filter = std::make_unique<spl::z_weighting>();
             break;
         default:
             return;
@@ -172,12 +169,11 @@ void meter::set_averaging(averaging_t averaging)
     switch (averaging)
     {
         case averaging_t::fast:
-            delete this->averaging_filter;
-            this->averaging_filter = new fast_averaging(this->spl_data_period, this->spl_data.spl);
+            this->averaging_filter = std::make_unique<spl::fast_averaging>(this->spl_data_period, this->spl_data.spl);
+
             break;
         case averaging_t::slow:
-            delete this->averaging_filter;
-            this->averaging_filter = new slow_averaging(this->spl_data_period, this->spl_data.spl);
+            this->averaging_filter = std::make_unique<spl::slow_averaging>(this->spl_data_period, this->spl_data.spl);
             break;
         default:
             return;

app/model/meter.hpp

@@ -10,6 +10,7 @@
 
 #include <vector>
 #include <functional>
+#include <memory>
 
 #include <hal/hal_system.hpp>
 #include <hal/hal_microphone.hpp>
@@ -49,8 +50,8 @@ class meter
     std::vector<int16_t> mic_data_buffer;
     void mic_data_ready(const int16_t *data, uint16_t data_len);
 
-    spl::weighting_filter *weighting_filter;
-    spl::averaging_filter *averaging_filter;
+    std::unique_ptr<spl::weighting_filter> weighting_filter;
+    std::unique_ptr<spl::averaging_filter> averaging_filter;
     hal::system::clock::time_point averaging_time_point;
 
     std::vector<float32_t> dsp_buffer;

app/view/console_view.cpp

@@ -118,7 +118,7 @@ void console_view::process(void)
             {
                 /* Statistics (clear MIN/MAX) */
                 clear_max_spl_data_evt_t e1;
-                clear_max_spl_data_evt_t e2;
+                clear_min_spl_data_evt_t e2;
                 this->send_event_cb(e1);
                 this->send_event_cb(e2);
                 break;

drivers/stm32l4/usart.cpp

@@ -18,8 +18,6 @@
 
 using namespace drivers;
 
-std::array<usart*, 3> usart::active_objects;
-
 struct usart::usart_hw
 {
     usart::id id;
@@ -33,9 +31,8 @@ struct usart::usart_hw
 
 static const std::map<usart::id, usart::usart_hw> usartx =
 {
-    {usart::id::usart2,
-    {usart::id::usart2, USART2, { rcc::bus::APB1, RCC_APB1ENR1_USART2EN }, gpio::af::af7,
-    { gpio::port::portd, gpio::pin::pin5 }, { gpio::port::portd, gpio::pin::pin6 }}},
+    { usart::id::usart2, { usart::id::usart2, USART2, { rcc::bus::APB1, RCC_APB1ENR1_USART2EN }, gpio::af::af7,
+                         { gpio::port::portd, gpio::pin::pin5 }, { gpio::port::portd, gpio::pin::pin6 }}},
 };
 
 usart::usart(id id, uint32_t baudrate) :
@@ -49,17 +46,17 @@ usart::usart(id id, uint32_t baudrate) :
     gpio::configure(this->hw.rx_pin, gpio::mode::af, this->hw.pin_af);
 
     uint8_t object_id = static_cast<uint8_t>(id);
-    if (object_id < this->active_objects.size())
-        this->active_objects[object_id] = this;
+    if (object_id < this->instance.size())
+        this->instance[object_id] = this;
 
-    this->hw.reg->BRR = (uint32_t) (hal::system::system_clock + baudrate / 2) / baudrate;
+    this->hw.reg->BRR = (uint32_t) (rcc::get_bus_freq(this->hw.pbus.bus) + baudrate / 2) / baudrate;
     this->hw.reg->CR1 = USART_CR1_TE | USART_CR1_RE | USART_CR1_UE;
 }
 
 usart::~usart()
 {
     uint8_t object_id = static_cast<uint8_t>(this->hw.id);
-    this->active_objects[object_id] = nullptr;
+    this->instance[object_id] = nullptr;
 }
 
 std::byte usart::read()
@@ -108,6 +105,7 @@ void usart::read_async(std::byte *data, std::size_t size, const read_cb_t &callb
         this->hw.reg->CR1 &= ~USART_CR1_RXNEIE;
 
         IRQn_Type nvic_irq = static_cast<IRQn_Type>(USART1_IRQn + static_cast<uint8_t>(this->hw.id)); /* TODO: Only supported 1, 2 & 3 */
+        NVIC_ClearPendingIRQ(nvic_irq);
         NVIC_DisableIRQ(nvic_irq);
 
         return;
@@ -123,7 +121,7 @@ void usart::read_async(std::byte *data, std::size_t size, const read_cb_t &callb
 
     IRQn_Type nvic_irq = static_cast<IRQn_Type>(USART1_IRQn + static_cast<uint8_t>(this->hw.id)); /* TODO: Only supported 1, 2 & 3 */
     NVIC_SetPriority(nvic_irq, NVIC_EncodePriority( NVIC_GetPriorityGrouping(), 15, 0 ));
-//    NVIC_ClearPendingIRQ(nvic_irq);
+    NVIC_ClearPendingIRQ(nvic_irq);
     NVIC_EnableIRQ(nvic_irq);
 }
 

drivers/stm32l4/usart.hpp

@@ -37,7 +37,7 @@ class usart : public hal::interface::serial
 
     void irq_handler(void);
 
-    static std::array<usart*, 3> active_objects; /* For IRQ handling, must correspond to the enum class usart::id */
+    static inline std::array<usart*, 3> instance; /* Used for global access (e.g. from interrupt) */
     struct usart_hw;
 private:
     const usart_hw &hw;

hal/hal_button.cpp

@@ -17,15 +17,30 @@ using namespace hal;
 
 button::button(hal::interface::button *interface) : interface {interface}
 {
-    this->pressed = false;
+    this->released = this->pressed = false;
     this->debounce_state = 0;
 }
 
 void button::debounce(void)
 {
-    /* This works like FIFO of button states, shifts actual button state to MSB */
-    this->debounce_state = (this->debounce_state << 1) | this->interface->is_pressed() | 0xFFFFFE00;
-    if (this->debounce_state == 0xFFFFFF00)
+    // This works like FIFO of button states, shifts actual button state bit from LSB to MSB
+    //          _      ____
+    // MSB < __| |____|    |_______ < LSB
+    //                  ^      ^
+    //                  |      |
+    //        pressed --+      +-- released
+
+    constexpr uint32_t ignore_mask = 0xFFFFFFE0;
+    /* Release debounce time: 3 <bits> * <loop period> */
+    constexpr uint32_t release_mask = 0xFFFFFFF8;
+    /* Press debounce time: 2 <bit> * <loop period> */
+    constexpr uint32_t press_mask = 0xFFFFFFE3;
+
+    this->debounce_state = (this->debounce_state << 1) | this->interface->is_pressed() | ignore_mask;
+
+    if (this->debounce_state == release_mask)
+        this->released = true;
+    else if (this->debounce_state == press_mask)
         this->pressed = true;
 }
 
@@ -34,16 +49,17 @@ bool button::is_pressed(void)
     return this->interface->is_pressed();
 }
 
+bool button::was_released(void)
+{
+    bool state = this->released;
+    this->released = false;
+    return state;
+}
+
 bool button::was_pressed(void)
 {
-    if (this->pressed)
-    {
-        this->pressed = false;
-        return true;
-    }
-    else
-    {
-        return false;
-    }
+    bool state = this->pressed;
+    this->pressed = false;
+    return state;
 }
 

hal/hal_button.hpp

@@ -25,10 +25,11 @@ namespace hal
         virtual void debounce(void);
         bool is_pressed(void);
         bool was_pressed(void);
+        bool was_released(void);
     protected:
         hal::interface::button *interface;
     private:
-        bool pressed;
+        bool pressed, released;
         uint32_t debounce_state;
     };
 

main.cpp

@@ -45,5 +45,7 @@ int main(void)
             led_blink_start = hal::system::clock::now();
             led.set(led_state ^= true);
         }
+
+        __WFI();
     }
 }

system/interrupt_handlers.cpp

@@ -25,7 +25,6 @@ extern "C" void DMA1_Channel4_IRQHandler(void)
 
 extern "C" void USART2_IRQHandler(void)
 {
-    constexpr uint8_t id = static_cast<uint8_t>(drivers::usart::id::usart2);
-    drivers::usart::active_objects[id]->irq_handler();
+    drivers::usart::instance[static_cast<uint8_t>(drivers::usart::id::usart2)]->irq_handler();
 }