add ui, change project struct
This commit is contained in:
@ -26,11 +26,8 @@
|
||||
/* Private includes ----------------------------------------------------------*/
|
||||
/* USER CODE BEGIN Includes */
|
||||
#include <stdio.h>
|
||||
#include "RotaryCoder.h"
|
||||
#include "st7735.h"
|
||||
#include "ui.h"
|
||||
#include "bmfont.h"
|
||||
#include "asciifont.h"
|
||||
#include "app.h"
|
||||
/* USER CODE END Includes */
|
||||
|
||||
/* Private typedef -----------------------------------------------------------*/
|
||||
@ -71,8 +68,6 @@ void LCD_init()
|
||||
{
|
||||
ST7735_Init(); // 屏幕初始化
|
||||
HAL_GPIO_WritePin(LCD_BK_GPIO_Port, LCD_BK_Pin, GPIO_PIN_SET);
|
||||
//const char ready[] = "Init Ready!\r\n";
|
||||
//HAL_UART_Transmit(&huart1, (uint8_t *)ready, sizeof(ready) - 1, HAL_MAX_DELAY);
|
||||
}
|
||||
/* USER CODE END 0 */
|
||||
|
||||
@ -108,16 +103,8 @@ int main(void)
|
||||
MX_SPI1_Init();
|
||||
MX_TIM3_Init();
|
||||
/* USER CODE BEGIN 2 */
|
||||
/*EC11_init();
|
||||
uint16_t Count;
|
||||
uint16_t Diretion;*/
|
||||
printf("program start\n");
|
||||
LCD_init();
|
||||
ST7735_FillScreen(ST7735_WHITE);
|
||||
printf("Begin draw number\n");
|
||||
ui_text_number18x32(10086, 0, 0, ST7735_BLUE);
|
||||
bmf_draw_text(font_unifont_16x16, u8str("Test Ascii\nHello Dragon Ok~~~~"), 29, 0, 40, 160, 64, ST7735_BLACK);
|
||||
printf("End draw number\n");
|
||||
app_init();
|
||||
/* USER CODE END 2 */
|
||||
|
||||
/* Infinite loop */
|
||||
@ -126,16 +113,7 @@ int main(void)
|
||||
{
|
||||
/* USER CODE END WHILE */
|
||||
/* USER CODE BEGIN 3 */
|
||||
HAL_GPIO_TogglePin(LED_STATUS_GPIO_Port,LED_STATUS_Pin);
|
||||
HAL_Delay(300);
|
||||
|
||||
/*
|
||||
Count = EC11_COUNT();
|
||||
Diretion = EC11_DIR();
|
||||
printf("DIRE:%d COUNT:%d \r\n",Diretion,Count);
|
||||
HAL_Delay(500);
|
||||
*/
|
||||
|
||||
app_main_loop();
|
||||
}
|
||||
/* USER CODE END 3 */
|
||||
}
|
||||
|
@ -39,7 +39,8 @@ void MX_SPI1_Init(void)
|
||||
/* USER CODE END SPI1_Init 1 */
|
||||
hspi1.Instance = SPI1;
|
||||
hspi1.Init.Mode = SPI_MODE_MASTER;
|
||||
hspi1.Init.Direction = SPI_DIRECTION_2LINES;
|
||||
// hspi1.Init.Direction = SPI_DIRECTION_2LINES;
|
||||
hspi1.Init.Direction = SPI_DIRECTION_1LINE;
|
||||
hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
|
||||
hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
|
||||
hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
|
||||
|
Reference in New Issue
Block a user