1.0 worked version
This commit is contained in:
@@ -181,8 +181,8 @@ int8_t status_mes(uint8_t* pMes, size_t nLen, struct sData *pOut)
|
||||
if(((pMes[0] >> 1) & 1) != ((rate_range_val >> 1) & 1) &&
|
||||
((pMes[0] >> 0) & 1) != ((rate_range_val >> 1) & 1)) return (-ERROR_RATE);
|
||||
|
||||
rate_val = ((uint16_t)pMes[2] << 8) | pMes[1];
|
||||
temp_val = ((uint16_t)pMes[4] << 8) | pMes[3];
|
||||
rate_val = ((uint16_t)pMes[1] << 8) | pMes[2];
|
||||
temp_val = ((uint16_t)pMes[3] << 8) | pMes[4];
|
||||
|
||||
|
||||
if(COM_MES_RATE_RANGE_VAL == COM_MES_RATE_RANGE_75) scale_rate = SCALE_RATE_RANGE_75;
|
||||
|
||||
@@ -18,8 +18,9 @@
|
||||
/* USER CODE END Header */
|
||||
/* Includes ------------------------------------------------------------------*/
|
||||
#include "main.h"
|
||||
#include "stdio.h"
|
||||
#include "gyro_mes.h"
|
||||
#include "stdio.h"
|
||||
#include "string.h"
|
||||
|
||||
/* Private includes ----------------------------------------------------------*/
|
||||
/* USER CODE BEGIN Includes */
|
||||
@@ -118,7 +119,7 @@ int main(void)
|
||||
{
|
||||
flag_cs = 1;
|
||||
CS1_ON();
|
||||
int res = HAL_SPI_TransmitReceive_IT(&hspi1, (uint8_t*) (data_in), (uint8_t *) (data_out), sizeof(data_in) / sizeof(data_in[0]));
|
||||
res = HAL_SPI_TransmitReceive_IT(&hspi1, (uint8_t*) (data_in), (uint8_t *) (data_out), sizeof(data_in) / sizeof(data_in[0]));
|
||||
while(!flag_receive && res == 0) {
|
||||
HAL_Delay(1);
|
||||
}
|
||||
@@ -138,6 +139,7 @@ int main(void)
|
||||
while(!flag_receive && res == 0) {
|
||||
HAL_Delay(1);
|
||||
}
|
||||
CS3_OFF();
|
||||
flag_receive = 0;
|
||||
/* USER CODE END WHILE */
|
||||
|
||||
@@ -319,15 +321,22 @@ void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi)
|
||||
{
|
||||
struct sData data;
|
||||
if(hspi == &hspi1)
|
||||
{
|
||||
int8_t res = status_mes(data_out, sizeof(data_out) / sizeof(data_out[0]), &data);
|
||||
if(res == 0)
|
||||
{
|
||||
char str[41];
|
||||
memset(str, 0, sizeof(str));
|
||||
sprintf (str, "Gyro%u! Temp = %i; Rate = %i\r\n", flag_cs, data.temp, data.rate);
|
||||
res = HAL_UART_Transmit_DMA(&huart1, (uint8_t*)str, sizeof(str) / sizeof(str[0]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
|
||||
if(huart == &huart1)
|
||||
{
|
||||
flag_receive = 1;
|
||||
int8_t res = status_mes(data_out, sizeof(data_out) / sizeof(data_out), &data);
|
||||
if(res == 0)
|
||||
{
|
||||
char str[40];
|
||||
sprintf (str, "Gyro%u! Temp = %i; Rate = %i.", flag_cs, data.temp, data.rate);
|
||||
HAL_UART_Transmit_DMA(&huart1, (uint8_t*)str, sizeof(str));
|
||||
}
|
||||
}
|
||||
}
|
||||
/* USER CODE END 4 */
|
||||
|
||||
@@ -206,6 +206,9 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart)
|
||||
|
||||
__HAL_LINKDMA(huart,hdmatx,hdma_usart1_tx);
|
||||
|
||||
/* USART1 interrupt Init */
|
||||
HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
|
||||
HAL_NVIC_EnableIRQ(USART1_IRQn);
|
||||
/* USER CODE BEGIN USART1_MspInit 1 */
|
||||
|
||||
/* USER CODE END USART1_MspInit 1 */
|
||||
@@ -237,6 +240,9 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart)
|
||||
|
||||
/* USART1 DMA DeInit */
|
||||
HAL_DMA_DeInit(huart->hdmatx);
|
||||
|
||||
/* USART1 interrupt DeInit */
|
||||
HAL_NVIC_DisableIRQ(USART1_IRQn);
|
||||
/* USER CODE BEGIN USART1_MspDeInit 1 */
|
||||
|
||||
/* USER CODE END USART1_MspDeInit 1 */
|
||||
|
||||
@@ -57,6 +57,7 @@
|
||||
/* External variables --------------------------------------------------------*/
|
||||
extern SPI_HandleTypeDef hspi1;
|
||||
extern DMA_HandleTypeDef hdma_usart1_tx;
|
||||
extern UART_HandleTypeDef huart1;
|
||||
/* USER CODE BEGIN EV */
|
||||
|
||||
/* USER CODE END EV */
|
||||
@@ -227,6 +228,20 @@ void SPI1_IRQHandler(void)
|
||||
/* USER CODE END SPI1_IRQn 1 */
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function handles USART1 global interrupt.
|
||||
*/
|
||||
void USART1_IRQHandler(void)
|
||||
{
|
||||
/* USER CODE BEGIN USART1_IRQn 0 */
|
||||
|
||||
/* USER CODE END USART1_IRQn 0 */
|
||||
HAL_UART_IRQHandler(&huart1);
|
||||
/* USER CODE BEGIN USART1_IRQn 1 */
|
||||
|
||||
/* USER CODE END USART1_IRQn 1 */
|
||||
}
|
||||
|
||||
/* USER CODE BEGIN 1 */
|
||||
|
||||
/* USER CODE END 1 */
|
||||
|
||||
Reference in New Issue
Block a user