From 8fc8049eb8e3d6979587458cc50b8866d07c33e0 Mon Sep 17 00:00:00 2001 From: CaoWangrenbo Date: Thu, 4 Jan 2024 22:43:15 +0800 Subject: [PATCH] =?UTF-8?q?pref:=20=E6=9B=B4=E6=8D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B1=8F=E6=96=87=E5=AD=97=E5=92=8C=E8=83=8C=E6=99=AF=E9=A2=9C?= =?UTF-8?q?=E8=89=B2,=E4=BD=BF=E5=85=B6=E6=9B=B4=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BC=A0=E8=BE=BE=E7=9A=84=E6=B8=85=E6=99=B0?= =?UTF-8?q?=E5=BA=A6=E8=A6=81=E6=B1=82=20fix:=20=E4=BF=AE=E6=AD=A3page=5Fm?= =?UTF-8?q?enu=E4=B8=AD=E9=94=99=E8=AF=AF=E8=B0=83=E7=94=A8114=E6=B8=85?= =?UTF-8?q?=E5=B1=8F=E5=87=BD=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98=20fix:?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4page=5Frtcam=E4=B8=ADpage=5Fevent=5Fpress?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E9=94=99=E8=AF=AF=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/page/cw_page_menu.c | 2 +- app/page/cw_page_rtcam.c | 3 --- libraries/zf_device/zf_device_ips200.h | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/page/cw_page_menu.c b/app/page/cw_page_menu.c index ea5b939..fa77b32 100644 --- a/app/page/cw_page_menu.c +++ b/app/page/cw_page_menu.c @@ -23,7 +23,7 @@ static void Print_Menu_p(void); */ static void Setup() { - ips114_clear(); + ips200_clear(); Print_Menu_p(); Print_Curser(Curser, Curser_Last); } diff --git a/app/page/cw_page_rtcam.c b/app/page/cw_page_rtcam.c index d23ccfa..6a5d910 100644 --- a/app/page/cw_page_rtcam.c +++ b/app/page/cw_page_rtcam.c @@ -62,9 +62,6 @@ static void Event(page_event event) } else if (page_event_backward == event) { Curser++; // 光标下移 } else if (page_event_press == event) { - if (page_max > Curser && page_menu < Curser) { - Page_Shift(Curser); // 切换到光标选中的页面 - } } if (Curser < LINE_HEAD) { diff --git a/libraries/zf_device/zf_device_ips200.h b/libraries/zf_device/zf_device_ips200.h index 8e73b41..3362ed9 100644 --- a/libraries/zf_device/zf_device_ips200.h +++ b/libraries/zf_device/zf_device_ips200.h @@ -115,8 +115,8 @@ // --------------------双排 SPI 接口两寸屏幕引脚定义--------------------// #define IPS200_DEFAULT_DISPLAY_DIR (IPS200_PORTAIT) // 默认的显示方向 -#define IPS200_DEFAULT_PENCOLOR (RGB565_RED ) // 默认的画笔颜色 -#define IPS200_DEFAULT_BGCOLOR (RGB565_WHITE ) // 默认的背景颜色 +#define IPS200_DEFAULT_PENCOLOR (RGB565_BLACK ) // 默认的画笔颜色 +#define IPS200_DEFAULT_BGCOLOR (RGB565_YELLOW ) // 默认的背景颜色 #define IPS200_DEFAULT_DISPLAY_FONT (IPS200_8X16_FONT) // 默认的字体模式 // 控制语句