From 055c8735a458f3794ccf4a1c1afdf7c26d91d7d1 Mon Sep 17 00:00:00 2001 From: JFeng <2834294740@qq.com> Date: Sat, 22 Jun 2024 11:48:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=AF=9D=E6=A1=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BAbug=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E7=A8=8B=E5=BA=8F=E4=B8=AD=E7=9A=84logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Image/aircraft-game-stroke-rounded.svg | 6 + Image/apple-reminder-stroke-rounded.svg | 6 + Image/arrow-left-03-stroke-rounded.svg | 5 + Image/dino.png | Bin 0 -> 13499 bytes Image/game-controller-03-stroke-rounded.svg | 7 ++ Image/github-stroke-rounded.svg | 4 + Image/image-02-stroke-rounded.svg | 6 + Image/keyboard-stroke-rounded.svg | 8 ++ Image/settings-02-stroke-rounded.svg | 4 + example/STM32F103C8T6/MultMenu/menu/image.c | 115 +++++++++++++++++++- example/STM32F103C8T6/MultMenu/menu/image.h | 3 +- example/STM32F103C8T6/MultMenu/menu/menu.c | 51 +++++---- 12 files changed, 187 insertions(+), 28 deletions(-) create mode 100644 Image/aircraft-game-stroke-rounded.svg create mode 100644 Image/apple-reminder-stroke-rounded.svg create mode 100644 Image/arrow-left-03-stroke-rounded.svg create mode 100644 Image/dino.png create mode 100644 Image/game-controller-03-stroke-rounded.svg create mode 100644 Image/github-stroke-rounded.svg create mode 100644 Image/image-02-stroke-rounded.svg create mode 100644 Image/keyboard-stroke-rounded.svg create mode 100644 Image/settings-02-stroke-rounded.svg diff --git a/Image/aircraft-game-stroke-rounded.svg b/Image/aircraft-game-stroke-rounded.svg new file mode 100644 index 0000000..a0e87ee --- /dev/null +++ b/Image/aircraft-game-stroke-rounded.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Image/apple-reminder-stroke-rounded.svg b/Image/apple-reminder-stroke-rounded.svg new file mode 100644 index 0000000..8ab6eab --- /dev/null +++ b/Image/apple-reminder-stroke-rounded.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Image/arrow-left-03-stroke-rounded.svg b/Image/arrow-left-03-stroke-rounded.svg new file mode 100644 index 0000000..ce079e2 --- /dev/null +++ b/Image/arrow-left-03-stroke-rounded.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Image/dino.png b/Image/dino.png new file mode 100644 index 0000000000000000000000000000000000000000..1273adeed465b364c460c57e3e4d0eb54d845856 GIT binary patch literal 13499 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 z z4UXU(FfwJb0;0H$+ NbhV726&ki-{{wr(arFQI literal 0 HcmV?d00001 diff --git a/Image/game-controller-03-stroke-rounded.svg b/Image/game-controller-03-stroke-rounded.svg new file mode 100644 index 0000000..8d58317 --- /dev/null +++ b/Image/game-controller-03-stroke-rounded.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Image/github-stroke-rounded.svg b/Image/github-stroke-rounded.svg new file mode 100644 index 0000000..c9f2fea --- /dev/null +++ b/Image/github-stroke-rounded.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Image/image-02-stroke-rounded.svg b/Image/image-02-stroke-rounded.svg new file mode 100644 index 0000000..e778bba --- /dev/null +++ b/Image/image-02-stroke-rounded.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Image/keyboard-stroke-rounded.svg b/Image/keyboard-stroke-rounded.svg new file mode 100644 index 0000000..74a5c0d --- /dev/null +++ b/Image/keyboard-stroke-rounded.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Image/settings-02-stroke-rounded.svg b/Image/settings-02-stroke-rounded.svg new file mode 100644 index 0000000..0d2c8ae --- /dev/null +++ b/Image/settings-02-stroke-rounded.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/example/STM32F103C8T6/MultMenu/menu/image.c b/example/STM32F103C8T6/MultMenu/menu/image.c index 26246ff..f341983 100644 --- a/example/STM32F103C8T6/MultMenu/menu/image.c +++ b/example/STM32F103C8T6/MultMenu/menu/image.c @@ -1,6 +1,106 @@ #include "image.h" -const uint8_t logo1 [] = { +// 'aircraft-game-stroke-rounded', 30x30px +const unsigned char logo_aircraft_game_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xcf, 0x3f, 0xff, 0x3c, + 0xcf, 0x1f, 0xfe, 0x3c, 0xcf, 0x0f, 0xfc, 0x3c, 0xff, 0xc7, 0xfc, 0x3f, 0xff, 0xc7, 0xf8, 0x3f, + 0xcf, 0xe7, 0xf9, 0x3c, 0xcf, 0xe3, 0xf1, 0x3c, 0xcf, 0xf3, 0xf3, 0x3c, 0xff, 0xf3, 0xf3, 0x3f, + 0xff, 0x31, 0xe3, 0x3f, 0xef, 0x39, 0xe7, 0x3d, 0xc7, 0x39, 0xe7, 0x3c, 0x87, 0xf9, 0x67, 0x38, + 0x83, 0xf9, 0x67, 0x30, 0x13, 0xf8, 0x07, 0x32, 0x13, 0xfc, 0x07, 0x32, 0x31, 0xfe, 0x1f, 0x23, + 0x31, 0xff, 0x3f, 0x23, 0xf1, 0xf9, 0xe7, 0x23, 0x73, 0xf8, 0x87, 0x33, 0x03, 0xf0, 0x03, 0x30, + 0x07, 0xf3, 0x33, 0x38, 0xc7, 0x03, 0xf0, 0x38, 0xff, 0x07, 0xf8, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'apple-reminder-stroke-rounded', 30x30px +const unsigned char logo_apple_reminder_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x00, 0xc0, 0x3f, 0x1f, 0x00, 0x00, 0x3e, + 0x0f, 0xff, 0x1f, 0x3c, 0xc7, 0xff, 0xff, 0x38, 0xe7, 0xff, 0xff, 0x39, 0xe7, 0xff, 0xff, 0x39, + 0xe3, 0x18, 0xc0, 0x31, 0xe3, 0x18, 0xc0, 0x31, 0xf3, 0xf8, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, + 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xfd, 0xff, 0x33, 0xf3, 0x18, 0xc0, 0x33, 0xf3, 0x18, 0xc0, 0x33, + 0xf3, 0xfd, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xf8, 0xff, 0x33, + 0xe3, 0x18, 0xc0, 0x31, 0xe3, 0x18, 0xc0, 0x31, 0xe7, 0xff, 0xff, 0x39, 0xe7, 0xff, 0xff, 0x39, + 0xc7, 0xff, 0xff, 0x38, 0x0f, 0xf8, 0x07, 0x3c, 0x1f, 0x00, 0x00, 0x3e, 0xff, 0x00, 0xc0, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'arrow-left-03-stroke-rounded', 30x30px +const unsigned char logo_arrow_left_03_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xcf, 0xff, 0xff, 0x3f, + 0xcf, 0xff, 0xff, 0x3f, 0xcf, 0x3f, 0xff, 0x3f, 0xcf, 0x0f, 0xff, 0x3f, 0xcf, 0x87, 0xff, 0x3f, + 0xcf, 0xe3, 0xff, 0x3f, 0xcf, 0xf3, 0xff, 0x3f, 0xcf, 0x01, 0x00, 0x3c, 0xcf, 0x01, 0x00, 0x3c, + 0xcf, 0xf3, 0xff, 0x3f, 0xcf, 0xe3, 0xff, 0x3f, 0xcf, 0x87, 0xff, 0x3f, 0xcf, 0x0f, 0xff, 0x3f, + 0xcf, 0x3f, 0xff, 0x3f, 0xcf, 0xff, 0xff, 0x3f, 0xcf, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'github-stroke-rounded', 30x30px +const unsigned char logo_github_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xfc, 0xff, 0x3c, 0x7f, 0xf0, 0x3f, 0x38, 0x7f, 0x00, 0x00, 0x38, + 0x3f, 0x06, 0x80, 0x39, 0x3f, 0xfe, 0xff, 0x39, 0x7f, 0xfe, 0xff, 0x39, 0x7f, 0xfe, 0xff, 0x39, + 0x3f, 0xfe, 0xff, 0x31, 0x3f, 0xff, 0xff, 0x33, 0x1f, 0xff, 0xff, 0x33, 0x9f, 0xff, 0xff, 0x23, + 0x9f, 0xff, 0xff, 0x23, 0x1f, 0xff, 0xff, 0x33, 0x1f, 0xff, 0xff, 0x33, 0x3f, 0xff, 0xff, 0x33, + 0x3f, 0xfe, 0xff, 0x31, 0x7f, 0xfc, 0xff, 0x38, 0x7f, 0xf8, 0x3f, 0x3c, 0xff, 0xe1, 0x1f, 0x3e, + 0xfb, 0xc3, 0x0f, 0x3f, 0xf1, 0xcf, 0xc7, 0x3f, 0xe3, 0xcf, 0xcf, 0x3f, 0xc7, 0xc7, 0xcf, 0x3f, + 0x87, 0xc7, 0xcf, 0x3f, 0x0f, 0xc0, 0xcf, 0x3f, 0x1f, 0xc0, 0xcf, 0x3f, 0xff, 0xc7, 0xcf, 0x3f, + 0xff, 0xef, 0xdf, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'game-controller-03-stroke-rounded', 30x30px +const unsigned char logo_game_controller_03_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0x3f, 0xfc, 0x0f, 0x3f, 0x1f, 0xfc, 0x0f, 0x3e, 0xbf, 0x07, 0x78, 0x3f, 0x3f, 0x00, 0x00, 0x3f, + 0x0f, 0xc0, 0x00, 0x3c, 0x8f, 0xff, 0x7f, 0x3c, 0xc7, 0xff, 0xff, 0x38, 0x67, 0xf7, 0xe7, 0x39, + 0x27, 0xf2, 0xe7, 0x39, 0x63, 0xf0, 0xe7, 0x31, 0xf3, 0xf8, 0xff, 0x33, 0x73, 0xf0, 0x1f, 0x33, + 0x33, 0xf2, 0x1f, 0x33, 0xf3, 0xff, 0xbf, 0x33, 0xf3, 0xff, 0xff, 0x33, 0xf1, 0xff, 0xff, 0x23, + 0xf1, 0x01, 0xe0, 0x23, 0xf3, 0x01, 0xe0, 0x33, 0xe3, 0xfc, 0xcf, 0x31, 0x47, 0xfc, 0x8f, 0x38, + 0x0f, 0xfe, 0x1f, 0x3c, 0x1f, 0xff, 0x3f, 0x3e, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'image-02-stroke-rounded', 30x30px +const unsigned char logo_image_02_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x00, 0xc0, 0x3f, 0x1f, 0x00, 0x00, 0x3e, + 0x0f, 0xff, 0x1f, 0x3c, 0xc7, 0xff, 0xff, 0x38, 0xe7, 0xff, 0xcf, 0x39, 0xe7, 0xff, 0x83, 0x39, + 0xe3, 0xff, 0x03, 0x31, 0xe3, 0xff, 0x13, 0x31, 0xf3, 0xff, 0x83, 0x33, 0xf3, 0xff, 0x83, 0x33, + 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, + 0x83, 0xff, 0xff, 0x33, 0x03, 0xf0, 0xff, 0x33, 0x03, 0xe0, 0xff, 0x33, 0xf3, 0x83, 0x07, 0x30, + 0xe3, 0x0f, 0x02, 0x30, 0xe3, 0x3f, 0xe0, 0x31, 0xe7, 0x7f, 0xf8, 0x39, 0xe7, 0xff, 0xf8, 0x39, + 0xc7, 0xff, 0xf1, 0x38, 0x0f, 0xf8, 0x03, 0x3c, 0x1f, 0x00, 0x00, 0x3e, 0xff, 0x00, 0xc0, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'settings-02-stroke-rounded', 30x30px +const unsigned char logo_settings_02_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xfb, 0xf7, 0x3f, 0xff, 0xe0, 0xc1, 0x3f, + 0x7f, 0x00, 0x80, 0x3f, 0x3f, 0x0e, 0x1c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0x3f, 0x3f, + 0x3f, 0xff, 0x3f, 0x3f, 0x3f, 0xff, 0x3f, 0x3f, 0x1f, 0x0f, 0x3c, 0x3e, 0x87, 0x07, 0x78, 0x38, + 0xc3, 0xe3, 0xf1, 0x30, 0xf1, 0xf3, 0xf3, 0x23, 0xf1, 0xf3, 0xf3, 0x23, 0xf1, 0xf3, 0xf3, 0x23, + 0xf1, 0xf3, 0xf3, 0x23, 0xc3, 0xe3, 0xf1, 0x30, 0x87, 0x07, 0x78, 0x38, 0x1f, 0x0f, 0x3c, 0x3e, + 0x3f, 0xff, 0x3f, 0x3f, 0x3f, 0xff, 0x3f, 0x3f, 0x3f, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, + 0x3f, 0x0e, 0x1c, 0x3f, 0x7f, 0x00, 0x80, 0x3f, 0xff, 0xe0, 0xc1, 0x3f, 0xff, 0xfb, 0xf7, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'keyboard-stroke-rounded', 30x30px +const unsigned char logo_keyboard_stroke_rounded [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xfd, 0x3f, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xf8, 0x3f, + 0xff, 0x7f, 0xfc, 0x3f, 0xff, 0x3f, 0xfc, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, + 0x1f, 0x00, 0x00, 0x3e, 0x07, 0x00, 0x00, 0x38, 0xc3, 0xff, 0xff, 0x30, 0xf3, 0xff, 0xff, 0x33, + 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, 0xf3, 0x18, 0xc6, 0x33, 0xf1, 0x18, 0xc6, 0x23, + 0xf1, 0xff, 0xff, 0x23, 0xf1, 0xff, 0xff, 0x23, 0xf1, 0xff, 0xff, 0x23, 0xf1, 0xff, 0xff, 0x23, + 0xf1, 0x00, 0xc0, 0x23, 0xf1, 0x00, 0xc0, 0x23, 0xf3, 0xff, 0xff, 0x33, 0xf3, 0xff, 0xff, 0x33, + 0xf3, 0xff, 0xff, 0x33, 0xe3, 0xff, 0xff, 0x31, 0x07, 0x00, 0x00, 0x38, 0x0f, 0x00, 0x00, 0x3c, + 0xff, 0x01, 0xe0, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; +// 'dino', 30x30px +const unsigned char logo_dino [] = { + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0x80, 0x3f, 0xff, 0x7f, 0x00, 0x3f, 0xff, 0x7f, 0x02, 0x3f, 0xff, 0x7f, 0x00, 0x3f, + 0xff, 0x7f, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0x3f, 0xff, 0x7f, 0xc0, 0x3f, 0xbf, 0x3f, 0xf0, 0x3f, + 0xbf, 0x1f, 0xf8, 0x3f, 0x3f, 0x07, 0xe0, 0x3f, 0x3f, 0x02, 0xe0, 0x3f, 0x3f, 0x00, 0xf8, 0x3f, + 0x3f, 0x00, 0xf8, 0x3f, 0x7f, 0x00, 0xfc, 0x3f, 0xff, 0x00, 0xfc, 0x3f, 0xff, 0x01, 0xfe, 0x3f, + 0xff, 0x01, 0xff, 0x3f, 0xff, 0x23, 0xff, 0x3f, 0xff, 0x73, 0xff, 0x3f, 0xff, 0x73, 0xfe, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f +}; + +const unsigned char ikun [] = { 0xff, 0xff, 0xff, 0x3f, 0xff, 0xc3, 0xff, 0x3f, 0xff, 0x00, 0xfc, 0x3f, 0x3f, 0x00, 0xf0, 0x3f, 0x1f, 0x00, 0xe0, 0x3f, 0x0f, 0x00, 0x80, 0x3f, 0x07, 0x00, 0x00, 0x3f, 0x03, 0x7e, 0x00, 0x3e, 0x01, 0x7e, 0x00, 0x3c, 0x01, 0x7f, 0x00, 0x38, 0x01, 0x0c, 0x00, 0x38, 0x01, 0xe3, 0x00, 0x30, @@ -10,3 +110,16 @@ const uint8_t logo1 [] = { 0x1f, 0x00, 0x00, 0x20, 0x0f, 0x00, 0x00, 0x20, 0x0f, 0x00, 0x08, 0x20, 0x07, 0x00, 0x00, 0x30, 0x07, 0x00, 0x00, 0x38, 0xff, 0xff, 0xff, 0x3f }; + +const unsigned char* logo_allArray[logo_allArray_LEN] = { + logo_aircraft_game_stroke_rounded, + logo_apple_reminder_stroke_rounded, + logo_arrow_left_03_stroke_rounded, + logo_dino, + logo_game_controller_03_stroke_rounded, + logo_github_stroke_rounded, + logo_image_02_stroke_rounded, + logo_keyboard_stroke_rounded, + logo_settings_02_stroke_rounded, + ikun +}; diff --git a/example/STM32F103C8T6/MultMenu/menu/image.h b/example/STM32F103C8T6/MultMenu/menu/image.h index 254dd51..223ed84 100644 --- a/example/STM32F103C8T6/MultMenu/menu/image.h +++ b/example/STM32F103C8T6/MultMenu/menu/image.h @@ -3,6 +3,7 @@ #include "stm32f10x.h" -extern const uint8_t logo1[]; +#define logo_allArray_LEN 10 +extern const unsigned char* logo_allArray[logo_allArray_LEN]; #endif diff --git a/example/STM32F103C8T6/MultMenu/menu/menu.c b/example/STM32F103C8T6/MultMenu/menu/menu.c index 819d825..7f44c3c 100644 --- a/example/STM32F103C8T6/MultMenu/menu/menu.c +++ b/example/STM32F103C8T6/MultMenu/menu/menu.c @@ -8,7 +8,7 @@ /* Page*/ xPage Home_Page, System_Page, CursorAnimation_Page, SettingTextPage_Page, SettingImagePage_Page, Games_Page; /* item */ -xItem HomeHead_Item, SystemHead_Item, GamesHead_Item, System_Item, Games_Item, ShowLogo_Item, Github_Item, Bilibili_Item, ReadME_Item; +xItem HomeHead_Item, SystemHead_Item, GamesHead_Item, System_Item, Games_Item, Image_Item, Github_Item, Bilibili_Item, ReadME_Item; xItem CursorAnimationHead_Item, CursorKp_Item, CursorKi_Item, CursorKd_Item; xItem SettingTextPageHead_Item, TextSpace_Item; xItem SettingImagePageHead_Item, ImageSpace_Item; @@ -16,14 +16,14 @@ xItem MPU6050_Item, CursorAnimation_Item, SettingTextPage_Item, SettingImagePage xItem Dino_Item, AirPlane_Item; const uint8_t Presets_Logo [] = { - 0xff, 0xff, 0xff, 0x3f, 0xff, 0xe3, 0xff, 0x3f, 0xff, 0x00, 0xfc, 0x3f, 0x3f, 0x04, 0xf0, 0x3f, - 0x1f, 0x91, 0xe2, 0x3f, 0x4f, 0x02, 0xc8, 0x3f, 0xa7, 0x20, 0x01, 0x3f, 0x93, 0x7e, 0x14, 0x3e, - 0x13, 0xff, 0x90, 0x3c, 0x21, 0x9f, 0x20, 0x38, 0x49, 0x4c, 0x84, 0x39, 0xc1, 0xe3, 0x11, 0x38, - 0x81, 0xd3, 0x40, 0x38, 0xb1, 0xd7, 0x09, 0x38, 0xef, 0xf7, 0x03, 0x38, 0xcb, 0xf3, 0x9b, 0x3c, - 0x13, 0x48, 0x64, 0x3e, 0x67, 0x86, 0x61, 0x3f, 0xc7, 0xb0, 0x59, 0x3f, 0xd7, 0xce, 0x41, 0x38, - 0xe7, 0xf9, 0x37, 0x32, 0xef, 0xbf, 0x9f, 0x20, 0xcf, 0xe7, 0x46, 0x29, 0x0f, 0x03, 0x40, 0x1b, - 0x1f, 0x00, 0x80, 0x24, 0x0f, 0x00, 0x88, 0x24, 0x4f, 0x00, 0x08, 0x2d, 0x47, 0x00, 0x0c, 0x31, - 0x47, 0x04, 0x04, 0x3d, 0xff, 0xff, 0xff, 0x3f + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xcf, 0xff, 0xff, 0x3f, + 0xcf, 0xff, 0xff, 0x3f, 0xcf, 0x3f, 0xff, 0x3f, 0xcf, 0x1f, 0xff, 0x3f, 0xcf, 0x8f, 0xff, 0x3f, + 0xcf, 0xe7, 0xff, 0x3f, 0xcf, 0xf3, 0xff, 0x3f, 0xcf, 0x01, 0x00, 0x3c, 0xcf, 0x01, 0x00, 0x3c, + 0xcf, 0xf3, 0xff, 0x3f, 0xcf, 0xe7, 0xff, 0x3f, 0xcf, 0x8f, 0xff, 0x3f, 0xcf, 0x1f, 0xff, 0x3f, + 0xcf, 0x3f, 0xff, 0x3f, 0xcf, 0xff, 0xff, 0x3f, 0xcf, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f, + 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x3f }; /** @@ -208,11 +208,10 @@ void Draw_DialogBox(xpMenu Menu, uint16_t x,uint16_t y,uint16_t w,uint16_t h) { // 设置绘制边框的颜色，并绘制边框 OLED_SetDrawColor(Menu->bgColor^0x01); - OLED_DrawFrame(x, y, w, h); - + OLED_DrawBox(x, y, w, h); // 设置绘制背景的颜色，并绘制背景盒 OLED_SetDrawColor(Menu->bgColor); - OLED_DrawBox(x+1, y+1, w-2, h-2); + OLED_DrawBox(x+1, y+1, Menu->_dialogScale.now_wide-2, Menu->_dialogScale.now_high-2); // 设置边框高亮颜色（通常与背景色异或得到），用于强调边框 OLED_SetDrawColor(Menu->bgColor^0x01); @@ -245,7 +244,7 @@ bool DialogScale_Show(xpMenu Menu, int16_t x,int16_t y,int16_t Targrt_w,int16_t } // 当动画时间达到预设的对话框显示时间时，切换到应用运行状态 - if (Menu->_dialogScale.now_wide >= (Targrt_w - 5) && Menu->_dialogScale.now_high >= (Targrt_h - 5)) + if (Menu->_dialogScale.now_wide >= (Targrt_w - 2) && Menu->_dialogScale.now_high >= (Targrt_h - 2)) { Change_MenuState(Menu, APP_RUN); return true; @@ -723,7 +722,7 @@ static void Draw_ImagePage(xpMenu Menu, xpPage Page, xpItem now_item, xpItem nex OLED_DrawXBMP(temp_item->Animation_x, 12, IMG_WIDTH, IMG_HEIGHT, temp_item->image); temp_item = temp_item->nextItem; } - OLED_DrawStr(0, 60, next_item->itemName); + OLED_DrawStr(0, VER_RES - 3, next_item->itemName); OLED_SetDrawColor(2); // 设置特定的颜色，通常用于高亮显示 // 根据目标位置和当前位置，以及PID算法计算并更新当前选项的位置和宽度 Menu->_cursor.NowColumn = PID_Animation(Menu->_cursor.TargrtColumn, Menu->_cursor.NowColumn, &Menu->_animation.ImagePage_Cursor); @@ -794,7 +793,7 @@ static void Craete_MenuTree(xpMenu Menu) { AddPage("[HomePage]", &Home_Page, IMAGE); AddItem("[HomePage]", LOOP_FUNCTION, NULL, NULL, &HomeHead_Item, &Home_Page, NULL, Draw_Home); - AddItem(" +System", PARENTS, NULL, logo1, &System_Item, &Home_Page, &System_Page, NULL); + AddItem(" +System", PARENTS, NULL, logo_allArray[8], &System_Item, &Home_Page, &System_Page, NULL); AddPage("[System]", &System_Page, TEXT); AddItem("[System]", RETURN, NULL, NULL, &SystemHead_Item, &System_Page, &Home_Page, NULL); AddItem(" -MPU6050", LOOP_FUNCTION, NULL, NULL, &MPU6050_Item, &System_Page, NULL, Show_MPU6050); @@ -811,19 +810,19 @@ static void Craete_MenuTree(xpMenu Menu) AddItem("[Setting Image]", RETURN, NULL, NULL, &SettingImagePageHead_Item, &SettingImagePage_Page, &System_Page, NULL); AddItem(" -Image Space", DATA, &Menu->image_space, NULL, &ImageSpace_Item, &SettingImagePage_Page, NULL, Setting_Space); AddItem(" -Power", SWITCH, NULL, NULL, &Power_Item, &System_Page, NULL, PowerSave); - AddItem(" +Games", PARENTS, NULL, logo1, &Games_Item, &Home_Page, &Games_Page, NULL); + AddItem(" +Games", PARENTS, NULL, logo_allArray[4], &Games_Item, &Home_Page, &Games_Page, NULL); AddPage("[Games]", &Games_Page, IMAGE); AddItem("[Games]", RETURN, NULL, NULL, &GamesHead_Item, &Games_Page, &Home_Page, NULL); - AddItem(" -DinoGame", LOOP_FUNCTION, NULL, logo1, &Dino_Item, &Games_Page, NULL, DinoGame_Run); - AddItem(" -AirPlane", LOOP_FUNCTION, NULL, logo1, &AirPlane_Item, &Games_Page, NULL, AirPlane_Run); - AddItem(" +Setting Text", PARENTS, NULL, logo1, &SettingTextPage_Item, &Home_Page, &SettingTextPage_Page, NULL); + AddItem(" -DinoGame", LOOP_FUNCTION, NULL, logo_allArray[3], &Dino_Item, &Games_Page, NULL, DinoGame_Run); + AddItem(" -AirPlane", LOOP_FUNCTION, NULL, logo_allArray[0], &AirPlane_Item, &Games_Page, NULL, AirPlane_Run); + AddItem(" +Setting Text", PARENTS, NULL, logo_allArray[1], &SettingTextPage_Item, &Home_Page, &SettingTextPage_Page, NULL); AddPage("[Setting Text]", &SettingTextPage_Page, IMAGE); AddItem("[Setting Text]", RETURN, NULL, NULL, &SettingTextPageHead_Item, &SettingTextPage_Page, &Home_Page, NULL); - AddItem(" -Text Space", DATA, &Menu->text_space, logo1, &TextSpace_Item, &SettingTextPage_Page, NULL, Setting_Space); - AddItem(" -ShowLogo", LOOP_FUNCTION, NULL, logo1, &ShowLogo_Item, &Home_Page, NULL, Show_Log); - AddItem(" -Github", LOOP_FUNCTION, NULL, logo1, &Github_Item, &Home_Page, NULL, Show_GitHub); - AddItem(" -Bilibili", LOOP_FUNCTION, NULL, logo1, &Bilibili_Item, &Home_Page, NULL, Show_Bilibili); - AddItem(" -ReadME", LOOP_FUNCTION, NULL, logo1, &ReadME_Item, &Home_Page, NULL, Show_Bilibili); + AddItem(" -Text Space", DATA, &Menu->text_space, logo_allArray[9], &TextSpace_Item, &SettingTextPage_Page, NULL, Setting_Space); + AddItem(" -Image", LOOP_FUNCTION, NULL, logo_allArray[6], &Image_Item, &Home_Page, NULL, Show_Log); + AddItem(" -Github", LOOP_FUNCTION, NULL, logo_allArray[5], &Github_Item, &Home_Page, NULL, Show_GitHub); + AddItem(" -Bilibili", LOOP_FUNCTION, NULL, logo_allArray[7], &Bilibili_Item, &Home_Page, NULL, Show_Bilibili); + AddItem(" -ReadME", LOOP_FUNCTION, NULL, logo_allArray[9], &ReadME_Item, &Home_Page, NULL, Show_Bilibili); } /* 在此填入按键扫描程序 @@ -1047,9 +1046,9 @@ static void AnimationParam_Init(Animation *Ani) Ani->OptionPlace.ki = 0; Ani->OptionPlace.kd = 30; - Ani->Dialog_Scale.kp = 350; + Ani->Dialog_Scale.kp = 400; Ani->Dialog_Scale.ki = 0; - Ani->Dialog_Scale.kd = 100; + Ani->Dialog_Scale.kd = 0; Ani->TextPage_Cursor.kp = 500; Ani->TextPage_Cursor.ki = 100;