lucordes/touchscreengames
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding the menu

Browse Source
This commit is contained in:
lucordes 2025-07-12 19:03:01 +02:00
parent dfbfc96e38
commit d50fda1b23
1 changed files with 522 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

271
Core/Src/main.c
View File

@ -23,7 +23,6 @@
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
//#include "ili9341.h"
#include "ILI9341_STM32_Driver.h"
#include "ILI9341_GFX.h"
#include "snake.h"
@ -60,35 +59,22 @@ UART_HandleTypeDef huart6;
/* Definitions for touchhistory */
osThreadId_t touchhistoryHandle;
const osThreadAttr_t touchhistory_attributes = {
.name = "touchhistory",
.stack_size = 128 * 4,
.priority = (osPriority_t) osPriorityNormal,
};
const osThreadAttr_t touchhistory_attributes = { .name = "touchhistory",
.stack_size = 128 * 4, .priority = (osPriority_t) osPriorityNormal, };
/* Definitions for draw */
osThreadId_t drawHandle;
const osThreadAttr_t draw_attributes = {
.name = "draw",
.stack_size = 512 * 4,
.priority = (osPriority_t) osPriorityLow,
};
const osThreadAttr_t draw_attributes = { .name = "draw", .stack_size = 512 * 4,
.priority = (osPriority_t) osPriorityLow, };
/* Definitions for menu */
osThreadId_t menuHandle;
const osThreadAttr_t menu_attributes = {
.name = "menu",
.stack_size = 256 * 4,
.priority = (osPriority_t) osPriorityLow,
};
const osThreadAttr_t menu_attributes = { .name = "menu", .stack_size = 256 * 4,
.priority = (osPriority_t) osPriorityLow, };
/* Definitions for presses */
osMessageQueueId_t pressesHandle;
const osMessageQueueAttr_t presses_attributes = {
.name = "presses"
};
const osMessageQueueAttr_t presses_attributes = { .name = "presses" };
/* Definitions for display */
osMutexId_t displayHandle;
const osMutexAttr_t display_attributes = {
.name = "display"
};
const osMutexAttr_t display_attributes = { .name = "display" };
/* USER CODE BEGIN PV */
/* USER CODE END PV */
@ -113,22 +99,9 @@ void handle_menu(void *argument);
/* Private user code ---------------------------------------------------------*/
/* USER CODE BEGIN 0 */
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);
}
int run_snake = 0;
int run_menu = 1;
int redraw_menu_pending;
#define RX_BUFFER_SIZE 1
#define LINE_BUFFER_SIZE 128
@ -142,10 +115,12 @@ void process_line(const char *line) {
if (sscanf(line, "ABS:%31[^:]:%d:", axis, &value) == 2) {
// Handle axis input
if (strcmp(axis, "ABS_X") == 0) {
// Do something with X axis
} else if (strcmp(axis, "ABS_Y") == 0) {
// Do something with Y axis
}
}
} else if (strncmp(line, "KEY:", 4) == 0) {
@ -159,10 +134,13 @@ void process_line(const char *line) {
if (status != osOK) {
// Optional: Handle error
}
if (key[0]=='D' && state == 1) {
// Button pressed
} else if (key[0]=='D' && state == 0) {
// Button released
if (key[0] == 'B' && state == 1) {// B goes to the menu
run_snake = 0;
run_menu = 1;
redraw_menu_pending=1;
}
if (key[0] == 'Y' && state == 1) {// Y reboot
}
}
}
@ -194,8 +172,7 @@ void UART_CALLBACK() {
* @brief The application entry point.
* @retval int
*/
int main(void)
{
int main(void) {
/* USER CODE BEGIN 1 */
@ -229,7 +206,7 @@ int main(void)
/* USER CODE BEGIN 2 */
ILI9341_Init();
ILI9341_SetRotation(SCREEN_HORIZONTAL_1);
ILI9341_FillScreen(MAGENTA);
//ILI9341_FillScreen(WHITE);
//void XPT2046_Init();
//Flash_Write_HighScore(100);
/* USER CODE END 2 */
@ -263,7 +240,6 @@ int main(void)
/* Create the thread(s) */
/* creation of touchhistory */
//touchhistoryHandle = osThreadNew(StartTouchHist, NULL, &touchhistory_attributes);
/* creation of draw */
drawHandle = osThreadNew(snakegame, NULL, &draw_attributes);
@ -342,8 +318,7 @@ int main(void)
* @brief System Clock Configuration
* @retval None
*/
void SystemClock_Config(void)
{
void SystemClock_Config(void) {
RCC_OscInitTypeDef RCC_OscInitStruct = { 0 };
RCC_ClkInitTypeDef RCC_ClkInitStruct = { 0 };
@ -359,8 +334,7 @@ void SystemClock_Config(void)
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
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();
}
@ -373,8 +347,7 @@ void SystemClock_Config(void)
RCC_ClkInitStruct.APB1CLKDivider = 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();
}
}
@ -384,8 +357,7 @@ void SystemClock_Config(void)
* @param None
* @retval None
*/
static void MX_I2C1_Init(void)
{
static void MX_I2C1_Init(void) {
/* USER CODE BEGIN I2C1_Init 0 */
@ -403,8 +375,7 @@ static void MX_I2C1_Init(void)
hi2c1.Init.OwnAddress2 = 0;
hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
hi2c1.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;
if (HAL_I2C_Init(&hi2c1) != HAL_OK)
{
if (HAL_I2C_Init(&hi2c1) != HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN I2C1_Init 2 */
@ -418,8 +389,7 @@ static void MX_I2C1_Init(void)
* @param None
* @retval None
*/
static void MX_SPI1_Init(void)
{
static void MX_SPI1_Init(void) {
/* USER CODE BEGIN SPI1_Init 0 */
@ -441,8 +411,7 @@ static void MX_SPI1_Init(void)
hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
hspi1.Init.CRCPolynomial = 10;
if (HAL_SPI_Init(&hspi1) != HAL_OK)
{
if (HAL_SPI_Init(&hspi1) != HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN SPI1_Init 2 */
@ -456,8 +425,7 @@ static void MX_SPI1_Init(void)
* @param None
* @retval None
*/
static void MX_TIM1_Init(void)
{
static void MX_TIM1_Init(void) {
/* USER CODE BEGIN TIM1_Init 0 */
@ -485,14 +453,13 @@ static void MX_TIM1_Init(void)
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
sConfig.IC2Filter = 0;
if (HAL_TIM_Encoder_Init(&htim1, &sConfig) != HAL_OK)
{
if (HAL_TIM_Encoder_Init(&htim1, &sConfig) != HAL_OK) {
Error_Handler();
}
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK)
{
if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig)
!= HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN TIM1_Init 2 */
@ -506,8 +473,7 @@ static void MX_TIM1_Init(void)
* @param None
* @retval None
*/
static void MX_TIM4_Init(void)
{
static void MX_TIM4_Init(void) {
/* USER CODE BEGIN TIM4_Init 0 */
@ -534,14 +500,13 @@ static void MX_TIM4_Init(void)
sConfig.IC2Selection = TIM_ICSELECTION_DIRECTTI;
sConfig.IC2Prescaler = TIM_ICPSC_DIV1;
sConfig.IC2Filter = 0;
if (HAL_TIM_Encoder_Init(&htim4, &sConfig) != HAL_OK)
{
if (HAL_TIM_Encoder_Init(&htim4, &sConfig) != HAL_OK) {
Error_Handler();
}
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
if (HAL_TIMEx_MasterConfigSynchronization(&htim4, &sMasterConfig) != HAL_OK)
{
if (HAL_TIMEx_MasterConfigSynchronization(&htim4, &sMasterConfig)
!= HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN TIM4_Init 2 */
@ -555,8 +520,7 @@ static void MX_TIM4_Init(void)
* @param None
* @retval None
*/
static void MX_TIM5_Init(void)
{
static void MX_TIM5_Init(void) {
/* USER CODE BEGIN TIM5_Init 0 */
@ -575,43 +539,40 @@ static void MX_TIM5_Init(void)
htim5.Init.Period = 4294967295;
htim5.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
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();
}
sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
if (HAL_TIM_ConfigClockSource(&htim5, &sClockSourceConfig) != HAL_OK)
{
if (HAL_TIM_ConfigClockSource(&htim5, &sClockSourceConfig) != HAL_OK) {
Error_Handler();
}
if (HAL_TIM_PWM_Init(&htim5) != HAL_OK)
{
if (HAL_TIM_PWM_Init(&htim5) != HAL_OK) {
Error_Handler();
}
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
if (HAL_TIMEx_MasterConfigSynchronization(&htim5, &sMasterConfig) != HAL_OK)
{
if (HAL_TIMEx_MasterConfigSynchronization(&htim5, &sMasterConfig)
!= HAL_OK) {
Error_Handler();
}
sConfigOC.OCMode = TIM_OCMODE_PWM1;
sConfigOC.Pulse = 0;
sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
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();
}
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();
}
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();
}
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();
}
/* USER CODE BEGIN TIM5_Init 2 */
@ -626,8 +587,7 @@ static void MX_TIM5_Init(void)
* @param None
* @retval None
*/
static void MX_USART6_UART_Init(void)
{
static void MX_USART6_UART_Init(void) {
/* 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.HwFlowCtl = UART_HWCONTROL_NONE;
huart6.Init.OverSampling = UART_OVERSAMPLING_16;
if (HAL_UART_Init(&huart6) != HAL_OK)
{
if (HAL_UART_Init(&huart6) != HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN USART6_Init 2 */
@ -659,8 +618,7 @@ static void MX_USART6_UART_Init(void)
/**
* Enable DMA controller clock
*/
static void MX_DMA_Init(void)
{
static void MX_DMA_Init(void) {
/* DMA controller clock enable */
__HAL_RCC_DMA2_CLK_ENABLE();
@ -680,8 +638,7 @@ static void MX_DMA_Init(void)
* @param None
* @retval None
*/
static void MX_GPIO_Init(void)
{
static void MX_GPIO_Init(void) {
GPIO_InitTypeDef GPIO_InitStruct = { 0 };
/* USER CODE BEGIN MX_GPIO_Init_1 */
@ -739,7 +696,6 @@ static void MX_GPIO_Init(void)
*/
/* USER CODE END Header_StartTouchHist */
/* USER CODE BEGIN Header_snakegame */
/**
* @brief Function implementing the draw thread.
@ -747,48 +703,128 @@ static void MX_GPIO_Init(void)
* @retval None
*/
/* USER CODE END Header_snakegame */
void snakegame(void *argument)
{
void snakegame(void *argument) {
/* USER CODE BEGIN snakegame */
/* Infinite loop */
ILI9341_FillScreen(BLACK);
//ILI9341_FillScreen(BLACK);
GameInit();
GameRender();
for (;;) {
//uint16_t x,y;
//ILI9341_TouchGetCoordinates(&x, &y);
if (run_snake) {
GameRender();
static char statsBuffer[200];
vTaskGetRunTimeStats(statsBuffer);
vTaskDelay(1000);
vTaskDelay(300);
if (isGameOver()) {
vTaskDelay(2000);
GameInit();
}
UpdateGame();
} else {
vTaskDelay(10);
}
/* USER CODE END snakegame */
}
}
/* USER CODE BEGIN Header_handle_menu */
/**
* @brief Function implementing the menu thread.
* @param argument: Not used
* @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 */
void handle_menu(void *argument)
{
void handle_menu(void *argument) {
/* USER CODE BEGIN handle_menu */
/* Infinite loop */
for(;;)
{
osDelay(1);
char dir;
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 */
}
@ -801,13 +837,11 @@ void handle_menu(void *argument)
* @param htim : TIM handle
* @retval None
*/
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
{
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
/* USER CODE BEGIN Callback 0 */
/* USER CODE END Callback 0 */
if (htim->Instance == TIM2)
{
if (htim->Instance == TIM2) {
HAL_IncTick();
}
/* 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.
* @retval None
*/
void Error_Handler(void)
{
void Error_Handler(void) {
/* USER CODE BEGIN Error_Handler_Debug */
/* User can add his own implementation to report the HAL error return state */
__disable_irq();