maakshishov/STMGyro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add timer and uart trans reg

Browse Source
This commit is contained in:
Дима Федоренко
2022-02-02 10:53:58 +03:00
parent f1898e778e
commit 13f4055735
9 changed files with 216 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Core/Inc/my_defs.h Normal file
View File

@@ -0,0 +1,63 @@
/*
* my_defs.h
*
* Created on: 2 февр. 2022 г.
* Author: fedorenko
*/
#ifndef INC_MY_DEFS_H_
#define INC_MY_DEFS_H_
/* ------------------------
* Configuration
* ------------------------ */
#define COM_MES_MODE_NORMAL 0
#define COM_MES_MODE_FACTORY 1
#ifndef COM_MES_MODE
#define COM_MES_MODE COM_MES_MODE_NORMAL /* Mode selection */
#endif
#define COM_MES_CBIT_DISABLED 0
#define COM_MES_CBIT_ENABLED 1
#ifndef COM_MES_CBIT
#define COM_MES_CBIT COM_MES_CBIT_DISABLED /* CBIT selection */
#endif
#define COM_MES_RATE_RANGE_INT 0
#define COM_MES_RATE_RANGE_SPI 1
#ifndef COM_MES_RATE_RANGE
#define COM_MES_RATE_RANGE COM_MES_RATE_RANGE_INT /* Rate range selection */
#endif
#define COM_MES_RATE_RANGE_900 0u
#define COM_MES_RATE_RANGE_300 1u
#define COM_MES_RATE_RANGE_150 2u
#define COM_MES_RATE_RANGE_75 3u
#ifndef COM_MES_RATE_RANGE_VAL
#define COM_MES_RATE_RANGE_VAL COM_MES_RATE_RANGE_900 /* Rate range value selection */
#endif
#define SCALE_RATE_RANGE_900 8u
#define SCALE_RATE_RANGE_300 24u
#define SCALE_RATE_RANGE_150 48u
#define SCALE_RATE_RANGE_75 96u
/* ------------------------
* Errors
* ------------------------ */
#define ERROR_SIZE_SMALL 1
#define ERROR_CRC 2
#define ERROR_FAIL 3
#define ERROR_IDENTIFIER 4
#define ERROR_INVALID 5
#define ERROR_CBIT 6
#define ERROR_NORM 7
#define ERROR_RATE 8
#endif /* INC_MY_DEFS_H_ */

2
Core/Inc/stm32l4xx_hal_conf.h
View File

@@ -76,7 +76,7 @@
#define HAL_SPI_MODULE_ENABLED
/*#define HAL_SRAM_MODULE_ENABLED */
/*#define HAL_SWPMI_MODULE_ENABLED */
/*#define HAL_TIM_MODULE_ENABLED */
#define HAL_TIM_MODULE_ENABLED
/*#define HAL_TSC_MODULE_ENABLED */
#define HAL_UART_MODULE_ENABLED
/*#define HAL_USART_MODULE_ENABLED */

1
Core/Inc/stm32l4xx_it.h
View File

@@ -56,6 +56,7 @@ void DebugMon_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
void DMA1_Channel4_IRQHandler(void);
void TIM1_UP_TIM16_IRQHandler(void);
void SPI1_IRQHandler(void);
void USART1_IRQHandler(void);
/* USER CODE BEGIN EFP */

50
Core/Src/gyro_mes.c
View File

@@ -25,6 +25,7 @@
/* USER CODE END Header */
/* Includes ------------------------------------------------------------------*/
#include "gyro_mes.h"
#include "my_defs.h"
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
@@ -40,55 +41,6 @@
/* USER CODE BEGIN PD */
/* ------------------------
* Configuration
* ------------------------ */
#define COM_MES_MODE_NORMAL 0
#define COM_MES_MODE_FACTORY 1
#ifndef COM_MES_MODE
#define COM_MES_MODE COM_MES_MODE_NORMAL /* Mode selection */
#endif
#define COM_MES_CBIT_DISABLED 0
#define COM_MES_CBIT_ENABLED 1
#ifndef COM_MES_CBIT
#define COM_MES_CBIT COM_MES_CBIT_DISABLED /* CBIT selection */
#endif
#define COM_MES_RATE_RANGE_INT 0
#define COM_MES_RATE_RANGE_SPI 1
#ifndef COM_MES_RATE_RANGE
#define COM_MES_RATE_RANGE COM_MES_RATE_RANGE_INT /* Rate range selection */
#endif
#define COM_MES_RATE_RANGE_900 0u
#define COM_MES_RATE_RANGE_300 1u
#define COM_MES_RATE_RANGE_150 2u
#define COM_MES_RATE_RANGE_75 3u
#ifndef COM_MES_RATE_RANGE_VAL
#define COM_MES_RATE_RANGE_VAL COM_MES_RATE_RANGE_900 /* Rate range value selection */
#endif
#define SCALE_RATE_RANGE_900 8u
#define SCALE_RATE_RANGE_300 24u
#define SCALE_RATE_RANGE_150 48u
#define SCALE_RATE_RANGE_75 96u
/* ------------------------
* Errors
* ------------------------ */
#define ERROR_SIZE_SMALL 1
#define ERROR_CRC 2
#define ERROR_FAIL 3
#define ERROR_IDENTIFIER 4
#define ERROR_INVALID 5
#define ERROR_CBIT 6
#define ERROR_NORM 7
#define ERROR_RATE 8
/* USER CODE END PD */
/* Private macro -------------------------------------------------------------*/

