Browse Source

i2c相关修改,触摸屏功能

master
sc 1 month ago
parent
commit
ea0a67e506
  1. 8
      .config
  2. 4
      .cproject
  3. 2
      .project
  4. 49
      applications/lvgl/lv__user_gui.c
  5. 8
      drivers/board.h
  6. 2
      drivers/drv_soft_i2c.c
  7. 6
      drivers/ltdc.c
  8. 4
      rtconfig.h

8
.config

@ -202,7 +202,7 @@ CONFIG_RT_USING_MTD_NOR=y
# CONFIG_RT_USING_PM is not set # CONFIG_RT_USING_PM is not set
CONFIG_RT_USING_RTC=y CONFIG_RT_USING_RTC=y
# CONFIG_RT_USING_ALARM is not set # CONFIG_RT_USING_ALARM is not set
# CONFIG_RT_USING_SOFT_RTC is not set CONFIG_RT_USING_SOFT_RTC=y
CONFIG_RT_USING_SDIO=y CONFIG_RT_USING_SDIO=y
CONFIG_RT_SDIO_STACK_SIZE=512 CONFIG_RT_SDIO_STACK_SIZE=512
CONFIG_RT_SDIO_THREAD_PRIORITY=15 CONFIG_RT_SDIO_THREAD_PRIORITY=15
@ -543,7 +543,7 @@ CONFIG_PKG_USING_LVGL=y
CONFIG_PKG_LVGL_PATH="/packages/multimedia/LVGL/LVGL" CONFIG_PKG_LVGL_PATH="/packages/multimedia/LVGL/LVGL"
CONFIG_PKG_LVGL_THREAD_PRIO=20 CONFIG_PKG_LVGL_THREAD_PRIO=20
CONFIG_PKG_LVGL_THREAD_STACK_SIZE=4096 CONFIG_PKG_LVGL_THREAD_STACK_SIZE=4096
CONFIG_PKG_LVGL_DISP_REFR_PERIOD=5 CONFIG_PKG_LVGL_DISP_REFR_PERIOD=30
# CONFIG_PKG_USING_LVGL_SQUARELINE is not set # CONFIG_PKG_USING_LVGL_SQUARELINE is not set
# CONFIG_PKG_LVGL_USING_EXAMPLES is not set # CONFIG_PKG_LVGL_USING_EXAMPLES is not set
CONFIG_PKG_LVGL_USING_DEMOS=y CONFIG_PKG_LVGL_USING_DEMOS=y
@ -1064,7 +1064,9 @@ CONFIG_PKG_FT5426_VER="latest"
# CONFIG_PKG_USING_AS608 is not set # CONFIG_PKG_USING_AS608 is not set
# CONFIG_PKG_USING_RC522 is not set # CONFIG_PKG_USING_RC522 is not set
# CONFIG_PKG_USING_WS2812B is not set # CONFIG_PKG_USING_WS2812B is not set
# CONFIG_PKG_USING_EXTERN_RTC_DRIVERS is not set CONFIG_PKG_USING_EXTERN_RTC_DRIVERS=y
# CONFIG_PKG_USING_DS3231 is not set
# CONFIG_PKG_USING_RX8900 is not set
# CONFIG_PKG_USING_MULTI_RTIMER is not set # CONFIG_PKG_USING_MULTI_RTIMER is not set
# CONFIG_PKG_USING_MAX7219 is not set # CONFIG_PKG_USING_MAX7219 is not set
# CONFIG_PKG_USING_BEEP is not set # CONFIG_PKG_USING_BEEP is not set

4
.cproject

