add some stuff
This commit is contained in:
parent
180fbad6c4
commit
455a20ba5d
@ -18,11 +18,11 @@
|
||||
#define ILI9341_SPI_PORT hspi1
|
||||
extern SPI_HandleTypeDef ILI9341_SPI_PORT;
|
||||
|
||||
#define ILI9341_RES_Pin GPIO_PIN_7
|
||||
#define ILI9341_RES_GPIO_Port GPIOC
|
||||
#define ILI9341_CS_Pin GPIO_PIN_5
|
||||
#define ILI9341_RES_Pin GPIO_PIN_3
|
||||
#define ILI9341_RES_GPIO_Port GPIOA
|
||||
#define ILI9341_CS_Pin GPIO_PIN_4
|
||||
#define ILI9341_CS_GPIO_Port GPIOA
|
||||
#define ILI9341_DC_Pin GPIO_PIN_9
|
||||
#define ILI9341_DC_Pin GPIO_PIN_2
|
||||
#define ILI9341_DC_GPIO_Port GPIOA
|
||||
// default orientation
|
||||
/*
|
||||
|
||||
@ -11,10 +11,10 @@
|
||||
#define ILI9341_TOUCH_SPI_PORT hspi2
|
||||
extern SPI_HandleTypeDef ILI9341_TOUCH_SPI_PORT;
|
||||
|
||||
#define ILI9341_TOUCH_IRQ_Pin GPIO_PIN_4 // Arduino D5
|
||||
#define ILI9341_TOUCH_IRQ_Pin GPIO_PIN_5 // Arduino D5
|
||||
#define ILI9341_TOUCH_IRQ_GPIO_Port GPIOB
|
||||
#define ILI9341_TOUCH_CS_Pin GPIO_PIN_10 // Arduino D2
|
||||
#define ILI9341_TOUCH_CS_GPIO_Port GPIOA
|
||||
#define ILI9341_TOUCH_CS_Pin GPIO_PIN_6 // Arduino D2
|
||||
#define ILI9341_TOUCH_CS_GPIO_Port GPIOB
|
||||
|
||||
// change depending on screen orientation
|
||||
#define ILI9341_TOUCH_SCALE_X 240
|
||||
|
||||
@ -47,15 +47,23 @@ SPI_HandleTypeDef hspi2;
|
||||
|
||||
/* Definitions for defaultTask */
|
||||
osThreadId_t defaultTaskHandle;
|
||||
const osThreadAttr_t defaultTask_attributes = { .name = "defaultTask",
|
||||
.stack_size = 128 * 4, .priority = (osPriority_t) osPriorityNormal, };
|
||||
const osThreadAttr_t defaultTask_attributes = {
|
||||
.name = "defaultTask",
|
||||
.stack_size = 128 * 4,
|
||||
.priority = (osPriority_t) osPriorityNormal,
|
||||
};
|
||||
/* Definitions for draw */
|
||||
osThreadId_t drawHandle;
|
||||
const osThreadAttr_t draw_attributes = { .name = "draw", .stack_size = 128 * 4,
|
||||
.priority = (osPriority_t) osPriorityLow, };
|
||||
const osThreadAttr_t draw_attributes = {
|
||||
.name = "draw",
|
||||
.stack_size = 128 * 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"
|
||||
};
|
||||
/* USER CODE BEGIN PV */
|
||||
|
||||
/* USER CODE END PV */
|
||||
@ -261,19 +269,6 @@ void GameRender() {
|
||||
for (int x = 0; x < snake.gamesizewidth; x++) {
|
||||
for (int y = 0; y <= snake.gamesizeheight; y++) {
|
||||
|
||||
// Creating snake's head with 'O'
|
||||
// [0,0]
|
||||
// (gamewidth-1)/gamewidth*320
|
||||
// (gameheight-0)/gameheigth*240
|
||||
|
||||
//[1,1]
|
||||
//(gamewidth-2)/gamewidht*320
|
||||
//(gameheight-1)/gameheight*240
|
||||
|
||||
//[x,y]
|
||||
//(gamewidth-x-1)/gamewidth*320
|
||||
//(gameheight-y)/gameheight*240
|
||||
|
||||
if (x == snake.x && y == snake.y)
|
||||
ILI9341_FillRectangle((x * ILI9341_WIDTH) / ILI9341_WIDTH,
|
||||
(y * ILI9341_WIDTH) / ILI9341_WIDTH,
|
||||
@ -299,11 +294,10 @@ void GameRender() {
|
||||
ILI9341_WIDTH / snake.gamesizewidth,
|
||||
ILI9341_HEIGHT / snake.gamesizeheight,
|
||||
ILI9341_GREEN);
|
||||
//prTail = true;
|
||||
|
||||
}
|
||||
}
|
||||
//if (!prTail)
|
||||
//cout << " ";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -317,7 +311,8 @@ void GameRender() {
|
||||
* @brief The application entry point.
|
||||
* @retval int
|
||||
*/
|
||||
int main(void) {
|
||||
int main(void)
|
||||
{
|
||||
|
||||
/* USER CODE BEGIN 1 */
|
||||
|
||||
@ -372,8 +367,7 @@ int main(void) {
|
||||
|
||||
/* Create the thread(s) */
|
||||
/* creation of defaultTask */
|
||||
defaultTaskHandle = osThreadNew(StartDefaultTask, NULL,
|
||||
&defaultTask_attributes);
|
||||
defaultTaskHandle = osThreadNew(StartDefaultTask, NULL, &defaultTask_attributes);
|
||||
|
||||
/* creation of draw */
|
||||
drawHandle = osThreadNew(startdraw, NULL, &draw_attributes);
|
||||
@ -409,7 +403,8 @@ 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};
|
||||
|
||||
@ -425,7 +420,8 @@ 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();
|
||||
}
|
||||
|
||||
@ -438,7 +434,8 @@ 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();
|
||||
}
|
||||
}
|
||||
@ -448,7 +445,8 @@ void SystemClock_Config(void) {
|
||||
* @param None
|
||||
* @retval None
|
||||
*/
|
||||
static void MX_SPI1_Init(void) {
|
||||
static void MX_SPI1_Init(void)
|
||||
{
|
||||
|
||||
/* USER CODE BEGIN SPI1_Init 0 */
|
||||
|
||||
@ -470,7 +468,8 @@ 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 */
|
||||
@ -484,7 +483,8 @@ static void MX_SPI1_Init(void) {
|
||||
* @param None
|
||||
* @retval None
|
||||
*/
|
||||
static void MX_SPI2_Init(void) {
|
||||
static void MX_SPI2_Init(void)
|
||||
{
|
||||
|
||||
/* USER CODE BEGIN SPI2_Init 0 */
|
||||
|
||||
@ -506,7 +506,8 @@ static void MX_SPI2_Init(void) {
|
||||
hspi2.Init.TIMode = SPI_TIMODE_DISABLE;
|
||||
hspi2.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
|
||||
hspi2.Init.CRCPolynomial = 10;
|
||||
if (HAL_SPI_Init(&hspi2) != HAL_OK) {
|
||||
if (HAL_SPI_Init(&hspi2) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
/* USER CODE BEGIN SPI2_Init 2 */
|
||||
@ -520,7 +521,8 @@ static void MX_SPI2_Init(void) {
|
||||
* @param None
|
||||
* @retval None
|
||||
*/
|
||||
static void MX_GPIO_Init(void) {
|
||||
static void MX_GPIO_Init(void)
|
||||
{
|
||||
/* USER CODE BEGIN MX_GPIO_Init_1 */
|
||||
|
||||
/* USER CODE END MX_GPIO_Init_1 */
|
||||
@ -545,7 +547,8 @@ static void MX_GPIO_Init(void) {
|
||||
* @retval None
|
||||
*/
|
||||
/* USER CODE END Header_StartDefaultTask */
|
||||
void StartDefaultTask(void *argument) {
|
||||
void StartDefaultTask(void *argument)
|
||||
{
|
||||
/* USER CODE BEGIN 5 */
|
||||
/* Infinite loop */
|
||||
for (;;) {
|
||||
@ -561,7 +564,8 @@ void StartDefaultTask(void *argument) {
|
||||
* @retval None
|
||||
*/
|
||||
/* USER CODE END Header_startdraw */
|
||||
void startdraw(void *argument) {
|
||||
void startdraw(void *argument)
|
||||
{
|
||||
/* USER CODE BEGIN startdraw */
|
||||
/* Infinite loop */
|
||||
for (;;) {
|
||||
@ -580,11 +584,13 @@ void startdraw(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 */
|
||||
@ -596,7 +602,8 @@ 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();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user