Exergie/NeoECU-Firmware
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consistant naming for global_state and implemented

Browse Source
This commit is contained in:
Pierre Barbier
2026-06-02 17:54:15 +02:00
parent eba2bb6f99
commit bca9d8816c
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
STM32/CM7/Core/Inc/general_state.h → STM32/CM7/Core/Inc/global_state.h
View File

20
STM32/CM7/Core/Src/main.c
View File

@@ -12,7 +12,8 @@
/* Private includes ----------------------------------------------------------*/ /* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */ /* USER CODE BEGIN Includes */
#include "global_state.h"
#include "ring_buffer.h"
/* USER CODE END Includes */ /* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/ /* Private typedef -----------------------------------------------------------*/
@@ -80,6 +81,7 @@ const osThreadAttr_t camTask_attributes = {
}; };
/* USER CODE BEGIN PV */ /* USER CODE BEGIN PV */
global_state_t state_g ={0};
/* USER CODE END PV */ /* USER CODE END PV */
/* Private function prototypes -----------------------------------------------*/ /* Private function prototypes -----------------------------------------------*/
@@ -102,12 +104,12 @@ void HAL_TIM_IC_CaptureCallback(TIM_HandleTypeDef *htim) {
switch (htim->Channel) { switch (htim->Channel) {
// HAL_TIM_ACTIVE_CHANNEL_2 is the channel used for cam interupts // HAL_TIM_ACTIVE_CHANNEL_2 is the channel used for cam interupts
case HAL_TIM_ACTIVE_CHANNEL_2: case HAL_TIM_ACTIVE_CHANNEL_2:
// TODO push timestamp to the cam ring buffer ringBufferPush(&state_g.cam_RB,HAL_TIM_ReadCapturedValue(htim,HAL_TIM_ACTIVE_CHANNEL_2));
osThreadFlagsSet(camTaskHandle, 0x01); osThreadFlagsSet(camTaskHandle, 0x01);
break; break;
// HAL_TIM_ACTIVE_CHANNEL_1 is the channel used for crank interupts // HAL_TIM_ACTIVE_CHANNEL_1 is the channel used for crank interupts
case HAL_TIM_ACTIVE_CHANNEL_1: case HAL_TIM_ACTIVE_CHANNEL_1:
// TODO push timestamp to the crank ring buffer ringBufferPush(&state_g.crank_RB,HAL_TIM_ReadCapturedValue(htim,HAL_TIM_ACTIVE_CHANNEL_1));
osThreadFlagsSet(crankTaskHandle, 0x01); osThreadFlagsSet(crankTaskHandle, 0x01);
break; break;
default: default:
@@ -154,7 +156,7 @@ int main(void) {
HAL_Init(); HAL_Init();
/* USER CODE BEGIN Init */ /* USER CODE BEGIN Init */
state_g.sync=SYNC_NOT_OK;
/* USER CODE END Init */ /* USER CODE END Init */
/* Configure the system clock */ /* Configure the system clock */
@@ -415,7 +417,10 @@ void crankHandler(void *argument) {
/* Infinite loop */ /* Infinite loop */
for (;;) { for (;;) {
osThreadFlagsWait(0x01, osFlagsWaitAny, osWaitForever); osThreadFlagsWait(0x01, osFlagsWaitAny, osWaitForever);
// TODO Handle the call if (state_g.sync == SYNC_OK) {
//TODO complete algorithm for scheduling spark
}
} }
/* USER CODE END crankHandler */ /* USER CODE END crankHandler */
} }
@@ -432,7 +437,10 @@ void camHandler(void *argument) {
/* Infinite loop */ /* Infinite loop */
for (;;) { for (;;) {
osThreadFlagsWait(0x01, osFlagsWaitAny, osWaitForever); osThreadFlagsWait(0x01, osFlagsWaitAny, osWaitForever);
// TODO Handle the call if (state_g.sync == SYNC_OK) {
//TODO complete algorithm for scheduling spark
}
} }
/* USER CODE END camHandler */ /* USER CODE END camHandler */
} }