feat(blink): update led blink library to the latest version

cellboard/Core/Inc/bal.h

@@ -12,7 +12,7 @@
 #ifndef BAL_H
 #define BAL_H
 
-#include "bms/bms_network.h"
+#include "bms_network.h"
 #include "cellboard_config.h"
 
 #include <inttypes.h>

cellboard/Core/Inc/blink.h

@@ -0,0 +1,26 @@
+/**
+ * @file blink.h
+ * @brief Blink a led as many times as the index of the current cellboard
+ * 
+ * @date Feb 21, 2024
+ * 
+ * @author Antonio Gelain [antonio.gelain@studenti.unitn.it]
+ */
+
+#ifndef BLINK_H
+#define BLINK_H
+
+#include "blinky.h"
+
+/** @brief Initialize the blinking behaviour of the led */
+void blink_init(void);
+
+/**
+ * @brief Get the led state at any given time
+ * 
+ * @param t The current time
+ * @return BlinkyState The current led state
+ */
+BlinkyState blink_routine(uint32_t t);
+
+#endif  // BLINK_H

cellboard/Core/Inc/peripherals/ltc6813_utils.h

@@ -11,7 +11,7 @@
 #include "can_comms.h"
 #include "cellboard_config.h"
 #include "ltc6813.h"
-#include "bms/bms_network.h"
+#include "bms_network.h"
 
 #include <inttypes.h>
 #include <main.h>

cellboard/Core/Src/blink.c

@@ -0,0 +1,45 @@
+/**
+ * @file blink.c
+ * @brief Blink a led as many times as the index of the current cellboard
+ * 
+ * @date Feb 21, 2024
+ * 
+ * @author Antonio Gelain [antonio.gelain@studenti.unitn.it]
+ */
+
+#include "blink.h"
+
+#include <stdbool.h>
+
+#include "../../../fenice_config.h"
+#include "main.h"
+
+Blinky blinker;
+uint16_t pattern[2 * (CELLBOARD_COUNT - 1)];
+
+void blink_init(void) {
+    // If the index is 0 the led is always on
+    size_t pattern_size = 0;
+    if (cellboard_index > 0) {
+        // Create pattern
+        for (size_t i = 0; i < cellboard_index; ++i) {
+            pattern[pattern_size++] = 150; // On (in ms)
+            pattern[pattern_size++] = 250; // Off (in ms)
+        }
+        pattern[pattern_size - 1] += 750; // Pause between patterns (in ms)
+    }
+
+    blinky_init(
+        &blinker,
+        pattern,
+        pattern_size,
+        true
+    );
+
+    if (cellboard_index == 0)
+        blinky_enable(&blink_init, false);
+}
+
+BlinkyState blink_routine(uint32_t t) {
+    return blinky_routine(&blinker, t);
+}

cellboard/Core/Src/can_comms.c

@@ -17,7 +17,7 @@
 #include "spi.h"
 #include "temp.h"
 #include "volt.h"
-#include "bms/bms_network.h"
+#include "bms_network.h"
 
 #include <math.h>
 #include <string.h>

cellboard/Core/Src/main.c

@@ -30,7 +30,7 @@
 /* USER CODE BEGIN Includes */
 #include "bal_fsm.h"
 #include "can_comms.h"
-#include "index_blink.h"
+#include "blink.h"
 #include "ltc6813_utils.h"
 #include "measurements.h"
 #include "temp.h"
@@ -130,15 +130,15 @@ int main(void)
 
     measurements_init(&HTIM_MEASURES);
 
-    index_blink_init(LED_GPIO_Port, LED_Pin, true);
+    blink_init();
     // HAL_TIM_Base_Start_IT(&DISCHARGE_TIMER);
 
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
     while (1) {
-        index_blink_run();
+        HAL_GPIO_WritePin(LED_GPIO_Port, LED_Pin, blink_routine(HAL_GetTick()));
         measurements_flags_check();
 #ifdef UART_LOGGING
         if (HAL_GetTick() - temp_timer >= 500) {

cellboard/STM32-for-VSCode.config.yaml

@@ -71,10 +71,10 @@ excludes:
 includeDirectories: 
   - Inc/**
   - Core/Inc/**
-  - Core/Lib/micro-libs/m95256/**
-  - Core/Lib/micro-libs/blink/**
-  - Core/Lib/micro-libs/timer-utils/**
-  - Core/Lib/can/lib/
+  - Core/Lib/micro-libs/m95256/
+  - Core/Lib/micro-libs/blinky/inc/
+  - Core/Lib/micro-libs/timer-utils/
+  - Core/Lib/can/lib/bms/
 
 
 # Files that should be included in the compilation.
@@ -85,12 +85,10 @@ includeDirectories:
 sourceFiles:  
   - Src/**
   - Core/Src/**
-  - Core/Lib/micro-libs/m95256/**
-  - Core/Lib/micro-libs/blink/**
-  - Core/Lib/micro-libs/timer-utils/**
+  - Core/Lib/micro-libs/m95256/m95256.c
+  - Core/Lib/micro-libs/blinky/src/blinky.c
+  - Core/Lib/micro-libs/timer-utils/timer_utils.c
   - Core/Lib/can/lib/bms/*.c
-  - Core/Lib/can/lib/primary/*.c
-  - Core/Lib/can/lib/secondary/*.c
 
 
 # When no makefile is present it will show a warning pop-up.

cellboard/STM32Make.make

@@ -39,23 +39,17 @@ C_SOURCES =  \
 Core/Lib/can/lib/bms/bms_network.c \
 Core/Lib/can/lib/bms/bms_utils_c.c \
 Core/Lib/can/lib/bms/bms_watchdog.c \
-Core/Lib/can/lib/primary/primary_network.c \
-Core/Lib/can/lib/primary/primary_utils_c.c \
-Core/Lib/can/lib/primary/primary_watchdog.c \
-Core/Lib/can/lib/secondary/secondary_network.c \
-Core/Lib/can/lib/secondary/secondary_utils_c.c \
-Core/Lib/can/lib/secondary/secondary_watchdog.c \
-Core/Lib/micro-libs/blink/blink.c \
+Core/Lib/micro-libs/blinky/src/blinky.c \
 Core/Lib/micro-libs/m95256/m95256.c \
 Core/Lib/micro-libs/timer-utils/timer_utils.c \
 Core/Src/bal.c \
 Core/Src/bal_fsm.c \
+Core/Src/blink.c \
 Core/Src/can.c \
 Core/Src/can_comms.c \
 Core/Src/error.c \
 Core/Src/gpio.c \
 Core/Src/i2c.c \
-Core/Src/index_blink.c \
 Core/Src/main.c \
 Core/Src/measurements.c \
 Core/Src/peripherals/adctemp.c \
@@ -165,10 +159,10 @@ AS_INCLUDES = \
 C_INCLUDES =  \
 -ICore/Inc \
 -ICore/Inc/peripherals \
--ICore/Lib/can/lib/ \
--ICore/Lib/micro-libs/blink \
--ICore/Lib/micro-libs/m95256 \
--ICore/Lib/micro-libs/timer-utils \
+-ICore/Lib/can/lib/bms/ \
+-ICore/Lib/micro-libs/blinky/inc/ \
+-ICore/Lib/micro-libs/m95256/ \
+-ICore/Lib/micro-libs/timer-utils/ \
 -IDrivers/CMSIS/Device/ST/STM32L4xx/Include \
 -IDrivers/CMSIS/Include \
 -IDrivers/STM32L4xx_HAL_Driver/Inc \