@ -850,7 +850,7 @@
</toolChain> </toolChain>
</folderInfo> </folderInfo>
<sourceEntries> <sourceEntries>
<entry excluding="drivers/drv_ltdc.c|//cubemx/Drivers|//cubemx/EWARM|//cubemx/Src/stm32h7xx_it.c|//cubemx/Src/system_stm32h7xx.c|//packages/LVGL-v8.3.11/env_support/rt-thread/squareline|//packages/LVGL-v8.3.11/examples|//packages/LVGL-v8.3.11/tests|//packages/ft5426-latest/examples|//packages/littlefs-v2.11.2/runners|//packages/sqlite-v3.19.3/rtthread_io_methods.c|//packages/sqlite-v3.19.3/rtthread_mutex.c|//packages/sqlite-v3.19.3/rtthread_vfs.c|//packages/sqlite-v3.19.3/shell.c|//rt-thread/components/dfs/dfs_v1/filesystems/cromfs|//rt-thread/components/dfs/dfs_v1/filesystems/mqueue|//rt-thread/components/dfs/dfs_v1/filesystems/nfs|//rt-thread/components/dfs/dfs_v1/filesystems/ramfs|//rt-thread/components/dfs/dfs_v1/filesystems/romfs|//rt-thread/components/dfs/dfs_v1/filesystems/skeleton|//rt-thread/components/dfs/dfs_v2|//rt-thread/components/drivers/audio|//rt-thread/components/drivers/can|//rt-thread/components/drivers/clk|//rt-thread/components/drivers/core/dm.c|//rt-thread/components/drivers/core/driver.c|//rt-thread/components/drivers/core/platform.c|//rt-thread/components/drivers/core/platform_ofw.c|//rt-thread/components/drivers/cputime|//rt-thread/components/drivers/fdt|//rt-thread/components/drivers/hwcrypto|//rt-thread/components/drivers/hwtimer|//rt-thread/components/drivers/i2c/i2c_bus.c|//rt-thread/components/drivers/i2c/i2c_dm.c|//rt-thread/components/drivers/i2c/soft_i2c.c|//rt-thread/components/drivers/ktime|//rt-thread/components/drivers/misc|//rt-thread/components/drivers/mtd/mtd_nand.c|//rt-thread/components/drivers/ofw|//rt-thread/components/drivers/phy|//rt-thread/components/drivers/pic|//rt-thread/components/drivers/pin/pin_dm.c|//rt-thread/components/drivers/pin/pin_ofw.c|//rt-thread/components/drivers/pinctrl|//rt-thread/components/drivers/pm|//rt-thread/components/drivers/rtc/alarm.c|//rt-thread/components/drivers/rtc/soft_rtc.c|//rt-thread/components/drivers/sensor|//rt-thread/components/drivers/serial/serial_dm.c|//rt-thread/components/drivers/serial/serial_tty.c|//rt-thread/components/drivers/serial/serial_v2.c|//rt-thread/components/drivers/spi/enc28j60.c|//rt-thread/components/drivers/spi/spi-bit-ops.c|//rt-thread/components/drivers/spi/spi_wifi_rw009.c|//rt-thread/components/drivers/usb|//rt-thread/components/drivers/virtio|//rt-thread/components/drivers/wlan|//rt-thread/components/fal/samples/porting/fal_flash_stm32f2_port.c|//rt-thread/components/legacy|//rt-thread/components/libc/compilers/armlibc|//rt-thread/components/libc/compilers/dlib|//rt-thread/components/libc/compilers/musl|//rt-thread/components/libc/compilers/picolibc|//rt-thread/components/libc/cplusplus|//rt-thread/components/libc/posix|//rt-thread/components/lwp|//rt-thread/components/mm|//rt-thread/components/mprotect|//rt-thread/components/net|//rt-thread/components/utilities|//rt-thread/components/vbus|//rt-thread/libcpu/aarch64|//rt-thread/libcpu/arc|//rt-thread/libcpu/arm/AT91SAM7S|//rt-thread/libcpu/arm/AT91SAM7X|//rt-thread/libcpu/arm/am335x|//rt-thread/libcpu/arm/arm926|//rt-thread/libcpu/arm/armv6|//rt-thread/libcpu/arm/common/atomic_arm.c|//rt-thread/libcpu/arm/common/divsi3.S|//rt-thread/libcpu/arm/cortex-a|//rt-thread/libcpu/arm/cortex-m0|//rt-thread/libcpu/arm/cortex-m23|//rt-thread/libcpu/arm/cortex-m3|//rt-thread/libcpu/arm/cortex-m33|//rt-thread/libcpu/arm/cortex-m4|//rt-thread/libcpu/arm/cortex-m7/context_iar.S|//rt-thread/libcpu/arm/cortex-m7/context_rvds.S|//rt-thread/libcpu/arm/cortex-m7/mpu.c|//rt-thread/libcpu/arm/cortex-m85|//rt-thread/libcpu/arm/cortex-r4|//rt-thread/libcpu/arm/cortex-r52|//rt-thread/libcpu/arm/dm36x|//rt-thread/libcpu/arm/lpc214x|//rt-thread/libcpu/arm/lpc24xx|//rt-thread/libcpu/arm/realview-a8-vmm|//rt-thread/libcpu/arm/s3c24x0|//rt-thread/libcpu/arm/s3c44b0|//rt-thread/libcpu/arm/sep4020|//rt-thread/libcpu/arm/zynqmp-r5|//rt-thread/libcpu/avr32|//rt-thread/libcpu/blackfin|//rt-thread/libcpu/c-sky|//rt-thread/libcpu/ia32|//rt-thread/libcpu/m16c|//rt-thread/libcpu/mips|//rt-thread/libcpu/nios|//rt-thread/libcpu/ppc|//rt-thread/libcpu/risc-v|//rt-thread/libcpu/rx|//rt-thread/libcpu/sim|//rt-thread/libcpu/sparc-v8|//rt-thread/libcpu/ti-dsp|//rt-thread/libcpu/unicore32|//rt-thread/libcpu/v850|//rt-thread/libcpu/xilinx|//rt-thread/src/cpu.c|//rt-thread/src/mem.c|//rt-thread/src/scheduler_mp.c|//rt-thread/src/slab.c|//rt-thread/tools" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="" /> <entry excluding="drivers/drv_ltdc.c|//cubemx/Drivers|//cubemx/EWARM|//cubemx/Src/stm32h7xx_it.c|//cubemx/Src/system_stm32h7xx.c|//packages/LVGL-v8.3.11/env_support/rt-thread/squareline|//packages/LVGL-v8.3.11/examples|//packages/LVGL-v8.3.11/tests|//packages/ft5426-latest/examples|//packages/littlefs-v2.11.2/runners|//packages/sqlite-v3.19.3/rtthread_io_methods.c|//packages/sqlite-v3.19.3/rtthread_mutex.c|//packages/sqlite-v3.19.3/rtthread_vfs.c|//packages/sqlite-v3.19.3/shell.c|//rt-thread/components/dfs/dfs_v1/filesystems/cromfs|//rt-thread/components/dfs/dfs_v1/filesystems/mqueue|//rt-thread/components/dfs/dfs_v1/filesystems/nfs|//rt-thread/components/dfs/dfs_v1/filesystems/ramfs|//rt-thread/components/dfs/dfs_v1/filesystems/romfs|//rt-thread/components/dfs/dfs_v1/filesystems/skeleton|//rt-thread/components/dfs/dfs_v2|//rt-thread/components/drivers/audio|//rt-thread/components/drivers/can|//rt-thread/components/drivers/clk|//rt-thread/components/drivers/core/dm.c|//rt-thread/components/drivers/core/driver.c|//rt-thread/components/drivers/core/platform.c|//rt-thread/components/drivers/core/platform_ofw.c|//rt-thread/components/drivers/cputime|//rt-thread/components/drivers/fdt|//rt-thread/components/drivers/hwcrypto|//rt-thread/components/drivers/hwtimer|//rt-thread/components/drivers/i2c/i2c_bus.c|//rt-thread/components/drivers/i2c/i2c_dm.c|//rt-thread/components/drivers/i2c/soft_i2c.c|//rt-thread/components/drivers/ktime|//rt-thread/components/drivers/misc|//rt-thread/components/drivers/mtd/mtd_nand.c|//rt-thread/components/drivers/ofw|//rt-thread/components/drivers/phy|//rt-thread/components/drivers/pic|//rt-thread/components/drivers/pin/pin_dm.c|//rt-thread/components/drivers/pin/pin_ofw.c|//rt-thread/components/drivers/pinctrl|//rt-thread/components/drivers/pm|//rt-thread/components/drivers/rtc/alarm.c|//rt-thread/components/drivers/sensor|//rt-thread/components/drivers/serial/serial_dm.c|//rt-thread/components/drivers/serial/serial_tty.c|//rt-thread/components/drivers/serial/serial_v2.c|//rt-thread/components/drivers/spi/enc28j60.c|//rt-thread/components/drivers/spi/spi-bit-ops.c|//rt-thread/components/drivers/spi/spi_wifi_rw009.c|//rt-thread/components/drivers/usb|//rt-thread/components/drivers/virtio|//rt-thread/components/drivers/wlan|//rt-thread/components/fal/samples/porting/fal_flash_stm32f2_port.c|//rt-thread/components/legacy|//rt-thread/components/libc/compilers/armlibc|//rt-thread/components/libc/compilers/dlib|//rt-thread/components/libc/compilers/musl|//rt-thread/components/libc/compilers/picolibc|//rt-thread/components/libc/cplusplus|//rt-thread/components/libc/posix|//rt-thread/components/lwp|//rt-thread/components/mm|//rt-thread/components/mprotect|//rt-thread/components/net|//rt-thread/components/utilities|//rt-thread/components/vbus|//rt-thread/libcpu/aarch64|//rt-thread/libcpu/arc|//rt-thread/libcpu/arm/AT91SAM7S|//rt-thread/libcpu/arm/AT91SAM7X|//rt-thread/libcpu/arm/am335x|//rt-thread/libcpu/arm/arm926|//rt-thread/libcpu/arm/armv6|//rt-thread/libcpu/arm/common/atomic_arm.c|//rt-thread/libcpu/arm/common/divsi3.S|//rt-thread/libcpu/arm/cortex-a|//rt-thread/libcpu/arm/cortex-m0|//rt-thread/libcpu/arm/cortex-m23|//rt-thread/libcpu/arm/cortex-m3|//rt-thread/libcpu/arm/cortex-m33|//rt-thread/libcpu/arm/cortex-m4|//rt-thread/libcpu/arm/cortex-m7/context_iar.S|//rt-thread/libcpu/arm/cortex-m7/context_rvds.S|//rt-thread/libcpu/arm/cortex-m7/mpu.c|//rt-thread/libcpu/arm/cortex-m85|//rt-thread/libcpu/arm/cortex-r4|//rt-thread/libcpu/arm/cortex-r52|//rt-thread/libcpu/arm/dm36x|//rt-thread/libcpu/arm/lpc214x|//rt-thread/libcpu/arm/lpc24xx|//rt-thread/libcpu/arm/realview-a8-vmm|//rt-thread/libcpu/arm/s3c24x0|//rt-thread/libcpu/arm/s3c44b0|//rt-thread/libcpu/arm/sep4020|//rt-thread/libcpu/arm/zynqmp-r5|//rt-thread/libcpu/avr32|//rt-thread/libcpu/blackfin|//rt-thread/libcpu/c-sky|//rt-thread/libcpu/ia32|//rt-thread/libcpu/m16c|//rt-thread/libcpu/mips|//rt-thread/libcpu/nios|//rt-thread/libcpu/ppc|//rt-thread/libcpu/risc-v|//rt-thread/libcpu/rx|//rt-thread/libcpu/sim|//rt-thread/libcpu/sparc-v8|//rt-thread/libcpu/ti-dsp|//rt-thread/libcpu/unicore32|//rt-thread/libcpu/v850|//rt-thread/libcpu/xilinx|//rt-thread/src/cpu.c|//rt-thread/src/mem.c|//rt-thread/src/scheduler_mp.c|//rt-thread/src/slab.c|//rt-thread/tools" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="" />
</sourceEntries> </sourceEntries>
</configuration> </configuration>
</storageModule> </storageModule>
@ -870,7 +870,7 @@
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders" /> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders" />
<storageModule moduleId="refreshScope" versionNumber="2"> <storageModule moduleId="refreshScope" versionNumber="2">
<configuration configurationName="Debug"> <configuration configurationName="Debug">
<resource resourceType="PROJECT" workspacePath="/828F" /> <resource resourceType="PROJECT" workspacePath="/project" />
</configuration> </configuration>
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets" /> <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets" />

