motor control init parameters
This commit is contained in:
parent
fcb3457c42
commit
620b3867c9
@ -59,35 +59,26 @@ UART_HandleTypeDef huart6;
|
|||||||
|
|
||||||
/* Definitions for control */
|
/* Definitions for control */
|
||||||
osThreadId_t controlHandle;
|
osThreadId_t controlHandle;
|
||||||
const osThreadAttr_t control_attributes = {
|
const osThreadAttr_t control_attributes = { .name = "control", .stack_size = 512
|
||||||
.name = "control",
|
* 4, .priority = (osPriority_t) osPriorityBelowNormal, };
|
||||||
.stack_size = 128 * 4,
|
|
||||||
.priority = (osPriority_t) osPriorityNormal,
|
|
||||||
};
|
|
||||||
/* Definitions for draw */
|
/* Definitions for draw */
|
||||||
osThreadId_t drawHandle;
|
osThreadId_t drawHandle;
|
||||||
const osThreadAttr_t draw_attributes = {
|
const osThreadAttr_t draw_attributes = { .name = "draw", .stack_size = 512 * 4,
|
||||||
.name = "draw",
|
.priority = (osPriority_t) osPriorityLow, };
|
||||||
.stack_size = 512 * 4,
|
|
||||||
.priority = (osPriority_t) osPriorityLow,
|
|
||||||
};
|
|
||||||
/* Definitions for menu */
|
/* Definitions for menu */
|
||||||
osThreadId_t menuHandle;
|
osThreadId_t menuHandle;
|
||||||
const osThreadAttr_t menu_attributes = {
|
const osThreadAttr_t menu_attributes = { .name = "menu", .stack_size = 256 * 4,
|
||||||
.name = "menu",
|
.priority = (osPriority_t) osPriorityLow, };
|
||||||
.stack_size = 256 * 4,
|
/* Definitions for balance */
|
||||||
.priority = (osPriority_t) osPriorityLow,
|
osThreadId_t balanceHandle;
|
||||||
};
|
const osThreadAttr_t balance_attributes = { .name = "balance", .stack_size = 128
|
||||||
|
* 4, .priority = (osPriority_t) osPriorityLow7, };
|
||||||
/* Definitions for presses */
|
/* Definitions for presses */
|
||||||
osMessageQueueId_t pressesHandle;
|
osMessageQueueId_t pressesHandle;
|
||||||
const osMessageQueueAttr_t presses_attributes = {
|
const osMessageQueueAttr_t presses_attributes = { .name = "presses" };
|
||||||
.name = "presses"
|
|
||||||
};
|
|
||||||
/* Definitions for display */
|
/* Definitions for display */
|
||||||
osMutexId_t displayHandle;
|
osMutexId_t displayHandle;
|
||||||
const osMutexAttr_t display_attributes = {
|
const osMutexAttr_t display_attributes = { .name = "display" };
|
||||||
.name = "display"
|
|
||||||
};
|
|
||||||
/* USER CODE BEGIN PV */
|
/* USER CODE BEGIN PV */
|
||||||
|
|
||||||
/* USER CODE END PV */
|
/* USER CODE END PV */
|
||||||
@ -105,6 +96,7 @@ static void MX_I2C1_Init(void);
|
|||||||
void start_control(void *argument);
|
void start_control(void *argument);
|
||||||
void snakegame(void *argument);
|
void snakegame(void *argument);
|
||||||
void handle_menu(void *argument);
|
void handle_menu(void *argument);
|
||||||
|
void start_balance(void *argument);
|
||||||
|
|
||||||
/* USER CODE BEGIN PFP */
|
/* USER CODE BEGIN PFP */
|
||||||
|
|
||||||
@ -127,6 +119,11 @@ int redraw_menu_pending;
|
|||||||
#define GRID_X 2
|
#define GRID_X 2
|
||||||
#define GRID_Y 3
|
#define GRID_Y 3
|
||||||
uint8_t menu_status[GRID_X][GRID_Y] = { 0 };
|
uint8_t menu_status[GRID_X][GRID_Y] = { 0 };
|
||||||
|
|
||||||
|
struct motorstruct {
|
||||||
|
float wr, ur;
|
||||||
|
float wl, ul;
|
||||||
|
} motor;
|
||||||
void process_line(const char *line) {
|
void process_line(const char *line) {
|
||||||
if (strncmp(line, "ABS:", 4) == 0) {
|
if (strncmp(line, "ABS:", 4) == 0) {
|
||||||
char axis[32];
|
char axis[32];
|
||||||
@ -134,7 +131,7 @@ void process_line(const char *line) {
|
|||||||
if (sscanf(line, "ABS:%31[^:]:%d:", axis, &value) == 2) {
|
if (sscanf(line, "ABS:%31[^:]:%d:", axis, &value) == 2) {
|
||||||
// Handle axis input
|
// Handle axis input
|
||||||
if (strcmp(axis, "ABS_X") == 0) {
|
if (strcmp(axis, "ABS_X") == 0) {
|
||||||
|
motor.ul = 2 * 3.1415 / 32000.1 * value;
|
||||||
// Do something with X axis
|
// Do something with X axis
|
||||||
|
|
||||||
} else if (strcmp(axis, "ABS_Y") == 0) {
|
} else if (strcmp(axis, "ABS_Y") == 0) {
|
||||||
@ -152,14 +149,21 @@ void process_line(const char *line) {
|
|||||||
if (state) {
|
if (state) {
|
||||||
char dir;
|
char dir;
|
||||||
dir = key[0];
|
dir = key[0];
|
||||||
osStatus_t status = osMessageQueuePut(pressesHandle, &dir, 0,
|
if (dir == 'L' || dir == 'R' || dir == 'D' || dir == 'U'
|
||||||
0);
|
|| dir == 'A') {
|
||||||
|
if (dir == 'U') {
|
||||||
|
motor.ul = -1 * motor.ul;
|
||||||
|
}
|
||||||
|
osStatus_t status = osMessageQueuePut(pressesHandle, &dir,
|
||||||
|
0, 0);
|
||||||
|
|
||||||
if (status != osOK) {
|
if (status != osOK) {
|
||||||
// Optional: Handle error
|
// Optional: Handle error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if (key[0] == 'B' && state == 1) { // B goes to the menu
|
if (key[0] == 'B' && state == 1) { // B goes to the menu
|
||||||
run_snake = 0;
|
run_snake = 0;
|
||||||
run_menu = 1;
|
run_menu = 1;
|
||||||
@ -194,7 +198,7 @@ void UART_CALLBACK() {
|
|||||||
#define TIM4_ARR_VALUE 1024
|
#define TIM4_ARR_VALUE 1024
|
||||||
uint32_t TIM4_CurrentCount;
|
uint32_t TIM4_CurrentCount;
|
||||||
uint32_t TIM4_PreviousCount = 0;
|
uint32_t TIM4_PreviousCount = 0;
|
||||||
#define TS 0.01
|
#define TS 0.005
|
||||||
#define M_PI 3.1415
|
#define M_PI 3.1415
|
||||||
float encoder_TIM4_speed_rad() {
|
float encoder_TIM4_speed_rad() {
|
||||||
int32_t TIM4_DiffCount;
|
int32_t TIM4_DiffCount;
|
||||||
@ -218,6 +222,31 @@ float encoder_TIM4_speed_rad() {
|
|||||||
TIM4_PreviousCount = TIM4_CurrentCount;
|
TIM4_PreviousCount = TIM4_CurrentCount;
|
||||||
return (float) TIM4_DiffCount / (TIM4_ARR_VALUE * TS) * 2 * M_PI;
|
return (float) TIM4_DiffCount / (TIM4_ARR_VALUE * TS) * 2 * M_PI;
|
||||||
}
|
}
|
||||||
|
#define TIM1_ARR_VALUE 1024
|
||||||
|
uint32_t TIM1_CurrentCount;
|
||||||
|
uint32_t TIM1_PreviousCount = 0;
|
||||||
|
float encoder_TIM1_speed_rad() {
|
||||||
|
int32_t TIM1_DiffCount;
|
||||||
|
TIM1_CurrentCount = __HAL_TIM_GET_COUNTER(&htim1);
|
||||||
|
/* evaluate increment of TIM3 counter from previous count */
|
||||||
|
if (__HAL_TIM_IS_TIM_COUNTING_DOWN(&htim1)) {
|
||||||
|
/* check for counter underflow */
|
||||||
|
if (TIM1_CurrentCount <= TIM1_PreviousCount)
|
||||||
|
TIM1_DiffCount = TIM1_CurrentCount - TIM1_PreviousCount;
|
||||||
|
else
|
||||||
|
TIM1_DiffCount = -((TIM1_ARR_VALUE + 1) - TIM1_CurrentCount)
|
||||||
|
- TIM1_PreviousCount;
|
||||||
|
} else {
|
||||||
|
/* check for counter overflow */
|
||||||
|
if (TIM1_CurrentCount >= TIM1_PreviousCount)
|
||||||
|
TIM1_DiffCount = TIM1_CurrentCount - TIM1_PreviousCount;
|
||||||
|
else
|
||||||
|
TIM1_DiffCount = ((TIM1_ARR_VALUE + 1) - TIM1_PreviousCount)
|
||||||
|
+ TIM1_CurrentCount;
|
||||||
|
}
|
||||||
|
TIM1_PreviousCount = TIM1_CurrentCount;
|
||||||
|
return (float) TIM1_DiffCount / (TIM1_ARR_VALUE * TS) * 2 * M_PI;
|
||||||
|
}
|
||||||
#define TIM5_ARR_VALUE 4000
|
#define TIM5_ARR_VALUE 4000
|
||||||
void set_pwm(float duty, char motor, char mode) {
|
void set_pwm(float duty, char motor, char mode) {
|
||||||
// Limit the duty cycle to ±70%
|
// Limit the duty cycle to ±70%
|
||||||
@ -248,6 +277,7 @@ void set_pwm(float duty, char motor, char mode) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (motor == 'l') {
|
if (motor == 'l') {
|
||||||
|
|
||||||
if (duty >= 0) { // rotate forward
|
if (duty >= 0) { // rotate forward
|
||||||
if (mode == 'c') {
|
if (mode == 'c') {
|
||||||
__HAL_TIM_SET_COMPARE(&htim5, TIM_CHANNEL_3,
|
__HAL_TIM_SET_COMPARE(&htim5, TIM_CHANNEL_3,
|
||||||
@ -277,8 +307,7 @@ void set_pwm(float duty, char motor, char mode) {
|
|||||||
* @brief The application entry point.
|
* @brief The application entry point.
|
||||||
* @retval int
|
* @retval int
|
||||||
*/
|
*/
|
||||||
int main(void)
|
int main(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN 1 */
|
/* USER CODE BEGIN 1 */
|
||||||
|
|
||||||
@ -301,6 +330,8 @@ int main(void)
|
|||||||
/* USER CODE END SysInit */
|
/* USER CODE END SysInit */
|
||||||
|
|
||||||
/* Initialize all configured peripherals */
|
/* Initialize all configured peripherals */
|
||||||
|
|
||||||
|
|
||||||
MX_GPIO_Init();
|
MX_GPIO_Init();
|
||||||
MX_DMA_Init();
|
MX_DMA_Init();
|
||||||
MX_SPI1_Init();
|
MX_SPI1_Init();
|
||||||
@ -309,6 +340,7 @@ int main(void)
|
|||||||
MX_TIM5_Init();
|
MX_TIM5_Init();
|
||||||
MX_USART6_UART_Init();
|
MX_USART6_UART_Init();
|
||||||
MX_I2C1_Init();
|
MX_I2C1_Init();
|
||||||
|
|
||||||
/* USER CODE BEGIN 2 */
|
/* USER CODE BEGIN 2 */
|
||||||
ILI9341_Init();
|
ILI9341_Init();
|
||||||
ILI9341_SetRotation(SCREEN_HORIZONTAL_1);
|
ILI9341_SetRotation(SCREEN_HORIZONTAL_1);
|
||||||
@ -353,6 +385,9 @@ int main(void)
|
|||||||
/* creation of menu */
|
/* creation of menu */
|
||||||
menuHandle = osThreadNew(handle_menu, NULL, &menu_attributes);
|
menuHandle = osThreadNew(handle_menu, NULL, &menu_attributes);
|
||||||
|
|
||||||
|
/* creation of balance */
|
||||||
|
balanceHandle = osThreadNew(start_balance, NULL, &balance_attributes);
|
||||||
|
|
||||||
/* USER CODE BEGIN RTOS_THREADS */
|
/* USER CODE BEGIN RTOS_THREADS */
|
||||||
/* add threads, ... */
|
/* add threads, ... */
|
||||||
|
|
||||||
@ -394,7 +429,7 @@ int main(void)
|
|||||||
|
|
||||||
/* USER CODE BEGIN 3 */
|
/* USER CODE BEGIN 3 */
|
||||||
float tempspeed;
|
float tempspeed;
|
||||||
tempspeed = encoder_TIM4_speed_rad();
|
//tempspeed = encoder_TIM4_speed_rad();
|
||||||
HAL_Delay(10);
|
HAL_Delay(10);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -405,8 +440,7 @@ int main(void)
|
|||||||
* @brief System Clock Configuration
|
* @brief System Clock Configuration
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
void SystemClock_Config(void)
|
void SystemClock_Config(void) {
|
||||||
{
|
|
||||||
RCC_OscInitTypeDef RCC_OscInitStruct = { 0 };
|
RCC_OscInitTypeDef RCC_OscInitStruct = { 0 };
|
||||||
RCC_ClkInitTypeDef RCC_ClkInitStruct = { 0 };
|
RCC_ClkInitTypeDef RCC_ClkInitStruct = { 0 };
|
||||||
|
|
||||||
@ -422,8 +456,7 @@ void SystemClock_Config(void)
|
|||||||
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
|
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
|
||||||
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
|
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
|
||||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
|
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
|
||||||
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
|
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -436,8 +469,7 @@ void SystemClock_Config(void)
|
|||||||
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
|
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
|
||||||
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
|
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
|
||||||
|
|
||||||
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK)
|
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_0) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -447,11 +479,14 @@ void SystemClock_Config(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_I2C1_Init(void)
|
static void MX_I2C1_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN I2C1_Init 0 */
|
/* USER CODE BEGIN I2C1_Init 0 */
|
||||||
|
//HAL_RCC_I2C1_FORCE_RESET();
|
||||||
|
HAL_Delay(10);
|
||||||
|
//HAL_RCC_I2C1_RELEASE_RESET();
|
||||||
|
|
||||||
|
//HAL_I2C_Init(&hi2c1);
|
||||||
/* USER CODE END I2C1_Init 0 */
|
/* USER CODE END I2C1_Init 0 */
|
||||||
|
|
||||||
/* USER CODE BEGIN I2C1_Init 1 */
|
/* USER CODE BEGIN I2C1_Init 1 */
|
||||||
@ -466,12 +501,13 @@ static void MX_I2C1_Init(void)
|
|||||||
hi2c1.Init.OwnAddress2 = 0;
|
hi2c1.Init.OwnAddress2 = 0;
|
||||||
hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
|
hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
|
||||||
hi2c1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
|
hi2c1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
|
||||||
if (HAL_I2C_Init(&hi2c1) != HAL_OK)
|
if (HAL_I2C_Init(&hi2c1) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN I2C1_Init 2 */
|
/* USER CODE BEGIN I2C1_Init 2 */
|
||||||
|
HAL_I2C_DeInit(&hi2c1);
|
||||||
|
HAL_Delay(10); // Allow lines to settle
|
||||||
|
HAL_I2C_Init(&hi2c1);
|
||||||
/* USER CODE END I2C1_Init 2 */
|
/* USER CODE END I2C1_Init 2 */
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -481,8 +517,7 @@ static void MX_I2C1_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_SPI1_Init(void)
|
static void MX_SPI1_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN SPI1_Init 0 */
|
/* USER CODE BEGIN SPI1_Init 0 */
|
||||||
|
|
||||||
@ -504,8 +539,7 @@ static void MX_SPI1_Init(void)
|
|||||||
hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
|
hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
|
||||||
hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
|
hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
|
||||||
hspi1.Init.CRCPolynomial = 10;
|
hspi1.Init.CRCPolynomial = 10;
|
||||||
if (HAL_SPI_Init(&hspi1) != HAL_OK)
|
if (HAL_SPI_Init(&hspi1) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN SPI1_Init 2 */
|
/* USER CODE BEGIN SPI1_Init 2 */
|
||||||
@ -519,8 +553,7 @@ static void MX_SPI1_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_TIM1_Init(void)
|
static void MX_TIM1_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN TIM1_Init 0 */
|
/* USER CODE BEGIN TIM1_Init 0 */
|
||||||
|
|
||||||
@ -548,18 +581,17 @@ static void MX_TIM1_Init(void)
|
|||||||
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
|
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
|
||||||
sConfig.IC2Prescaler = TIM_ICPSC_DIV8;
|
sConfig.IC2Prescaler = TIM_ICPSC_DIV8;
|
||||||
sConfig.IC2Filter = 15;
|
sConfig.IC2Filter = 15;
|
||||||
if (HAL_TIM_Encoder_Init(&htim1, &sConfig) != HAL_OK)
|
if (HAL_TIM_Encoder_Init(&htim1, &sConfig) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
||||||
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
||||||
if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
|
if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig)
|
||||||
{
|
!= HAL_OK) {
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN TIM1_Init 2 */
|
/* USER CODE BEGIN TIM1_Init 2 */
|
||||||
|
HAL_TIM_Encoder_Start(&htim1, TIM_CHANNEL_ALL);
|
||||||
/* USER CODE END TIM1_Init 2 */
|
/* USER CODE END TIM1_Init 2 */
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -569,8 +601,7 @@ static void MX_TIM1_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_TIM4_Init(void)
|
static void MX_TIM4_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN TIM4_Init 0 */
|
/* USER CODE BEGIN TIM4_Init 0 */
|
||||||
|
|
||||||
@ -585,7 +616,7 @@ static void MX_TIM4_Init(void)
|
|||||||
htim4.Instance = TIM4;
|
htim4.Instance = TIM4;
|
||||||
htim4.Init.Prescaler = 0;
|
htim4.Init.Prescaler = 0;
|
||||||
htim4.Init.CounterMode = TIM_COUNTERMODE_UP;
|
htim4.Init.CounterMode = TIM_COUNTERMODE_UP;
|
||||||
htim4.Init.Period = TIM4_ARR_VALUE;
|
htim4.Init.Period = 65535;
|
||||||
htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
htim4.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
||||||
htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
htim4.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
||||||
sConfig.EncoderMode = TIM_ENCODERMODE_TI12;
|
sConfig.EncoderMode = TIM_ENCODERMODE_TI12;
|
||||||
@ -597,14 +628,13 @@ static void MX_TIM4_Init(void)
|
|||||||
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
|
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
|
||||||
sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
|
sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
|
||||||
sConfig.IC2Filter = 15;
|
sConfig.IC2Filter = 15;
|
||||||
if (HAL_TIM_Encoder_Init(&htim4, &sConfig) != HAL_OK)
|
if (HAL_TIM_Encoder_Init(&htim4, &sConfig) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
||||||
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
||||||
if (HAL_TIMEx_MasterConfigSynchronization(&htim4, &sMasterConfig) != HAL_OK)
|
if (HAL_TIMEx_MasterConfigSynchronization(&htim4, &sMasterConfig)
|
||||||
{
|
!= HAL_OK) {
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN TIM4_Init 2 */
|
/* USER CODE BEGIN TIM4_Init 2 */
|
||||||
@ -618,8 +648,7 @@ static void MX_TIM4_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_TIM5_Init(void)
|
static void MX_TIM5_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN TIM5_Init 0 */
|
/* USER CODE BEGIN TIM5_Init 0 */
|
||||||
|
|
||||||
@ -634,37 +663,36 @@ static void MX_TIM5_Init(void)
|
|||||||
htim5.Instance = TIM5;
|
htim5.Instance = TIM5;
|
||||||
htim5.Init.Prescaler = 15;
|
htim5.Init.Prescaler = 15;
|
||||||
htim5.Init.CounterMode = TIM_COUNTERMODE_UP;
|
htim5.Init.CounterMode = TIM_COUNTERMODE_UP;
|
||||||
htim5.Init.Period = TIM5_ARR_VALUE;
|
htim5.Init.Period = 4000;
|
||||||
htim5.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
htim5.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
|
||||||
htim5.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
htim5.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
|
||||||
if (HAL_TIM_PWM_Init(&htim5) != HAL_OK)
|
if (HAL_TIM_PWM_Init(&htim5) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
||||||
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
||||||
if (HAL_TIMEx_MasterConfigSynchronization(&htim5, &sMasterConfig) != HAL_OK)
|
if (HAL_TIMEx_MasterConfigSynchronization(&htim5, &sMasterConfig)
|
||||||
{
|
!= HAL_OK) {
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
sConfigOC.OCMode = TIM_OCMODE_PWM1;
|
sConfigOC.OCMode = TIM_OCMODE_PWM1;
|
||||||
sConfigOC.Pulse = 0;
|
sConfigOC.Pulse = 0;
|
||||||
sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
|
sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
|
||||||
sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
|
sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
|
||||||
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
|
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_1)
|
||||||
{
|
!= HAL_OK) {
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_2) != HAL_OK)
|
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_2)
|
||||||
{
|
!= HAL_OK) {
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
|
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_3)
|
||||||
{
|
!= HAL_OK) {
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_4) != HAL_OK)
|
if (HAL_TIM_PWM_ConfigChannel(&htim5, &sConfigOC, TIM_CHANNEL_4)
|
||||||
{
|
!= HAL_OK) {
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN TIM5_Init 2 */
|
/* USER CODE BEGIN TIM5_Init 2 */
|
||||||
@ -688,8 +716,7 @@ static void MX_TIM5_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_USART6_UART_Init(void)
|
static void MX_USART6_UART_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* USER CODE BEGIN USART6_Init 0 */
|
/* USER CODE BEGIN USART6_Init 0 */
|
||||||
|
|
||||||
@ -706,8 +733,7 @@ static void MX_USART6_UART_Init(void)
|
|||||||
huart6.Init.Mode = UART_MODE_TX_RX;
|
huart6.Init.Mode = UART_MODE_TX_RX;
|
||||||
huart6.Init.HwFlowCtl = UART_HWCONTROL_NONE;
|
huart6.Init.HwFlowCtl = UART_HWCONTROL_NONE;
|
||||||
huart6.Init.OverSampling = UART_OVERSAMPLING_16;
|
huart6.Init.OverSampling = UART_OVERSAMPLING_16;
|
||||||
if (HAL_UART_Init(&huart6) != HAL_OK)
|
if (HAL_UART_Init(&huart6) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN USART6_Init 2 */
|
/* USER CODE BEGIN USART6_Init 2 */
|
||||||
@ -721,8 +747,7 @@ static void MX_USART6_UART_Init(void)
|
|||||||
/**
|
/**
|
||||||
* Enable DMA controller clock
|
* Enable DMA controller clock
|
||||||
*/
|
*/
|
||||||
static void MX_DMA_Init(void)
|
static void MX_DMA_Init(void) {
|
||||||
{
|
|
||||||
|
|
||||||
/* DMA controller clock enable */
|
/* DMA controller clock enable */
|
||||||
__HAL_RCC_DMA2_CLK_ENABLE();
|
__HAL_RCC_DMA2_CLK_ENABLE();
|
||||||
@ -742,8 +767,7 @@ static void MX_DMA_Init(void)
|
|||||||
* @param None
|
* @param None
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
static void MX_GPIO_Init(void)
|
static void MX_GPIO_Init(void) {
|
||||||
{
|
|
||||||
GPIO_InitTypeDef GPIO_InitStruct = { 0 };
|
GPIO_InitTypeDef GPIO_InitStruct = { 0 };
|
||||||
/* USER CODE BEGIN MX_GPIO_Init_1 */
|
/* USER CODE BEGIN MX_GPIO_Init_1 */
|
||||||
|
|
||||||
@ -800,17 +824,102 @@ static void MX_GPIO_Init(void)
|
|||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
/* USER CODE END Header_start_control */
|
/* USER CODE END Header_start_control */
|
||||||
void start_control(void *argument)
|
void start_control(void *argument) {
|
||||||
{
|
|
||||||
/* USER CODE BEGIN 5 */
|
/* USER CODE BEGIN 5 */
|
||||||
/* Infinite loop */
|
/* Infinite loop */
|
||||||
float tempspeed;
|
float tempspeed;
|
||||||
|
float Ki = 0.5 * 0.5;
|
||||||
|
float Kp = 0.005 * 10;
|
||||||
|
float Kw = 1;
|
||||||
|
float integral1 = 0;
|
||||||
|
float integral2 = 0;
|
||||||
|
float sat_diff_1 = 0;
|
||||||
|
float sat_diff_2 = 0;
|
||||||
|
static char statsBuffer[200];
|
||||||
|
motor.ul = 2 * M_PI;
|
||||||
|
motor.ur = 2 * M_PI;
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
osDelay(10);
|
|
||||||
set_pwm(0.1, 'l', 'c');
|
|
||||||
|
|
||||||
tempspeed=encoder_TIM4_speed_rad();
|
vTaskDelay(5);
|
||||||
|
|
||||||
|
vTaskGetRunTimeStats(statsBuffer);
|
||||||
|
//motor.wr = encoder_TIM3_speed_rad();
|
||||||
|
|
||||||
|
tempspeed = -encoder_TIM1_speed_rad();
|
||||||
|
if (fabsf(tempspeed - motor.wr) < 700.0f) {
|
||||||
|
motor.wr = tempspeed;
|
||||||
|
char uart_buf[20];
|
||||||
|
int whole = (int) motor.wr;
|
||||||
|
int frac = (int) ((motor.wr - whole) * 1000); // 3 decimal digits
|
||||||
|
|
||||||
|
if (frac < 0)
|
||||||
|
frac = -frac; // handle negative numbers
|
||||||
|
//
|
||||||
|
int len = 0;
|
||||||
|
if (motor.wr < 0 && whole == 0)
|
||||||
|
len = sprintf(uart_buf, "-0.%03d\r\n", frac);
|
||||||
|
else
|
||||||
|
len = sprintf(uart_buf, "%d.%03d\r\n", whole, frac);
|
||||||
|
|
||||||
|
HAL_UART_Transmit(&huart6, (uint8_t*) uart_buf, len, HAL_MAX_DELAY);
|
||||||
|
}
|
||||||
|
tempspeed = -encoder_TIM4_speed_rad();
|
||||||
|
if (fabsf(tempspeed - motor.wl) > 70.0f) {
|
||||||
|
|
||||||
|
} else {
|
||||||
|
motor.wl = tempspeed;
|
||||||
|
|
||||||
|
// char uart_buf[20];
|
||||||
|
// int whole = (int) motor.wl;
|
||||||
|
// int frac = (int) ((motor.wl - whole) * 1000); // 3 decimal digits
|
||||||
|
//
|
||||||
|
// if (frac < 0)
|
||||||
|
// frac = -frac; // handle negative numbers
|
||||||
|
////
|
||||||
|
// int len = 0;
|
||||||
|
// if (motor.wl < 0 && whole == 0)
|
||||||
|
// len = sprintf(uart_buf, "-0.%03d\r\n", frac);
|
||||||
|
// else
|
||||||
|
// len = sprintf(uart_buf, "%d.%03d\r\n", whole, frac);
|
||||||
|
//
|
||||||
|
// HAL_UART_Transmit(&huart6, (uint8_t*) uart_buf, len, HAL_MAX_DELAY);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculation for Motor 1 control signal
|
||||||
|
float error1 = (-1) * motor.ur - motor.wr;
|
||||||
|
if (error1 > 10) {
|
||||||
|
int t = 0;
|
||||||
|
}
|
||||||
|
float anti_windup_1 = Ki * error1 - sat_diff_1 * Kw;
|
||||||
|
integral1 += anti_windup_1 * TS;
|
||||||
|
float control1 = integral1 + Kp * error1;
|
||||||
|
float unsat_control_1 = control1;
|
||||||
|
control1 =
|
||||||
|
fabsf(control1) > 0.7f ?
|
||||||
|
(control1 / fabsf(control1)) * 0.7f : control1;
|
||||||
|
sat_diff_1 = unsat_control_1 - control1;
|
||||||
|
|
||||||
|
set_pwm(control1, 'r', 'c');
|
||||||
|
|
||||||
|
// Calculation for Motor 2 control signal
|
||||||
|
float error2 = motor.ul - motor.wl;
|
||||||
|
if (error2 > 10) {
|
||||||
|
int t = 0;
|
||||||
|
}
|
||||||
|
float anti_windup_2 = Ki * error2 - sat_diff_2 * Kw;
|
||||||
|
integral2 += anti_windup_2 * TS;
|
||||||
|
float control2 = integral2 + Kp * error2;
|
||||||
|
float unsat_control_2 = control2;
|
||||||
|
control2 =
|
||||||
|
fabsf(control2) > 0.7f ?
|
||||||
|
(control2 / fabsf(control2)) * 0.7f : control2;
|
||||||
|
sat_diff_2 = unsat_control_2 - control2;
|
||||||
|
|
||||||
|
set_pwm(control2, 'l', 'c');
|
||||||
|
//set_pwm(-0.7, 'l', 'c');
|
||||||
|
|
||||||
}
|
}
|
||||||
/* USER CODE END 5 */
|
/* USER CODE END 5 */
|
||||||
}
|
}
|
||||||
@ -822,8 +931,7 @@ void start_control(void *argument)
|
|||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
/* USER CODE END Header_snakegame */
|
/* USER CODE END Header_snakegame */
|
||||||
void snakegame(void *argument)
|
void snakegame(void *argument) {
|
||||||
{
|
|
||||||
/* USER CODE BEGIN snakegame */
|
/* USER CODE BEGIN snakegame */
|
||||||
/* Infinite loop */
|
/* Infinite loop */
|
||||||
//ILI9341_FillScreen(BLACK);
|
//ILI9341_FillScreen(BLACK);
|
||||||
@ -917,8 +1025,7 @@ void redraw_menu() { //only done onece saves resources
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* USER CODE END Header_handle_menu */
|
/* USER CODE END Header_handle_menu */
|
||||||
void handle_menu(void *argument)
|
void handle_menu(void *argument) {
|
||||||
{
|
|
||||||
/* USER CODE BEGIN handle_menu */
|
/* USER CODE BEGIN handle_menu */
|
||||||
/* Infinite loop */
|
/* Infinite loop */
|
||||||
|
|
||||||
@ -926,7 +1033,6 @@ void handle_menu(void *argument)
|
|||||||
vTaskDelay(50);
|
vTaskDelay(50);
|
||||||
redraw_menu();
|
redraw_menu();
|
||||||
while (1) {
|
while (1) {
|
||||||
|
|
||||||
// Check input
|
// Check input
|
||||||
if (run_menu) {
|
if (run_menu) {
|
||||||
osStatus_t status = osMessageQueueGet(pressesHandle, &dir, NULL,
|
osStatus_t status = osMessageQueueGet(pressesHandle, &dir, NULL,
|
||||||
@ -942,15 +1048,26 @@ void handle_menu(void *argument)
|
|||||||
}
|
}
|
||||||
if (dir == 'U' || dir == 'D' || dir == 'L' || dir == 'R') {
|
if (dir == 'U' || dir == 'D' || dir == 'L' || dir == 'R') {
|
||||||
if (menu_status[sel_x][sel_y]) {
|
if (menu_status[sel_x][sel_y]) {
|
||||||
|
if (osMutexAcquire(displayHandle, osWaitForever)
|
||||||
|
== osOK) {
|
||||||
|
|
||||||
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
||||||
START_X + sel_x * CELL_WIDTH,
|
START_X + sel_x * CELL_WIDTH,
|
||||||
START_Y + sel_y * CELL_HEIGHT, COLOR_TEXT,
|
START_Y + sel_y * CELL_HEIGHT, COLOR_TEXT,
|
||||||
COLOR_ACTIVATED);
|
COLOR_ACTIVATED);
|
||||||
|
osMutexRelease(displayHandle);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
|
if (osMutexAcquire(displayHandle, osWaitForever)
|
||||||
|
== osOK) {
|
||||||
|
|
||||||
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
||||||
START_X + sel_x * CELL_WIDTH,
|
START_X + sel_x * CELL_WIDTH,
|
||||||
START_Y + sel_y * CELL_HEIGHT, COLOR_TEXT,
|
START_Y + sel_y * CELL_HEIGHT, COLOR_TEXT,
|
||||||
COLOR_BG);
|
COLOR_BG);
|
||||||
|
osMutexRelease(displayHandle);
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (dir == 'U' && sel_y > 0)
|
if (dir == 'U' && sel_y > 0)
|
||||||
@ -963,15 +1080,27 @@ void handle_menu(void *argument)
|
|||||||
sel_x++;
|
sel_x++;
|
||||||
}
|
}
|
||||||
if (menu_status[sel_x][sel_y]) {
|
if (menu_status[sel_x][sel_y]) {
|
||||||
|
if (osMutexAcquire(displayHandle, osWaitForever) == osOK) {
|
||||||
|
|
||||||
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
||||||
START_X + sel_x * CELL_WIDTH, START_Y + sel_y * CELL_HEIGHT,
|
START_X + sel_x * CELL_WIDTH, START_Y + sel_y * CELL_HEIGHT,
|
||||||
COLOR_TEXT,
|
COLOR_TEXT,
|
||||||
COLOR_ACTIVATED_AND_SELECTED);
|
COLOR_ACTIVATED_AND_SELECTED);
|
||||||
|
osMutexRelease(displayHandle);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
if (osMutexAcquire(displayHandle, osWaitForever) == osOK) {
|
||||||
|
|
||||||
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
||||||
START_X + sel_x * CELL_WIDTH, START_Y + sel_y * CELL_HEIGHT,
|
START_X + sel_x * CELL_WIDTH, START_Y + sel_y * CELL_HEIGHT,
|
||||||
COLOR_TEXT,
|
COLOR_TEXT,
|
||||||
COLOR_SELECTED);
|
COLOR_SELECTED);
|
||||||
|
osMutexRelease(displayHandle);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if (redraw_menu_pending) {
|
if (redraw_menu_pending) {
|
||||||
redraw_menu();
|
redraw_menu();
|
||||||
@ -984,6 +1113,50 @@ void handle_menu(void *argument)
|
|||||||
/* USER CODE END handle_menu */
|
/* USER CODE END handle_menu */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* USER CODE BEGIN Header_start_balance */
|
||||||
|
#define MPU6050_ADDR (0x68 <<1)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Function implementing the balance thread.
|
||||||
|
* @param argument: Not used
|
||||||
|
* @retval None
|
||||||
|
*/
|
||||||
|
/* USER CODE END Header_start_balance */
|
||||||
|
void start_balance(void *argument) {
|
||||||
|
/* USER CODE BEGIN start_balance */
|
||||||
|
/* Infinite loop */
|
||||||
|
int16_t accel[3], gyro[3], temp;
|
||||||
|
HAL_Delay(500);
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
|
uint8_t value = 0;
|
||||||
|
HAL_StatusTypeDef ret;
|
||||||
|
ret = HAL_I2C_Mem_Read(&hi2c1, 0xD0, 0x75, 1, &value, 1, 100);
|
||||||
|
|
||||||
|
uint8_t who_am_i = 0;
|
||||||
|
HAL_I2C_Mem_Read(&hi2c1, MPU6050_ADDR, 0x75, 1, &who_am_i, 1, 100);
|
||||||
|
uint8_t check;
|
||||||
|
uint8_t data;
|
||||||
|
|
||||||
|
// Check WHO_AM_I register
|
||||||
|
HAL_I2C_Mem_Read(&hi2c1, MPU6050_ADDR, 0x75, 1, &check, 1, 100);
|
||||||
|
HAL_I2C_Mem_Write(&hi2c1, MPU6050_ADDR, 0x6B, 1, &data, 1, 100);
|
||||||
|
|
||||||
|
float ax = accel[0] / 16384.0;
|
||||||
|
float gx = gyro[0] / 131.0;
|
||||||
|
|
||||||
|
float temperature = temp / 340.0 + 36.53; // °C
|
||||||
|
|
||||||
|
osDelay(10);
|
||||||
|
|
||||||
|
uint8_t TX_Buffer[] = "A"; // DATA to send
|
||||||
|
|
||||||
|
ret = HAL_I2C_Master_Transmit(&hi2c1, 20, TX_Buffer, 1, 1000); //Sending in Blocking mode
|
||||||
|
|
||||||
|
}
|
||||||
|
/* USER CODE END start_balance */
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Period elapsed callback in non blocking mode
|
* @brief Period elapsed callback in non blocking mode
|
||||||
* @note This function is called when TIM3 interrupt took place, inside
|
* @note This function is called when TIM3 interrupt took place, inside
|
||||||
@ -992,13 +1165,11 @@ void handle_menu(void *argument)
|
|||||||
* @param htim : TIM handle
|
* @param htim : TIM handle
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
|
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
|
||||||
{
|
|
||||||
/* USER CODE BEGIN Callback 0 */
|
/* USER CODE BEGIN Callback 0 */
|
||||||
|
|
||||||
/* USER CODE END Callback 0 */
|
/* USER CODE END Callback 0 */
|
||||||
if (htim->Instance == TIM3)
|
if (htim->Instance == TIM3) {
|
||||||
{
|
|
||||||
HAL_IncTick();
|
HAL_IncTick();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN Callback 1 */
|
/* USER CODE BEGIN Callback 1 */
|
||||||
@ -1010,8 +1181,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
|
|||||||
* @brief This function is executed in case of error occurrence.
|
* @brief This function is executed in case of error occurrence.
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
void Error_Handler(void)
|
void Error_Handler(void) {
|
||||||
{
|
|
||||||
/* USER CODE BEGIN Error_Handler_Debug */
|
/* USER CODE BEGIN Error_Handler_Debug */
|
||||||
/* User can add his own implementation to report the HAL error return state */
|
/* User can add his own implementation to report the HAL error return state */
|
||||||
__disable_irq();
|
__disable_irq();
|
||||||
|
|||||||
@ -228,7 +228,7 @@ void USART6_IRQHandler(void)
|
|||||||
/* USER CODE END USART6_IRQn 0 */
|
/* USER CODE END USART6_IRQn 0 */
|
||||||
HAL_UART_IRQHandler(&huart6);
|
HAL_UART_IRQHandler(&huart6);
|
||||||
/* USER CODE BEGIN USART6_IRQn 1 */
|
/* USER CODE BEGIN USART6_IRQn 1 */
|
||||||
//UART_CALLBACK();
|
UART_CALLBACK();
|
||||||
/* USER CODE END USART6_IRQn 1 */
|
/* USER CODE END USART6_IRQn 1 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user