|
16 | 16 | #include "string.h"
|
17 | 17 | #include "drv_lcd.h"
|
18 | 18 | #include "drv_lcd_font.h"
|
19 |
| -#include <rttlogo.h> |
20 | 19 |
|
21 | 20 | #define DRV_DEBUG
|
22 | 21 | #define LOG_TAG "drv.lcd"
|
@@ -1237,22 +1236,22 @@ int drv_lcd_init(void)
|
1237 | 1236 | hsram1.Init.PageSize = FSMC_PAGE_SIZE_NONE;
|
1238 | 1237 | // /* Timing */
|
1239 | 1238 |
|
1240 |
| - read_timing.AddressSetupTime = 0XF; //地址建立时间(ADDSET)为16个HCLK 1/168M=6ns*16=96ns |
1241 |
| - read_timing.AddressHoldTime = 0x00; //地址保持时间(ADDHLD)模式A未用到 |
| 1239 | + read_timing.AddressSetupTime = 0XF; //地址建立时间(ADDSET)为16个HCLK 1/168M=6ns*16=96ns |
| 1240 | + read_timing.AddressHoldTime = 0x00; //地址保持时间(ADDHLD)模式A未用到 |
1242 | 1241 | read_timing.DataSetupTime = 60; //数据保存时间为60个HCLK =6*60=360ns
|
1243 | 1242 | read_timing.BusTurnAroundDuration = 0x00;
|
1244 | 1243 | read_timing.CLKDivision = 0x00;
|
1245 | 1244 | read_timing.DataLatency = 0x00;
|
1246 |
| - read_timing.AccessMode = FSMC_ACCESS_MODE_A; //模式A |
| 1245 | + read_timing.AccessMode = FSMC_ACCESS_MODE_A; //模式A |
1247 | 1246 |
|
1248 | 1247 |
|
1249 |
| - write_timing.AddressSetupTime =9; //地址建立时间(ADDSET)为9个HCLK =54ns |
1250 |
| - write_timing.AddressHoldTime = 0x00; //地址保持时间(A |
| 1248 | + write_timing.AddressSetupTime =9; //地址建立时间(ADDSET)为9个HCLK =54ns |
| 1249 | + write_timing.AddressHoldTime = 0x00; //地址保持时间(A |
1251 | 1250 | write_timing.DataSetupTime = 8; //数据保存时间为6ns*9个HCLK=54ns
|
1252 | 1251 | write_timing.BusTurnAroundDuration = 0x00;
|
1253 | 1252 | write_timing.CLKDivision = 0x00;
|
1254 | 1253 | write_timing.DataLatency = 0x00;
|
1255 |
| - write_timing.AccessMode = FSMC_ACCESS_MODE_A; //模式A |
| 1254 | + write_timing.AccessMode = FSMC_ACCESS_MODE_A; //模式A |
1256 | 1255 |
|
1257 | 1256 | if (HAL_SRAM_Init(&hsram1, &read_timing, &write_timing) != HAL_OK)
|
1258 | 1257 | {
|
@@ -1488,31 +1487,3 @@ void lcd_fill_test(int argc, void **argv)
|
1488 | 1487 | }
|
1489 | 1488 | MSH_CMD_EXPORT(lcd_fill_test, lcd fill test for mcu lcd);
|
1490 | 1489 | #endif
|
1491 |
| - |
1492 |
| -int lcd_show_all_round(void) |
1493 |
| -{ |
1494 |
| - lcd_clear(WHITE); |
1495 |
| - |
1496 |
| - /* show RT-Thread logo */ |
1497 |
| - lcd_show_image(0, 0, 240, 69, image_rttlogo); |
1498 |
| - |
1499 |
| - /* set the background color and foreground color */ |
1500 |
| - lcd_set_color(WHITE, BLACK); |
1501 |
| - |
1502 |
| - /* show some string on lcd */ |
1503 |
| - lcd_show_string(10, 69, 16, "Hello, RT-Thread!"); |
1504 |
| - lcd_show_string(10, 69+16, 24, "RT-Thread"); |
1505 |
| - lcd_show_string(10, 69+16+24, 32, "RT-Thread"); |
1506 |
| - |
1507 |
| - /* draw a line on lcd */ |
1508 |
| - lcd_draw_line(0, 69+16+24+32, 240, 69+16+24+32); |
1509 |
| - |
1510 |
| - /* draw a concentric circles */ |
1511 |
| - lcd_draw_point(120, 194); |
1512 |
| - for (int i = 0; i < 46; i += 4) |
1513 |
| - { |
1514 |
| - lcd_draw_circle(120, 194, i); |
1515 |
| - } |
1516 |
| - return 0; |
1517 |
| -} |
1518 |
| -INIT_APP_EXPORT(lcd_show_all_round); |
0 commit comments