2
.project

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>828F</name> <name>project</name>
<comment /> <comment />
<projects> <projects>
</projects> </projects>

49
applications/lvgl/lv__user_gui.c

@ -20,56 +20,7 @@
#define LCD_BL_PIN GET_PIN(D,12) #define LCD_BL_PIN GET_PIN(D,12)
#define LCD_RST_PIN GET_PIN(D,11) #define LCD_RST_PIN GET_PIN(D,11)
static void btn_led_on_evt_handler(lv_event_t *e)
{
lv_event_code_t code = lv_event_get_code(e);
if (code == LV_EVENT_CLICKED)
{
rt_kprintf("LED ON\n");
//led_on();
}
}
static void btn_led_off_evt_handler(lv_event_t *e)
{
lv_event_code_t code = lv_event_get_code(e);
if (code == LV_EVENT_CLICKED)
{
rt_kprintf("LED OFF\n");
// led_off();
}
}
void lv_user_gui_init(void) void lv_user_gui_init(void)
{ {
lv_demo_widgets(); lv_demo_widgets();
/* lv_obj_t *scr = lv_scr_act();
// 创建“按钮” —— 实际是一个可点击的普通对象
lv_obj_t *btn_on = lv_obj_create(scr);
lv_obj_set_size(btn_on, 100, 50);
lv_obj_align(btn_on, LV_ALIGN_CENTER, -60, 0);
lv_obj_add_flag(btn_on, LV_OBJ_FLAG_CLICKABLE); // 启用点击
lv_obj_clear_flag(btn_on, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_t *label_on = lv_label_create(btn_on);
lv_label_set_text(label_on, "LED ON");
lv_obj_center(label_on);
lv_obj_add_event_cb(btn_on, btn_led_on_evt_handler, LV_EVENT_CLICKED, NULL);
// 第二个按钮
lv_obj_t *btn_off = lv_obj_create(scr);
lv_obj_set_size(btn_off, 100, 50);
lv_obj_align(btn_off, LV_ALIGN_CENTER, 60, 0);
lv_obj_add_flag(btn_off, LV_OBJ_FLAG_CLICKABLE);
lv_obj_clear_flag(btn_off, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_t *label_off = lv_label_create(btn_off);
lv_label_set_text(label_off, "LED OFF");
lv_obj_center(label_off);
lv_obj_add_event_cb(btn_off, btn_led_off_evt_handler, LV_EVENT_CLICKED, NULL);*/
} }