79
Core/Src/main.c
View File

@@ -61,6 +61,8 @@ void GPIO_Reset(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
/* Private variables ---------------------------------------------------------*/
SPI_HandleTypeDef hspi1;
TIM_HandleTypeDef htim1;
UART_HandleTypeDef huart1;
DMA_HandleTypeDef hdma_usart1_tx;
@@ -74,6 +76,7 @@ static void MX_GPIO_Init(void);
static void MX_SPI1_Init(void);
static void MX_DMA_Init(void);
static void MX_USART1_UART_Init(void);
static void MX_TIM1_Init(void);
/* USER CODE BEGIN PFP */
/* USER CODE END PFP */
@@ -83,6 +86,7 @@ static void MX_USART1_UART_Init(void);
uint8_t data_out[18] = {0};
uint8_t flag_receive = 0;
uint8_t flag_transmit = 0;
struct sData data[3];
/* USER CODE END 0 */
/**
@@ -116,6 +120,7 @@ int main(void)
MX_SPI1_Init();
MX_DMA_Init();
MX_USART1_UART_Init();
MX_TIM1_Init();
/* USER CODE BEGIN 2 */
RESET_ON();
HAL_Delay(100);
@@ -123,7 +128,6 @@ int main(void)
/* Infinite loop */
/* USER CODE BEGIN WHILE */
struct sData data[3];
char str[19];
memset(str, 0, sizeof(str));
int8_t res = comand_mes(data_in, sizeof(data_in) / sizeof(data_in[0]));
@@ -148,17 +152,12 @@ int main(void)
CS3_OFF();
flag_receive = 0;
res = status_mes(&data_out[0], 6u, &data[0]);
res += status_mes(&data_out[6], 6u, &data[1]);
res += status_mes(&data_out[12], 6u, &data[2]);
status_mes(&data_out[0], 6u, &data[0]);
status_mes(&data_out[6], 6u, &data[1]);
status_mes(&data_out[12], 6u, &data[2]);
flag_transmit = 1;
if(res == 0)
{
res = sprintf (str, "%i;%i;%i;%i;%i;%i\r\n", data[0].rate, data[1].rate, data[2].rate, data[0].temp, data[1].temp, data[2].temp);
while(flag_transmit);
flag_transmit = 1;
HAL_UART_Transmit_DMA(&huart1, (uint8_t*)str, res);
}
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
@@ -253,6 +252,53 @@ static void MX_SPI1_Init(void)
}
/**
* @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 = 79;
htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
htim1.Init.Period = 65535;
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 USART1 Initialization Function
* @param None
@@ -275,7 +321,7 @@ static void MX_USART1_UART_Init(void)
huart1.Init.Parity = UART_PARITY_NONE;
huart1.Init.Mode = UART_MODE_TX;
huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
huart1.Init.OverSampling = UART_OVERSAMPLING_8;
huart1.Init.OverSampling = UART_OVERSAMPLING_16;
huart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
if (HAL_UART_Init(&huart1) != HAL_OK)
@@ -345,9 +391,16 @@ void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi)
flag_receive = 1;
}
void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
/*void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
{
flag_transmit = 0;
}*/
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
{
if((USART1->ISR & USART_ISR_TXE) == 0 && (USART1->ISR & USART_ISR_TC) == 0 && (flag_transmit)) USART1->RDR = data[1].rate;
else USART1->RDR = 0;
flag_transmit = 0;
}
/* USER CODE END 4 */

50
Core/Src/stm32l4xx_hal_msp.c
View File

@@ -149,6 +149,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 */
}
}
/**
* @brief UART MSP Initialization
* This function configures the hardware resources used in this example

15
Core/Src/stm32l4xx_it.c
View File

@@ -56,6 +56,7 @@
/* External variables --------------------------------------------------------*/
extern SPI_HandleTypeDef hspi1;
extern TIM_HandleTypeDef htim1;
extern DMA_HandleTypeDef hdma_usart1_tx;
extern UART_HandleTypeDef huart1;
/* USER CODE BEGIN EV */
@@ -214,6 +215,20 @@ void DMA1_Channel4_IRQHandler(void)
/* USER CODE END DMA1_Channel4_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.
*/