adding the menu
This commit is contained in:
parent
dfbfc96e38
commit
d50fda1b23
317
Core/Src/main.c
317
Core/Src/main.c
@ -23,7 +23,6 @@
|
|||||||
/* Private includes ----------------------------------------------------------*/
|
/* Private includes ----------------------------------------------------------*/
|
||||||
/* USER CODE BEGIN Includes */
|
/* USER CODE BEGIN Includes */
|
||||||
//#include "ili9341.h"
|
//#include "ili9341.h"
|
||||||
|
|
||||||
#include "ILI9341_STM32_Driver.h"
|
#include "ILI9341_STM32_Driver.h"
|
||||||
#include "ILI9341_GFX.h"
|
#include "ILI9341_GFX.h"
|
||||||
#include "snake.h"
|
#include "snake.h"
|
||||||
@ -60,35 +59,22 @@ UART_HandleTypeDef huart6;
|
|||||||
|
|
||||||
/* Definitions for touchhistory */
|
/* Definitions for touchhistory */
|
||||||
osThreadId_t touchhistoryHandle;
|
osThreadId_t touchhistoryHandle;
|
||||||
const osThreadAttr_t touchhistory_attributes = {
|
const osThreadAttr_t touchhistory_attributes = { .name = "touchhistory",
|
||||||
.name = "touchhistory",
|
.stack_size = 128 * 4, .priority = (osPriority_t) osPriorityNormal, };
|
||||||
.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,
|
|
||||||
.priority = (osPriority_t) osPriorityLow,
|
|
||||||
};
|
|
||||||
/* 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 */
|
||||||
@ -113,22 +99,9 @@ void handle_menu(void *argument);
|
|||||||
|
|
||||||
/* Private user code ---------------------------------------------------------*/
|
/* Private user code ---------------------------------------------------------*/
|
||||||
/* USER CODE BEGIN 0 */
|
/* USER CODE BEGIN 0 */
|
||||||
|
int run_snake = 0;
|
||||||
|
int run_menu = 1;
|
||||||
|
int redraw_menu_pending;
|
||||||
void titlescreen() {
|
|
||||||
ILI9341_FillScreen(WHITE);
|
|
||||||
char str[50];
|
|
||||||
sprintf(str, "snake");
|
|
||||||
ILI9341_DrawText(str, FONT3, 320 / 2 - 100, 240 / 2, BLACK, WHITE);
|
|
||||||
|
|
||||||
sprintf(str, "1v1");
|
|
||||||
ILI9341_DrawText(str, FONT3, 10, 30, BLACK, WHITE);
|
|
||||||
//ILI9341_WriteString(320 / 2 + 100, 240 / 2, str, Font_11x18,
|
|
||||||
//ILI9341_MAGENTA, ILI9341_WHITE);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#define RX_BUFFER_SIZE 1
|
#define RX_BUFFER_SIZE 1
|
||||||
#define LINE_BUFFER_SIZE 128
|
#define LINE_BUFFER_SIZE 128
|
||||||
|
|
||||||
@ -142,10 +115,12 @@ 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) {
|
||||||
|
|
||||||
// Do something with X axis
|
// Do something with X axis
|
||||||
|
|
||||||
} else if (strcmp(axis, "ABS_Y") == 0) {
|
} else if (strcmp(axis, "ABS_Y") == 0) {
|
||||||
// Do something with Y axis
|
// Do something with Y axis
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (strncmp(line, "KEY:", 4) == 0) {
|
} else if (strncmp(line, "KEY:", 4) == 0) {
|
||||||
@ -154,15 +129,18 @@ void process_line(const char *line) {
|
|||||||
if (sscanf(line, "KEY:%31[^:]:%d:", key, &state) == 2) {
|
if (sscanf(line, "KEY:%31[^:]:%d:", key, &state) == 2) {
|
||||||
// Handle button press/release
|
// Handle button press/release
|
||||||
char dir;
|
char dir;
|
||||||
dir=key[0];
|
dir = key[0];
|
||||||
osStatus_t status = osMessageQueuePut(pressesHandle, &dir, 0, 0);
|
osStatus_t status = osMessageQueuePut(pressesHandle, &dir, 0, 0);
|
||||||
if (status != osOK) {
|
if (status != osOK) {
|
||||||
// Optional: Handle error
|
// Optional: Handle error
|
||||||
}
|
}
|
||||||
if (key[0]=='D' && state == 1) {
|
if (key[0] == 'B' && state == 1) {// B goes to the menu
|
||||||
// Button pressed
|
run_snake = 0;
|
||||||
} else if (key[0]=='D' && state == 0) {
|
run_menu = 1;
|
||||||
// Button released
|
redraw_menu_pending=1;
|
||||||
|
}
|
||||||
|
if (key[0] == 'Y' && state == 1) {// Y reboot
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -174,9 +152,9 @@ void UART_CALLBACK() {
|
|||||||
// ignore
|
// ignore
|
||||||
} else if (ch == '\n') {
|
} else if (ch == '\n') {
|
||||||
//line_buffer[line_pos] = '\0';
|
//line_buffer[line_pos] = '\0';
|
||||||
if(line_buffer[1]=='K'||line_buffer[1]=='A'){
|
if (line_buffer[1] == 'K' || line_buffer[1] == 'A') {
|
||||||
process_line(&line_buffer[1]);
|
process_line(&line_buffer[1]);
|
||||||
}else{
|
} else {
|
||||||
process_line(line_buffer);
|
process_line(line_buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -194,8 +172,7 @@ void UART_CALLBACK() {
|
|||||||
* @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 */
|
||||||
|
|
||||||
@ -229,7 +206,7 @@ int main(void)
|
|||||||
/* USER CODE BEGIN 2 */
|
/* USER CODE BEGIN 2 */
|
||||||
ILI9341_Init();
|
ILI9341_Init();
|
||||||
ILI9341_SetRotation(SCREEN_HORIZONTAL_1);
|
ILI9341_SetRotation(SCREEN_HORIZONTAL_1);
|
||||||
ILI9341_FillScreen(MAGENTA);
|
//ILI9341_FillScreen(WHITE);
|
||||||
//void XPT2046_Init();
|
//void XPT2046_Init();
|
||||||
//Flash_Write_HighScore(100);
|
//Flash_Write_HighScore(100);
|
||||||
/* USER CODE END 2 */
|
/* USER CODE END 2 */
|
||||||
@ -254,7 +231,7 @@ int main(void)
|
|||||||
|
|
||||||
/* Create the queue(s) */
|
/* Create the queue(s) */
|
||||||
/* creation of presses */
|
/* creation of presses */
|
||||||
pressesHandle = osMessageQueueNew (16, sizeof(char), &presses_attributes);
|
pressesHandle = osMessageQueueNew(16, sizeof(char), &presses_attributes);
|
||||||
|
|
||||||
/* USER CODE BEGIN RTOS_QUEUES */
|
/* USER CODE BEGIN RTOS_QUEUES */
|
||||||
/* add queues, ... */
|
/* add queues, ... */
|
||||||
@ -263,7 +240,6 @@ int main(void)
|
|||||||
/* Create the thread(s) */
|
/* Create the thread(s) */
|
||||||
/* creation of touchhistory */
|
/* creation of touchhistory */
|
||||||
//touchhistoryHandle = osThreadNew(StartTouchHist, NULL, &touchhistory_attributes);
|
//touchhistoryHandle = osThreadNew(StartTouchHist, NULL, &touchhistory_attributes);
|
||||||
|
|
||||||
/* creation of draw */
|
/* creation of draw */
|
||||||
drawHandle = osThreadNew(snakegame, NULL, &draw_attributes);
|
drawHandle = osThreadNew(snakegame, NULL, &draw_attributes);
|
||||||
|
|
||||||
@ -342,10 +318,9 @@ 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};
|
|
||||||
|
|
||||||
/** Configure the main internal regulator output voltage
|
/** Configure the main internal regulator output voltage
|
||||||
*/
|
*/
|
||||||
@ -359,22 +334,20 @@ 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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Initializes the CPU, AHB and APB buses clocks
|
/** Initializes the CPU, AHB and APB buses clocks
|
||||||
*/
|
*/
|
||||||
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
|
||||||
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
|
| RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
|
||||||
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
|
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI;
|
||||||
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
|
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
|
||||||
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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -384,8 +357,7 @@ 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 */
|
||||||
|
|
||||||
@ -403,8 +375,7 @@ 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 */
|
||||||
@ -418,8 +389,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 */
|
||||||
|
|
||||||
@ -441,8 +411,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 */
|
||||||
@ -456,15 +425,14 @@ 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 */
|
||||||
|
|
||||||
/* USER CODE END TIM1_Init 0 */
|
/* USER CODE END TIM1_Init 0 */
|
||||||
|
|
||||||
TIM_Encoder_InitTypeDef sConfig = {0};
|
TIM_Encoder_InitTypeDef sConfig = { 0 };
|
||||||
TIM_MasterConfigTypeDef sMasterConfig = {0};
|
TIM_MasterConfigTypeDef sMasterConfig = { 0 };
|
||||||
|
|
||||||
/* USER CODE BEGIN TIM1_Init 1 */
|
/* USER CODE BEGIN TIM1_Init 1 */
|
||||||
|
|
||||||
@ -485,14 +453,13 @@ static void MX_TIM1_Init(void)
|
|||||||
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
|
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
|
||||||
sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
|
sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
|
||||||
sConfig.IC2Filter = 0;
|
sConfig.IC2Filter = 0;
|
||||||
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 */
|
||||||
@ -506,15 +473,14 @@ 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 */
|
||||||
|
|
||||||
/* USER CODE END TIM4_Init 0 */
|
/* USER CODE END TIM4_Init 0 */
|
||||||
|
|
||||||
TIM_Encoder_InitTypeDef sConfig = {0};
|
TIM_Encoder_InitTypeDef sConfig = { 0 };
|
||||||
TIM_MasterConfigTypeDef sMasterConfig = {0};
|
TIM_MasterConfigTypeDef sMasterConfig = { 0 };
|
||||||
|
|
||||||
/* USER CODE BEGIN TIM4_Init 1 */
|
/* USER CODE BEGIN TIM4_Init 1 */
|
||||||
|
|
||||||
@ -534,14 +500,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 = 0;
|
sConfig.IC2Filter = 0;
|
||||||
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 */
|
||||||
@ -555,16 +520,15 @@ 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 */
|
||||||
|
|
||||||
/* USER CODE END TIM5_Init 0 */
|
/* USER CODE END TIM5_Init 0 */
|
||||||
|
|
||||||
TIM_ClockConfigTypeDef sClockSourceConfig = {0};
|
TIM_ClockConfigTypeDef sClockSourceConfig = { 0 };
|
||||||
TIM_MasterConfigTypeDef sMasterConfig = {0};
|
TIM_MasterConfigTypeDef sMasterConfig = { 0 };
|
||||||
TIM_OC_InitTypeDef sConfigOC = {0};
|
TIM_OC_InitTypeDef sConfigOC = { 0 };
|
||||||
|
|
||||||
/* USER CODE BEGIN TIM5_Init 1 */
|
/* USER CODE BEGIN TIM5_Init 1 */
|
||||||
|
|
||||||
@ -575,43 +539,40 @@ static void MX_TIM5_Init(void)
|
|||||||
htim5.Init.Period = 4294967295;
|
htim5.Init.Period = 4294967295;
|
||||||
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_Base_Init(&htim5) != HAL_OK)
|
if (HAL_TIM_Base_Init(&htim5) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
|
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
|
||||||
if (HAL_TIM_ConfigClockSource(&htim5, &sClockSourceConfig) != HAL_OK)
|
if (HAL_TIM_ConfigClockSource(&htim5, &sClockSourceConfig) != HAL_OK) {
|
||||||
{
|
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
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 */
|
||||||
@ -626,8 +587,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 */
|
||||||
|
|
||||||
@ -644,8 +604,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 */
|
||||||
@ -659,8 +618,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();
|
||||||
@ -680,9 +638,8 @@ 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 */
|
||||||
|
|
||||||
/* USER CODE END MX_GPIO_Init_1 */
|
/* USER CODE END MX_GPIO_Init_1 */
|
||||||
@ -696,7 +653,7 @@ static void MX_GPIO_Init(void)
|
|||||||
HAL_GPIO_WritePin(LED_BLUE_GPIO_Port, LED_BLUE_Pin, GPIO_PIN_RESET);
|
HAL_GPIO_WritePin(LED_BLUE_GPIO_Port, LED_BLUE_Pin, GPIO_PIN_RESET);
|
||||||
|
|
||||||
/*Configure GPIO pin Output Level */
|
/*Configure GPIO pin Output Level */
|
||||||
HAL_GPIO_WritePin(GPIOA, DISPLAY_CS_Pin|DISPLAY_RES_Pin, GPIO_PIN_RESET);
|
HAL_GPIO_WritePin(GPIOA, DISPLAY_CS_Pin | DISPLAY_RES_Pin, GPIO_PIN_RESET);
|
||||||
|
|
||||||
/*Configure GPIO pin Output Level */
|
/*Configure GPIO pin Output Level */
|
||||||
HAL_GPIO_WritePin(DISPLAY_DC_GPIO_Port, DISPLAY_DC_Pin, GPIO_PIN_RESET);
|
HAL_GPIO_WritePin(DISPLAY_DC_GPIO_Port, DISPLAY_DC_Pin, GPIO_PIN_RESET);
|
||||||
@ -709,7 +666,7 @@ static void MX_GPIO_Init(void)
|
|||||||
HAL_GPIO_Init(LED_BLUE_GPIO_Port, &GPIO_InitStruct);
|
HAL_GPIO_Init(LED_BLUE_GPIO_Port, &GPIO_InitStruct);
|
||||||
|
|
||||||
/*Configure GPIO pins : DISPLAY_CS_Pin DISPLAY_RES_Pin */
|
/*Configure GPIO pins : DISPLAY_CS_Pin DISPLAY_RES_Pin */
|
||||||
GPIO_InitStruct.Pin = DISPLAY_CS_Pin|DISPLAY_RES_Pin;
|
GPIO_InitStruct.Pin = DISPLAY_CS_Pin | DISPLAY_RES_Pin;
|
||||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||||
@ -739,7 +696,6 @@ static void MX_GPIO_Init(void)
|
|||||||
*/
|
*/
|
||||||
/* USER CODE END Header_StartTouchHist */
|
/* USER CODE END Header_StartTouchHist */
|
||||||
|
|
||||||
|
|
||||||
/* USER CODE BEGIN Header_snakegame */
|
/* USER CODE BEGIN Header_snakegame */
|
||||||
/**
|
/**
|
||||||
* @brief Function implementing the draw thread.
|
* @brief Function implementing the draw thread.
|
||||||
@ -747,48 +703,128 @@ static void MX_GPIO_Init(void)
|
|||||||
* @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);
|
||||||
GameInit();
|
GameInit();
|
||||||
GameRender();
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
|
||||||
//uint16_t x,y;
|
if (run_snake) {
|
||||||
//ILI9341_TouchGetCoordinates(&x, &y);
|
|
||||||
GameRender();
|
GameRender();
|
||||||
static char statsBuffer[200];
|
static char statsBuffer[200];
|
||||||
vTaskGetRunTimeStats(statsBuffer);
|
vTaskGetRunTimeStats(statsBuffer);
|
||||||
|
|
||||||
vTaskDelay(1000);
|
vTaskDelay(300);
|
||||||
|
|
||||||
if(isGameOver()){
|
if (isGameOver()) {
|
||||||
vTaskDelay(2000);
|
vTaskDelay(2000);
|
||||||
GameInit();
|
GameInit();
|
||||||
}
|
}
|
||||||
UpdateGame();
|
UpdateGame();
|
||||||
|
} else {
|
||||||
|
vTaskDelay(10);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* USER CODE END snakegame */
|
/* USER CODE END snakegame */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* USER CODE BEGIN Header_handle_menu */
|
/* USER CODE BEGIN Header_handle_menu */
|
||||||
/**
|
/**
|
||||||
* @brief Function implementing the menu thread.
|
* @brief Function implementing the menu thread.
|
||||||
* @param argument: Not used
|
* @param argument: Not used
|
||||||
* @retval None
|
* @retval None
|
||||||
*/
|
*/
|
||||||
|
#define GRID_X 2
|
||||||
|
#define GRID_Y 3
|
||||||
|
|
||||||
|
#define CELL_WIDTH 120 // Adjust as needed for your screen
|
||||||
|
#define CELL_HEIGHT 40
|
||||||
|
#define START_X 10
|
||||||
|
#define START_Y 10
|
||||||
|
|
||||||
|
#define COLOR_TEXT BLACK
|
||||||
|
#define COLOR_BG WHITE
|
||||||
|
#define COLOR_SELECTED GREEN
|
||||||
|
|
||||||
|
int sel_x;
|
||||||
|
int sel_y;
|
||||||
|
//redraw_menu_pending is for redrawing
|
||||||
|
|
||||||
|
// Customize grid labels as needed
|
||||||
|
const char *grid_labels[GRID_X][GRID_Y] = { { "Snake", "Options", "About" }, {
|
||||||
|
"Highscore", "Credits", "Exit" } };
|
||||||
|
void redraw_menu() { //only done onece saves resources
|
||||||
|
// Redraw grid
|
||||||
|
if (osMutexAcquire(displayHandle, osWaitForever) == osOK) {
|
||||||
|
ILI9341_FillScreen(WHITE);
|
||||||
|
osMutexRelease(displayHandle);
|
||||||
|
}
|
||||||
|
for (int i = 0; i < GRID_X; i++) {
|
||||||
|
for (int j = 0; j < GRID_Y; j++) {
|
||||||
|
uint16_t x = START_X + i * CELL_WIDTH;
|
||||||
|
uint16_t y = START_Y + j * CELL_HEIGHT;
|
||||||
|
uint16_t bg =
|
||||||
|
(i == sel_x && j == sel_y) ? COLOR_SELECTED : COLOR_BG;
|
||||||
|
if (osMutexAcquire(displayHandle, osWaitForever) == osOK) {
|
||||||
|
ILI9341_DrawText(grid_labels[i][j], FONT2, x, y, COLOR_TEXT,
|
||||||
|
bg);
|
||||||
|
osMutexRelease(displayHandle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/* 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 */
|
||||||
for(;;)
|
|
||||||
{
|
char dir;
|
||||||
osDelay(1);
|
vTaskDelay(50);
|
||||||
|
redraw_menu();
|
||||||
|
while (1) {
|
||||||
|
|
||||||
|
// Check input
|
||||||
|
if (run_menu) {
|
||||||
|
osStatus_t status = osMessageQueueGet(pressesHandle, &dir, NULL,
|
||||||
|
osWaitForever);
|
||||||
|
if (status == osOK) {
|
||||||
|
//what was selected?
|
||||||
|
if (dir == 'A') {
|
||||||
|
if (grid_labels[sel_x][sel_y] == "Snake") {
|
||||||
|
run_snake = 1;
|
||||||
|
run_menu = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (dir == 'U' || dir == 'D' || dir == 'L' || dir == 'R') {
|
||||||
|
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
||||||
|
START_X + sel_x * CELL_WIDTH,
|
||||||
|
START_Y + sel_y * CELL_HEIGHT, COLOR_TEXT,
|
||||||
|
COLOR_BG);
|
||||||
|
}
|
||||||
|
if (dir == 'U' && sel_y > 0)
|
||||||
|
sel_y--;
|
||||||
|
else if (dir == 'D' && sel_y < GRID_Y - 1)
|
||||||
|
sel_y++;
|
||||||
|
else if (dir == 'L' && sel_x > 0)
|
||||||
|
sel_x--;
|
||||||
|
else if (dir == 'R' && sel_x < GRID_X - 1)
|
||||||
|
sel_x++;
|
||||||
|
}
|
||||||
|
ILI9341_DrawText(grid_labels[sel_x][sel_y], FONT2,
|
||||||
|
START_X + sel_x * CELL_WIDTH, START_Y + sel_y * CELL_HEIGHT,
|
||||||
|
COLOR_TEXT,
|
||||||
|
COLOR_SELECTED);
|
||||||
|
if (redraw_menu_pending) {
|
||||||
|
redraw_menu();
|
||||||
|
redraw_menu_pending = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
osDelay(10);
|
||||||
}
|
}
|
||||||
/* USER CODE END handle_menu */
|
/* USER CODE END handle_menu */
|
||||||
}
|
}
|
||||||
@ -801,13 +837,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 == TIM2)
|
if (htim->Instance == TIM2) {
|
||||||
{
|
|
||||||
HAL_IncTick();
|
HAL_IncTick();
|
||||||
}
|
}
|
||||||
/* USER CODE BEGIN Callback 1 */
|
/* USER CODE BEGIN Callback 1 */
|
||||||
@ -819,8 +853,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();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user