8
drivers/board.h

@ -133,11 +133,11 @@ extern "C"
#endif #endif
/*#define BSP_USING_I2C2*/ /*#define BSP_USING_I2C2*/
//#define BSP_USING_I2C2 #define BSP_USING_I2C2
#ifdef BSP_USING_I2C2 #ifdef BSP_USING_I2C2
#define BSP_I2C2_SCL_PIN GET_PIN(port, pin) #define BSP_I2C2_SCL_PIN GET_PIN(B, 7)
#define BSP_I2C2_SDA_PIN GET_PIN(port, pin) #define BSP_I2C2_SDA_PIN GET_PIN(B, 8)
#endif #endif
/*-------------------------- I2C CONFIG END --------------------------*/ /*-------------------------- I2C CONFIG END --------------------------*/
@ -286,7 +286,7 @@ extern "C"
* *
*/ */
/*#define BSP_USING_ONCHIP_RTC*/ /*#define BSP_USING_ONCHIP_RTC*/
#define BSP_USING_ONCHIP_RTC //#define BSP_USING_ONCHIP_RTC
/*-------------------------- RTC CONFIG END --------------------------*/ /*-------------------------- RTC CONFIG END --------------------------*/

2
drivers/drv_soft_i2c.c

@ -160,7 +160,7 @@ static const struct rt_i2c_bit_ops stm32_bit_ops_default =
.get_sda = stm32_get_sda, .get_sda = stm32_get_sda,
.get_scl = stm32_get_scl, .get_scl = stm32_get_scl,
.udelay = stm32_udelay, .udelay = stm32_udelay,
.delay_us = 1, .delay_us = 5,
.timeout = 100 .timeout = 100
}; };

