Send time sync packets every 1000 ms
This commit is contained in:
parent
a4d6036302
commit
372d07af84
@ -21,6 +21,7 @@
|
|||||||
#define SLAVE_STATUS_BASE_ADDRESS 0x600
|
#define SLAVE_STATUS_BASE_ADDRESS 0x600
|
||||||
#define SLAVE_CMD_BASE_ADDRESS 0x500 //
|
#define SLAVE_CMD_BASE_ADDRESS 0x500 //
|
||||||
#define SLAVE_EMERGENCY_ADDRESS 0x001 // Emergency Frame
|
#define SLAVE_EMERGENCY_ADDRESS 0x001 // Emergency Frame
|
||||||
|
#define TIME_SYNC_ADDRESS 0x002
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int16_t FrameID;
|
int16_t FrameID;
|
||||||
|
@ -62,7 +62,7 @@
|
|||||||
/*#define HAL_SMBUS_MODULE_ENABLED */
|
/*#define HAL_SMBUS_MODULE_ENABLED */
|
||||||
#define HAL_SPI_MODULE_ENABLED
|
#define HAL_SPI_MODULE_ENABLED
|
||||||
/*#define HAL_SRAM_MODULE_ENABLED */
|
/*#define HAL_SRAM_MODULE_ENABLED */
|
||||||
/*#define HAL_TIM_MODULE_ENABLED */
|
#define HAL_TIM_MODULE_ENABLED
|
||||||
/*#define HAL_UART_MODULE_ENABLED */
|
/*#define HAL_UART_MODULE_ENABLED */
|
||||||
/*#define HAL_USART_MODULE_ENABLED */
|
/*#define HAL_USART_MODULE_ENABLED */
|
||||||
/*#define HAL_WWDG_MODULE_ENABLED */
|
/*#define HAL_WWDG_MODULE_ENABLED */
|
||||||
|
@ -58,6 +58,7 @@ void PendSV_Handler(void);
|
|||||||
void SysTick_Handler(void);
|
void SysTick_Handler(void);
|
||||||
void FDCAN1_IT0_IRQHandler(void);
|
void FDCAN1_IT0_IRQHandler(void);
|
||||||
void FDCAN1_IT1_IRQHandler(void);
|
void FDCAN1_IT1_IRQHandler(void);
|
||||||
|
void TIM1_UP_TIM16_IRQHandler(void);
|
||||||
void SPI1_IRQHandler(void);
|
void SPI1_IRQHandler(void);
|
||||||
/* USER CODE BEGIN EFP */
|
/* USER CODE BEGIN EFP */
|
||||||
|
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
|
||||||
#include "stm32g4xx_hal.h"
|
#include "stm32g4xx_hal.h"
|
||||||
|
#include "stm32g4xx_hal_gpio.h"
|
||||||
|
|
||||||
SlaveHandler slaves[NUMBEROFSLAVES];
|
SlaveHandler slaves[NUMBEROFSLAVES];
|
||||||
|
|
||||||
|
@ -29,6 +29,8 @@
|
|||||||
#include "SPI_Slave_Communication.h"
|
#include "SPI_Slave_Communication.h"
|
||||||
#include "Slave_Monitoring.h"
|
#include "Slave_Monitoring.h"
|
||||||
|
|
||||||
|
#include "stm32g4xx_hal_tim.h"
|
||||||
|
|
||||||
/* USER CODE END Includes */
|
/* USER CODE END Includes */
|
||||||
|
|
||||||
/* Private typedef -----------------------------------------------------------*/
|
/* Private typedef -----------------------------------------------------------*/
|
||||||
@ -52,6 +54,8 @@ FDCAN_HandleTypeDef hfdcan1;
|
|||||||
|
|
||||||
SPI_HandleTypeDef hspi1;
|
SPI_HandleTypeDef hspi1;
|
||||||
|
|
||||||
|
TIM_HandleTypeDef htim1;
|
||||||
|
|
||||||
/* USER CODE BEGIN PV */
|
/* USER CODE BEGIN PV */
|
||||||
|
|
||||||
/* USER CODE END PV */
|
/* USER CODE END PV */
|
||||||
@ -62,12 +66,18 @@ static void MX_GPIO_Init(void);
|
|||||||
static void MX_FDCAN1_Init(void);
|
static void MX_FDCAN1_Init(void);
|
||||||
static void MX_SPI1_Init(void);
|
static void MX_SPI1_Init(void);
|
||||||
static void MX_CRC_Init(void);
|
static void MX_CRC_Init(void);
|
||||||
|
static void MX_TIM1_Init(void);
|
||||||
/* USER CODE BEGIN PFP */
|
/* USER CODE BEGIN PFP */
|
||||||
void setAMSError(void);
|
void setAMSError(void);
|
||||||
/* USER CODE END PFP */
|
/* USER CODE END PFP */
|
||||||
|
|
||||||
/* Private user code ---------------------------------------------------------*/
|
/* Private user code ---------------------------------------------------------*/
|
||||||
/* USER CODE BEGIN 0 */
|
/* USER CODE BEGIN 0 */
|
||||||
|
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim) {
|
||||||
|
if (htim == &htim1) {
|
||||||
|
CAN_Transmit(&hfdcan1, TIME_SYNC_ADDRESS, NULL, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
AIRStateHandler airstates;
|
AIRStateHandler airstates;
|
||||||
ErrorFlags errorflags;
|
ErrorFlags errorflags;
|
||||||
@ -105,6 +115,7 @@ int main(void) {
|
|||||||
MX_FDCAN1_Init();
|
MX_FDCAN1_Init();
|
||||||
MX_SPI1_Init();
|
MX_SPI1_Init();
|
||||||
MX_CRC_Init();
|
MX_CRC_Init();
|
||||||
|
MX_TIM1_Init();
|
||||||
/* USER CODE BEGIN 2 */
|
/* USER CODE BEGIN 2 */
|
||||||
|
|
||||||
airstates = init_AIR_State_Maschine();
|
airstates = init_AIR_State_Maschine();
|
||||||
@ -112,6 +123,7 @@ int main(void) {
|
|||||||
set_SPI_errorInfo(&defaulterrorhandle);
|
set_SPI_errorInfo(&defaulterrorhandle);
|
||||||
spi_communication_init(&hspi1, &airstates);
|
spi_communication_init(&hspi1, &airstates);
|
||||||
CAN_Init(&hfdcan1);
|
CAN_Init(&hfdcan1);
|
||||||
|
HAL_TIM_Base_Start_IT(&htim1);
|
||||||
|
|
||||||
HAL_GPIO_WritePin(Status_LED_GPIO_Port, Status_LED_Pin, GPIO_PIN_SET);
|
HAL_GPIO_WritePin(Status_LED_GPIO_Port, Status_LED_Pin, GPIO_PIN_SET);
|
||||||
// setAMSError();
|
// setAMSError();
|
||||||
@ -285,6 +297,48 @@ static void MX_SPI1_Init(void) {
|
|||||||
/* USER CODE END SPI1_Init 2 */
|
/* USER CODE END SPI1_Init 2 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief TIM1 Initialization Function
|
||||||
|
* @param None
|
||||||
|
* @retval None
|
||||||
|
*/
|
||||||
|
static void MX_TIM1_Init(void) {
|
||||||
|
|
||||||
|
/* USER CODE BEGIN TIM1_Init 0 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_Init 0 */
|
||||||
|
|
||||||
|
TIM_ClockConfigTypeDef sClockSourceConfig = {0};
|
||||||
|
TIM_MasterConfigTypeDef sMasterConfig = {0};
|
||||||
|
|
||||||
|
/* USER CODE BEGIN TIM1_Init 1 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_Init 1 */
|
||||||
|
htim1.Instance = TIM1;
|
||||||
|
htim1.Init.Prescaler = 1599;
|
||||||
|
htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
|
||||||
|
htim1.Init.Period = 9999;
|
||||||
|
htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
||||||
|
htim1.Init.RepetitionCounter = 0;
|
||||||
|
htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
||||||
|
if (HAL_TIM_Base_Init(&htim1) != HAL_OK) {
|
||||||
|
Error_Handler();
|
||||||
|
}
|
||||||
|
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
|
||||||
|
if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK) {
|
||||||
|
Error_Handler();
|
||||||
|
}
|
||||||
|
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
||||||
|
sMasterConfig.MasterOutputTrigger2 = TIM_TRGO2_RESET;
|
||||||
|
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
||||||
|
if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK) {
|
||||||
|
Error_Handler();
|
||||||
|
}
|
||||||
|
/* USER CODE BEGIN TIM1_Init 2 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_Init 2 */
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief GPIO Initialization Function
|
* @brief GPIO Initialization Function
|
||||||
* @param None
|
* @param None
|
||||||
|
@ -293,6 +293,56 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief TIM_Base MSP Initialization
|
||||||
|
* This function configures the hardware resources used in this example
|
||||||
|
* @param htim_base: TIM_Base handle pointer
|
||||||
|
* @retval None
|
||||||
|
*/
|
||||||
|
void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
|
||||||
|
{
|
||||||
|
if(htim_base->Instance==TIM1)
|
||||||
|
{
|
||||||
|
/* USER CODE BEGIN TIM1_MspInit 0 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_MspInit 0 */
|
||||||
|
/* Peripheral clock enable */
|
||||||
|
__HAL_RCC_TIM1_CLK_ENABLE();
|
||||||
|
/* TIM1 interrupt Init */
|
||||||
|
HAL_NVIC_SetPriority(TIM1_UP_TIM16_IRQn, 0, 0);
|
||||||
|
HAL_NVIC_EnableIRQ(TIM1_UP_TIM16_IRQn);
|
||||||
|
/* USER CODE BEGIN TIM1_MspInit 1 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_MspInit 1 */
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief TIM_Base MSP De-Initialization
|
||||||
|
* This function freeze the hardware resources used in this example
|
||||||
|
* @param htim_base: TIM_Base handle pointer
|
||||||
|
* @retval None
|
||||||
|
*/
|
||||||
|
void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base)
|
||||||
|
{
|
||||||
|
if(htim_base->Instance==TIM1)
|
||||||
|
{
|
||||||
|
/* USER CODE BEGIN TIM1_MspDeInit 0 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_MspDeInit 0 */
|
||||||
|
/* Peripheral clock disable */
|
||||||
|
__HAL_RCC_TIM1_CLK_DISABLE();
|
||||||
|
|
||||||
|
/* TIM1 interrupt DeInit */
|
||||||
|
HAL_NVIC_DisableIRQ(TIM1_UP_TIM16_IRQn);
|
||||||
|
/* USER CODE BEGIN TIM1_MspDeInit 1 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_MspDeInit 1 */
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/* USER CODE BEGIN 1 */
|
/* USER CODE BEGIN 1 */
|
||||||
|
|
||||||
/* USER CODE END 1 */
|
/* USER CODE END 1 */
|
||||||
|
@ -59,6 +59,7 @@
|
|||||||
/* External variables --------------------------------------------------------*/
|
/* External variables --------------------------------------------------------*/
|
||||||
extern FDCAN_HandleTypeDef hfdcan1;
|
extern FDCAN_HandleTypeDef hfdcan1;
|
||||||
extern SPI_HandleTypeDef hspi1;
|
extern SPI_HandleTypeDef hspi1;
|
||||||
|
extern TIM_HandleTypeDef htim1;
|
||||||
/* USER CODE BEGIN EV */
|
/* USER CODE BEGIN EV */
|
||||||
|
|
||||||
/* USER CODE END EV */
|
/* USER CODE END EV */
|
||||||
@ -230,6 +231,20 @@ void FDCAN1_IT1_IRQHandler(void)
|
|||||||
/* USER CODE END FDCAN1_IT1_IRQn 1 */
|
/* USER CODE END FDCAN1_IT1_IRQn 1 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief This function handles TIM1 update interrupt and TIM16 global interrupt.
|
||||||
|
*/
|
||||||
|
void TIM1_UP_TIM16_IRQHandler(void)
|
||||||
|
{
|
||||||
|
/* USER CODE BEGIN TIM1_UP_TIM16_IRQn 0 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_UP_TIM16_IRQn 0 */
|
||||||
|
HAL_TIM_IRQHandler(&htim1);
|
||||||
|
/* USER CODE BEGIN TIM1_UP_TIM16_IRQn 1 */
|
||||||
|
|
||||||
|
/* USER CODE END TIM1_UP_TIM16_IRQn 1 */
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief This function handles SPI1 global interrupt.
|
* @brief This function handles SPI1 global interrupt.
|
||||||
*/
|
*/
|
||||||
|
2
Makefile
2
Makefile
@ -1,5 +1,5 @@
|
|||||||
##########################################################################################################################
|
##########################################################################################################################
|
||||||
# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Tue Jul 12 23:51:59 CEST 2022]
|
# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Sat Jul 30 22:35:37 CEST 2022]
|
||||||
##########################################################################################################################
|
##########################################################################################################################
|
||||||
|
|
||||||
# ------------------------------------------------
|
# ------------------------------------------------
|
||||||
|
@ -18,7 +18,8 @@ Mcu.IP2=NVIC
|
|||||||
Mcu.IP3=RCC
|
Mcu.IP3=RCC
|
||||||
Mcu.IP4=SPI1
|
Mcu.IP4=SPI1
|
||||||
Mcu.IP5=SYS
|
Mcu.IP5=SYS
|
||||||
Mcu.IPNb=6
|
Mcu.IP6=TIM1
|
||||||
|
Mcu.IPNb=7
|
||||||
Mcu.Name=STM32G441CBTx
|
Mcu.Name=STM32G441CBTx
|
||||||
Mcu.Package=LQFP48
|
Mcu.Package=LQFP48
|
||||||
Mcu.Pin0=PC13
|
Mcu.Pin0=PC13
|
||||||
@ -34,6 +35,7 @@ Mcu.Pin17=VP_CRC_VS_CRC
|
|||||||
Mcu.Pin18=VP_SYS_VS_Systick
|
Mcu.Pin18=VP_SYS_VS_Systick
|
||||||
Mcu.Pin19=VP_SYS_VS_DBSignals
|
Mcu.Pin19=VP_SYS_VS_DBSignals
|
||||||
Mcu.Pin2=PC15-OSC32_OUT
|
Mcu.Pin2=PC15-OSC32_OUT
|
||||||
|
Mcu.Pin20=VP_TIM1_VS_ClockSourceINT
|
||||||
Mcu.Pin3=PA5
|
Mcu.Pin3=PA5
|
||||||
Mcu.Pin4=PA6
|
Mcu.Pin4=PA6
|
||||||
Mcu.Pin5=PA7
|
Mcu.Pin5=PA7
|
||||||
@ -41,7 +43,7 @@ Mcu.Pin6=PB0
|
|||||||
Mcu.Pin7=PA8
|
Mcu.Pin7=PA8
|
||||||
Mcu.Pin8=PA9
|
Mcu.Pin8=PA9
|
||||||
Mcu.Pin9=PA10
|
Mcu.Pin9=PA10
|
||||||
Mcu.PinsNb=20
|
Mcu.PinsNb=21
|
||||||
Mcu.ThirdPartyNb=0
|
Mcu.ThirdPartyNb=0
|
||||||
Mcu.UserConstants=
|
Mcu.UserConstants=
|
||||||
Mcu.UserName=STM32G441CBTx
|
Mcu.UserName=STM32G441CBTx
|
||||||
@ -60,6 +62,7 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
|
|||||||
NVIC.SPI1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
|
NVIC.SPI1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
|
||||||
NVIC.SVCall_IRQn=true\:4\:0\:true\:false\:true\:false\:false\:false
|
NVIC.SVCall_IRQn=true\:4\:0\:true\:false\:true\:false\:false\:false
|
||||||
NVIC.SysTick_IRQn=true\:4\:0\:true\:false\:true\:false\:true\:false
|
NVIC.SysTick_IRQn=true\:4\:0\:true\:false\:true\:false\:true\:false
|
||||||
|
NVIC.TIM1_UP_TIM16_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
|
||||||
NVIC.UsageFault_IRQn=true\:4\:0\:true\:false\:true\:false\:false\:false
|
NVIC.UsageFault_IRQn=true\:4\:0\:true\:false\:true\:false\:false\:false
|
||||||
PA10.GPIOParameters=GPIO_Label
|
PA10.GPIOParameters=GPIO_Label
|
||||||
PA10.GPIO_Label=Status_LED
|
PA10.GPIO_Label=Status_LED
|
||||||
@ -146,7 +149,7 @@ ProjectManager.StackSize=0x400
|
|||||||
ProjectManager.TargetToolchain=Makefile
|
ProjectManager.TargetToolchain=Makefile
|
||||||
ProjectManager.ToolChainLocation=
|
ProjectManager.ToolChainLocation=
|
||||||
ProjectManager.UnderRoot=false
|
ProjectManager.UnderRoot=false
|
||||||
ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_ADC1_Init-ADC1-false-HAL-true,5-MX_ADC2_Init-ADC2-false-HAL-true,6-MX_FDCAN1_Init-FDCAN1-false-HAL-true,7-MX_SPI1_Init-SPI1-false-HAL-true,8-MX_CRC_Init-CRC-false-HAL-true
|
ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_FDCAN1_Init-FDCAN1-false-HAL-true,4-MX_SPI1_Init-SPI1-false-HAL-true,5-MX_CRC_Init-CRC-false-HAL-true
|
||||||
RCC.ADC12Freq_Value=16000000
|
RCC.ADC12Freq_Value=16000000
|
||||||
RCC.AHBFreq_Value=16000000
|
RCC.AHBFreq_Value=16000000
|
||||||
RCC.APB1Freq_Value=16000000
|
RCC.APB1Freq_Value=16000000
|
||||||
@ -197,10 +200,16 @@ SPI1.Direction=SPI_DIRECTION_2LINES
|
|||||||
SPI1.IPParameters=VirtualType,Mode,Direction,DataSize
|
SPI1.IPParameters=VirtualType,Mode,Direction,DataSize
|
||||||
SPI1.Mode=SPI_MODE_SLAVE
|
SPI1.Mode=SPI_MODE_SLAVE
|
||||||
SPI1.VirtualType=VM_SLAVE
|
SPI1.VirtualType=VM_SLAVE
|
||||||
|
TIM1.CounterMode=TIM_COUNTERMODE_UP
|
||||||
|
TIM1.IPParameters=Prescaler,CounterMode,PeriodNoDither
|
||||||
|
TIM1.PeriodNoDither=9999
|
||||||
|
TIM1.Prescaler=1599
|
||||||
VP_CRC_VS_CRC.Mode=CRC_Activate
|
VP_CRC_VS_CRC.Mode=CRC_Activate
|
||||||
VP_CRC_VS_CRC.Signal=CRC_VS_CRC
|
VP_CRC_VS_CRC.Signal=CRC_VS_CRC
|
||||||
VP_SYS_VS_DBSignals.Mode=DisableDeadBatterySignals
|
VP_SYS_VS_DBSignals.Mode=DisableDeadBatterySignals
|
||||||
VP_SYS_VS_DBSignals.Signal=SYS_VS_DBSignals
|
VP_SYS_VS_DBSignals.Signal=SYS_VS_DBSignals
|
||||||
VP_SYS_VS_Systick.Mode=SysTick
|
VP_SYS_VS_Systick.Mode=SysTick
|
||||||
VP_SYS_VS_Systick.Signal=SYS_VS_Systick
|
VP_SYS_VS_Systick.Signal=SYS_VS_Systick
|
||||||
|
VP_TIM1_VS_ClockSourceINT.Mode=Internal
|
||||||
|
VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
|
||||||
board=custom
|
board=custom
|
||||||
|
Loading…
x
Reference in New Issue
Block a user