6
drivers/ltdc.c

@ -456,9 +456,9 @@ int ltdc_init(void)
else if (lcdid == 0X7016) else if (lcdid == 0X7016)
{ {
lcdltdc.pwidth = 1024; lcdltdc.pheight = 600; lcdltdc.pwidth = 1024; lcdltdc.pheight = 600;
lcdltdc.hsw = 70; lcdltdc.hbp = 160; lcdltdc.hfp = 160; lcdltdc.hsw = 20; lcdltdc.hbp = 160; lcdltdc.hfp = 160;
lcdltdc.vsw = 10; lcdltdc.vbp = 23; lcdltdc.vfp = 12; lcdltdc.vsw = 3; lcdltdc.vbp = 23; lcdltdc.vfp = 12;
ltdc_clk_set(128, 32, 5); ltdc_clk_set(128, 40, 5);
} }
else if (lcdid == 0X7018) else if (lcdid == 0X7018)
{ {

4
rtconfig.h

@ -131,6 +131,7 @@
#define RT_USING_I2C_BITOPS #define RT_USING_I2C_BITOPS
#define RT_USING_MTD_NOR #define RT_USING_MTD_NOR
#define RT_USING_RTC #define RT_USING_RTC
#define RT_USING_SOFT_RTC
#define RT_USING_SDIO #define RT_USING_SDIO
#define RT_SDIO_STACK_SIZE 512 #define RT_SDIO_STACK_SIZE 512
#define RT_SDIO_THREAD_PRIORITY 15 #define RT_SDIO_THREAD_PRIORITY 15
@ -260,7 +261,7 @@
#define PKG_USING_LVGL #define PKG_USING_LVGL
#define PKG_LVGL_THREAD_PRIO 20 #define PKG_LVGL_THREAD_PRIO 20
#define PKG_LVGL_THREAD_STACK_SIZE 4096 #define PKG_LVGL_THREAD_STACK_SIZE 4096
#define PKG_LVGL_DISP_REFR_PERIOD 5 #define PKG_LVGL_DISP_REFR_PERIOD 30
#define PKG_LVGL_USING_DEMOS #define PKG_LVGL_USING_DEMOS
#define PKG_LVGL_USING_V080311 #define PKG_LVGL_USING_V080311
#define PKG_LVGL_VER_NUM 0x080311 #define PKG_LVGL_VER_NUM 0x080311
@ -362,6 +363,7 @@
#define PKG_USING_FT5426 #define PKG_USING_FT5426
#define PKG_USING_FT5426_LATEST_VERSION #define PKG_USING_FT5426_LATEST_VERSION
/* end of touch drivers */ /* end of touch drivers */
#define PKG_USING_EXTERN_RTC_DRIVERS
#define PKG_USING_RS485 #define PKG_USING_RS485
#define RS485_USING_DEV #define RS485_USING_DEV
#define RS485_SW_DLY_US 0 #define RS485_SW_DLY_US 0

Loading…
Cancel
Save