btl143/QDAC-firmware
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 添加实时图像显示菜单

Browse Source 
fix: 修改旋转编码器接口中部分拼写错误的问题
pref: 修改zf_common_font.c文件中>字符的图案,方便作为指针显示
This commit is contained in:
CaoWangrenbo
2024-01-04 22:07:13 +08:00
parent 59a29d4eac
commit 7efb0ee985
11 changed files with 148 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/by_fan_control.c
View File

@@ -12,11 +12,13 @@ void by_pwm_init(void)
void by_pwm_update_duty(uint32_t update_pwm_duty)
{
if (7000UL > update_pwm_duty) {
update_pwm_duty = 7000UL;
if (4000UL < update_pwm_duty) {
update_pwm_duty = 4000UL;
}
pwm_set_duty(TIM4_PWM_MAP1_CH1_D12, update_pwm_duty);
pwm_set_duty(TIM4_PWM_MAP1_CH2_D13, update_pwm_duty);
// pwm_set_duty(TIM4_PWM_MAP1_CH3_D14, update_pwm_duty);
// pwm_set_duty(TIM4_PWM_MAP1_CH4_D15, update_pwm_duty);
}
void by_pwm_power_duty(uint32_t power_pwm_duty_l, uint32_t power_pwm_duty_r)

17
app/by_pt_button.h
View File

@@ -1,17 +0,0 @@
#ifndef _BY_PT_BUTTON_H__
#define _BY_PT_BUTTON_H__
#include "stdio.h"
#include "ch32v30x.h"
#define POTATE_BUTTOM_PRESS 1
#define POTATE_BUTTOM_FOREWARD 2
#define POTATE_BUTTOM_BACKWARD 3
extern uint8_t potate_button;
extern void by_exit_init(void);
extern void by_gpio_init(void);
extern uint8_t by_get_statu(void);
extern void by_ips_show(void);
#endif

23
app/by_pt_button.c → app/by_rt_button.c
View File

@@ -1,7 +1,7 @@
#include "by_pt_button.h"
#include "by_rt_button.h"
#include "zf_common_headfile.h"
#include "by_imu.h"
uint8_t potate_button;
uint8_t rotate_button;
void by_gpio_init(void)
{
@@ -14,18 +14,23 @@ void by_exit_init(void)
exti_init(E11, EXTI_TRIGGER_FALLING);
}
uint8_t by_get_pb_statu(void)
/**
* @brief 查询旋钮状态 - 查询后状态归零
*
* @return uint8_t 当前旋钮状态
*/
uint8_t by_get_rb_status(void)
{
uint8_t temp_s = potate_button;
potate_button = 0;
uint8_t temp_s = rotate_button;
rotate_button = 0;
return temp_s;
}
void by_ips_show(void)
{
ips200_show_string(0, 0, "button statu:");
// ips200_show_uint(104, 0, by_get_pb_statu(), 1);
switch (by_get_pb_statu()) {
ips200_show_string(0, 0, "button status:");
// ips200_show_uint(104, 0, by_get_rb_status(), 1);
switch (by_get_rb_status()) {
case 1:
ips200_show_string(104, 0, "press");
break;
@@ -45,7 +50,7 @@ void by_ips_show(void)
ips200_show_float(46, 32, eulerAngle.pitch, 3, 2);
ips200_show_float(46, 48, eulerAngle.roll, 3, 2);
ips200_show_float(46, 64, eulerAngle.yaw, 3, 2);
// ips200_show_float(46 , 32, icm_data.gyro_x, 2, 2);
// ips200_show_float(46 , 32, icm_data.gyro_x, 2, 2);
// ips200_show_float(106, 32, icm_data.gyro_y, 2, 2);
// ips200_show_float(166, 32, icm_data.gyro_z, 2, 2);
ips200_show_float(46, 80, imu660ra_temperature, 2, 2);

17
app/by_rt_button.h Normal file
View File

@@ -0,0 +1,17 @@
#ifndef _BY_RT_BUTTON_H__
#define _BY_RT_BUTTON_H__
#include "stdio.h"
#include "ch32v30x.h"
#define ROTATE_BUTTON_PRESS 1
#define ROTATE_BUTTON_FORWARD 2
#define ROTATE_BUTTON_BACKWARD 3
extern uint8_t rotate_button;
extern void by_exit_init(void);
extern void by_gpio_init(void);
extern uint8_t by_get_rb_status(void);
extern void by_ips_show(void);
#endif

17
app/isr.c
View File

@@ -2,11 +2,11 @@
* CH32V307VCT6 Opensourec Library <20><><EFBFBD><EFBFBD>CH32V307VCT6 <20><>Դ<EFBFBD>⣩<EFBFBD><E2A3A9>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ڹٷ<DAB9> SDK <20>ӿڵĵ<DAB5><C4B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>
* Copyright (c) 2022 SEEKFREE <20><><EFBFBD>ɿƼ<C9BF>
*
* <20><><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>CH32V307VCT6 <20><>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>
* <20><><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD> CH32V307VCT6 <20><>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>
*
* CH32V307VCT6 <20><>Դ<EFBFBD><D4B4> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* <20><><EFBFBD><EFBFBD><EFBFBD>Ը<EFBFBD><D4B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᷢ<EFBFBD><E1B7A2><EFBFBD><EFBFBD> GPL<50><4C>GNU General Public License<73><65><EFBFBD><EFBFBD> GNUͨ<55>ù<EFBFBD><C3B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* <20><> GPL <20>ĵ<EFBFBD>3<EFBFBD>棨<EFBFBD><EFBFBD> GPL3.0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD>κκ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ汾<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>޸<EFBFBD><DEB8><EFBFBD>
* <20><><EFBFBD><EFBFBD><EFBFBD>Ը<EFBFBD><D4B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᷢ<EFBFBD><E1B7A2><EFBFBD><EFBFBD> GPL<50><4C>GNU General Public License<73><65><EFBFBD><EFBFBD> GNU ͨ<EFBFBD>ù<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* <20><> GPL <20>ĵ<EFBFBD> 3 <EFBFBD>棨<EFBFBD><EFBFBD> GPL3.0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD>κκ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ汾<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>޸<EFBFBD><DEB8><EFBFBD>
*
* <20><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4><EFBFBD>ķ<EFBFBD><C4B7><EFBFBD><EFBFBD><EFBFBD>ϣ<EFBFBD><CFA3><EFBFBD><EFBFBD><EFBFBD>ܷ<EFBFBD><DCB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κεı<CEB5>֤
* <20><><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ի<EFBFBD><D4BB>ʺ<EFBFBD><CABA>ض<EFBFBD><D8B6><EFBFBD>;<EFBFBD>ı<EFBFBD>֤
@@ -30,11 +30,12 @@
*
* <20>޸ļ<DEB8>¼
* <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>ע
* 2022-09-15 <20><>W first version
* 2022-09-15 <20><> W first version
********************************************************************************************************************/
#include "zf_common_headfile.h"
#include "by_pt_button.h"
#include "by_rt_button.h"
#include "by_imu.h"
void NMI_Handler(void) __attribute__((interrupt()));
void HardFault_Handler(void) __attribute__((interrupt()));
@@ -197,10 +198,10 @@ void EXTI9_5_IRQHandler(void)
if (SET == EXTI_GetITStatus(EXTI_Line9)) {
if (SET == gpio_get_level(E10)) {
potate_button = POTATE_BUTTOM_BACKWARD;
rotate_button = ROTATE_BUTTON_BACKWARD;
} else {
potate_button = POTATE_BUTTOM_FOREWARD;
rotate_button = ROTATE_BUTTON_FORWARD;
}
EXTI_ClearITPendingBit(EXTI_Line9);
}
@@ -220,7 +221,7 @@ void EXTI15_10_IRQHandler(void)
system_delay_us(200);
if (SET == !gpio_get_level(E11)) {
potate_button = POTATE_BUTTOM_PRESS;
rotate_button = ROTATE_BUTTON_PRESS;
}
EXTI_ClearITPendingBit(EXTI_Line11);
}

69
app/main.c
View File

@@ -1,29 +1,29 @@
/*********************************************************************************************************************
* CH32V307VCT6 Opensourec Library 即（CH32V307VCT6 开源库）是一个基于官方 SDK 接口的第三方开源库
* Copyright (c) 2022 SEEKFREE 逐飞科技
*
* 本文件是 CH32V307VCT6 开源库的一部分
*
* CH32V307VCT6 开源库 是免费软件
* 您可以根据自由软件基金会发布的 GPL（GNU General Public License，即 GNU 通用公共许可证）的条款
* 即 GPL 的第 3 版（即 GPL3.0）或（您选择的）任何后来的版本，重新发布和/或修改它
*
* 本开源库的发布是希望它能发挥作用，但并未对其作任何的保证
* 甚至没有隐含的适销性或适合特定用途的保证
* 更多细节请参见 GPL
*
* 您应该在收到本开源库的同时收到一份 GPL 的副本
* 如果没有，请参阅<https://www.gnu.org/licenses/>
*
* 额外注明：
* 本开源库使用 GPL3.0 开源许可证协议 以上许可申明为译文版本
* 许可申明英文版在 libraries/doc 文件夹下的 GPL3_permission_statement.txt 文件中
* 许可证副本在 libraries 文件夹下 即该文件夹下的 LICENSE 文件
* 欢迎各位使用并传播本程序 但修改内容时必须保留逐飞科技的版权声明（即本声明）
********************************************************************************************************************/
* CH32V307VCT6 Opensourec Library 即（CH32V307VCT6 开源库）是一个基于官方 SDK 接口的第三方开源库
* Copyright (c) 2022 SEEKFREE 逐飞科技
*
* 本文件是 CH32V307VCT6 开源库的一部分
*
* CH32V307VCT6 开源库 是免费软件
* 您可以根据自由软件基金会发布的 GPL（GNU General Public License，即 GNU 通用公共许可证）的条款
* 即 GPL 的第 3 版（即 GPL3.0）或（您选择的）任何后来的版本，重新发布和/或修改它
*
* 本开源库的发布是希望它能发挥作用，但并未对其作任何的保证
* 甚至没有隐含的适销性或适合特定用途的保证
* 更多细节请参见 GPL
*
* 您应该在收到本开源库的同时收到一份 GPL 的副本
* 如果没有，请参阅<https://www.gnu.org/licenses/>
*
* 额外注明：
* 本开源库使用 GPL3.0 开源许可证协议 以上许可申明为译文版本
* 许可申明英文版在 libraries/doc 文件夹下的 GPL3_permission_statement.txt 文件中
* 许可证副本在 libraries 文件夹下 即该文件夹下的 LICENSE 文件
* 欢迎各位使用并传播本程序 但修改内容时必须保留逐飞科技的版权声明（即本声明）
********************************************************************************************************************/
#include "zf_common_headfile.h"
#include "gl_headfile.h"
#include "by_pt_button.h"
#include "by_rt_button.h"
#include "by_fan_control.h"
#include "cw_servo.h"
#include "./page/cw_page.h"
@@ -71,6 +71,8 @@ enum track_type_e track_type = TRACK_RIGHT;
int frame_count = 0;
uint16_t pwm_cnt = 500;
void img_processing();
void get_corners();
@@ -79,19 +81,36 @@ int main(void)
clock_init(SYSTEM_CLOCK_120M);
debug_init();
mt9v03x_init();
pwm_init(TIM2_PWM_MAP0_CH1_A0, 50, 1000);
pwm_init(TIM2_PWM_MAP0_CH2_A1, 50, 1000);
ips200_init(IPS200_TYPE_SPI);
by_gpio_init();
by_exit_init();
by_pwm_init();
cw_servo_init();
// cw_servo_init();
// while (imu660ra_init())
// ;
Page_Init();
while (1) {
// ips200_show_uint(0, 0, pwm_cnt, 6);
// uint8_t temp_status = by_get_rb_status();
// if (2 == temp_status) {
// pwm_cnt += 50;
// } else if (3 == temp_status) {
// pwm_cnt -= 50;
// }
// pwm_cnt = (uint16_t)clip(pwm_cnt, 500, 1000);
// by_pwm_update_duty(4000);
// pwm_set_duty(TIM2_PWM_MAP0_CH1_A0, pwm_cnt);
// pwm_set_duty(TIM2_PWM_MAP0_CH2_A1, pwm_cnt);
// by_pwm_update_duty(pwm_cnt);
Page_Run();
if (mt9v03x_finish_flag) {
memcpy(mt9v03x_image_copy[0], mt9v03x_image[0], (sizeof(mt9v03x_image_copy) / sizeof(uint8_t)));
mt9v03x_finish_flag = 0;

53
app/page/cw_page.c
View File

@@ -1,9 +1,11 @@
#include "cw_page.h"
#include "by_rt_button.h"
PAGE_LIST pagelist[page_max];
static uint8_t page_busy = 0;
static int8_t now_page = page_menu;
static int8_t new_page = page_menu;
static int8_t now_page = page_menu;
static int8_t new_page = page_menu;
/**
* @brief 注册一个基本页面，包含一个初始化函数，循环函数，退出函数，事件函数
@@ -16,12 +18,13 @@ static int8_t new_page = page_menu;
* @retval 无
*/
void Page_Register(uint8_t pageID, char *pageText,
CallbackFunction_t setupCallback, CallbackFunction_t loopCallback,
CallbackFunction_t exitCallback, EventFunction_t eventCallback) {
pagelist[pageID].Text = pageText;
CallbackFunction_t setupCallback, CallbackFunction_t loopCallback,
CallbackFunction_t exitCallback, EventFunction_t eventCallback)
{
pagelist[pageID].Text = pageText;
pagelist[pageID].SetupCallback = setupCallback;
pagelist[pageID].LoopCallback = loopCallback;
pagelist[pageID].ExitCallback = exitCallback;
pagelist[pageID].LoopCallback = loopCallback;
pagelist[pageID].ExitCallback = exitCallback;
pagelist[pageID].EventCallback = eventCallback;
}
@@ -30,7 +33,8 @@ void Page_Register(uint8_t pageID, char *pageText,
* @param event: 事件编号
* @retval 无
*/
void Page_EventTransmit(unsigned char event) {
void Page_EventTransmit(unsigned char event)
{
/*将事件传递到当前页面*/
if (pagelist[now_page].EventCallback != 0)
pagelist[now_page].EventCallback(event);
@@ -41,7 +45,8 @@ void Page_EventTransmit(unsigned char event) {
* @param pageID：页面号
* @retval 1：成功 0：失败
*/
void Page_Shift(unsigned char pageID) {
void Page_Shift(unsigned char pageID)
{
if (page_busy == 0) {
new_page = pageID;
}
@@ -51,7 +56,8 @@ void Page_Shift(unsigned char pageID) {
* @brief 关闭当前页面
*
*/
void Page_CloseCurrentPage() {
void Page_CloseCurrentPage()
{
pagelist[now_page].ExitCallback();
}
@@ -59,16 +65,18 @@ void Page_CloseCurrentPage() {
* @brief 打开当前页面
*
*/
void Page_OpenCurrentPage() {
void Page_OpenCurrentPage()
{
pagelist[now_page].SetupCallback();
}
/**
* @brief 获取页面状态
*
* @return uint8_t 页面忙返回1 空闲返回0
* @return uint8_t 页面忙返回 1 空闲返回 0
*/
uint8_t Page_GetStatus(void) {
uint8_t Page_GetStatus(void)
{
if (page_busy)
return 1;
else
@@ -79,18 +87,23 @@ uint8_t Page_GetStatus(void) {
* @brief 页面运行函数
*
*/
void Page_Run(void) {
void Page_Run(void)
{
uint8_t temp_status = by_get_rb_status(); // 轮询旋钮状态
if(temp_status){
pagelist[now_page].EventCallback(temp_status);
}
if (now_page != new_page) {
if (new_page >= page_max && new_page < page_menu) {
new_page = page_menu;
}
//执行当前页面退出回调函数
// 执行当前页面退出回调函数
if ((pagelist[now_page].ExitCallback != 0)) {
pagelist[now_page].ExitCallback();
}
//执行新页面构造回调函数
// 执行新页面构造回调函数
if (pagelist[new_page].SetupCallback != 0) {
pagelist[new_page].SetupCallback();
}
@@ -99,7 +112,7 @@ void Page_Run(void) {
}
if (page_busy == 0) {
//执行循环函数
// 执行循环函数
pagelist[now_page].LoopCallback();
}
}
@@ -108,13 +121,15 @@ void Page_Run(void) {
* @brief 页面初始化（注册，构建） //ATTENTION 在此处添加新加入的页面
*
*/
void Page_Init(void) {
void Page_Init(void)
{
PAGE_REG(page_menu);
PAGE_REG(page_rtcam);
// PAGE_REG(page_argv);
// PAGE_REG(page_sys);
// PAGE_REG(page_run);
Page_Shift(page_menu);
pagelist[now_page].SetupCallback(); //先构建一遍
pagelist[now_page].SetupCallback(); // 先构建一遍
}

9
app/page/cw_page.h
View File

@@ -13,10 +13,13 @@
#include "zf_common_headfile.h"
#include "by_rt_button.h"
enum PageID {
PAGE_NULL = -1,
//......
page_menu,
page_rtcam,
// page_argv,
// page_sys,
// page_run,
@@ -25,9 +28,9 @@ enum PageID {
};
typedef enum page_event{
page_event_forward,
page_event_backward,
page_event_press
page_event_forward = ROTATE_BUTTON_FORWARD,
page_event_backward = ROTATE_BUTTON_BACKWARD,
page_event_press = ROTATE_BUTTON_PRESS
} page_event;
typedef void (*CallbackFunction_t)(void);

7
app/page/cw_page_menu.c
View File

@@ -7,8 +7,8 @@
static char Text[] = "Menu";
static int8_t Curser = 1; // 定义光标位置
static int8_t Curser_Last = 1; // 定义光标位置
static int8_t Curser = LINE_HEAD; // 定义光标位置
static int8_t Curser_Last = LINE_HEAD; // 定义光标位置
static void Print_Menu_p(void);
/***************************************************************************************
*
@@ -44,7 +44,6 @@ static void Exit()
*/
static void Loop()
{
Show_Marked_Image();
}
/**
@@ -101,7 +100,7 @@ static void Print_Menu_p(void)
// SCREEN_showstr_style(5 * 8, 0, RED, WHITE, "#### MAIN MENU ####");
ips200_show_string(0, 0, Text);
for (uint8_t i = page_menu + 1; i < page_max; i++) {
ips200_show_string(8, i, pagelist[i].Text);
ips200_show_string(10, i * 16, pagelist[i].Text);
// SCREEN_showstr(8, i, pagelist[i].Text);
}
}

15
app/page/cw_page_rtcam.c
View File

@@ -2,13 +2,13 @@
#include "cw_page_ui_widget.h"
#include "cw_page.h"
#define LINE_HEAD 1
#define LINE_END 7
#define LINE_HEAD 11
#define LINE_END 18
static char Text[] = "RealTime Image";
static int8_t Curser = 1; // 定义光标位置
static int8_t Curser_Last = 1; // 定义光标位置
static int8_t Curser = LINE_HEAD; // 定义光标位置
static int8_t Curser_Last = LINE_HEAD; // 定义光标位置
static void Print_Menu_p(void);
/***************************************************************************************
*
@@ -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);
}
@@ -44,6 +44,7 @@ static void Exit()
*/
static void Loop()
{
Show_Marked_Image();
}
/**
@@ -99,8 +100,4 @@ static void Print_Menu_p(void)
{
// SCREEN_showstr_style(5 * 8, 0, RED, WHITE, "#### MAIN MENU ####");
ips200_show_string(0, 0, Text);
for (uint8_t i = page_menu + 1; i < page_max; i++) {
ips200_show_string(8, i, pagelist[i].Text);
// SCREEN_showstr(8, i, pagelist[i].Text);
}
}

21
libraries/zf_common/zf_common_font.c
View File

@@ -2,11 +2,11 @@
* CH32V307VCT6 Opensourec Library <20><><EFBFBD><EFBFBD>CH32V307VCT6 <20><>Դ<EFBFBD>⣩<EFBFBD><E2A3A9>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ڹٷ<DAB9> SDK <20>ӿڵĵ<DAB5><C4B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4>
* Copyright (c) 2022 SEEKFREE <20><><EFBFBD>ɿƼ<C9BF>
*
* <20><><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>CH32V307VCT6 <20><>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>
* <20><><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD> CH32V307VCT6 <20><>Դ<EFBFBD><D4B4><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD>
*
* CH32V307VCT6 <20><>Դ<EFBFBD><D4B4> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* <20><><EFBFBD><EFBFBD><EFBFBD>Ը<EFBFBD><D4B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᷢ<EFBFBD><E1B7A2><EFBFBD><EFBFBD> GPL<50><4C>GNU General Public License<73><65><EFBFBD><EFBFBD> GNUͨ<55>ù<EFBFBD><C3B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><D6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* <20><> GPL <20>ĵ<EFBFBD>3<EFBFBD>棨<EFBFBD><EFBFBD> GPL3.0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD>κκ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ汾<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>޸<EFBFBD><DEB8><EFBFBD>
* <20><><EFBFBD><EFBFBD><EFBFBD>Ը<EFBFBD><D4B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᷢ<EFBFBD><E1B7A2><EFBFBD><EFBFBD> GPL<50><4C>GNU General Public License<73><65><EFBFBD><EFBFBD> GNU ͨ<EFBFBD>ù<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֤<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
* <20><> GPL <20>ĵ<EFBFBD> 3 <EFBFBD>棨<EFBFBD><EFBFBD> GPL3.0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѡ<EFBFBD><EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD>κκ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>İ汾<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD>޸<EFBFBD><DEB8><EFBFBD>
*
* <20><><EFBFBD><EFBFBD>Դ<EFBFBD><D4B4><EFBFBD>ķ<EFBFBD><C4B7><EFBFBD><EFBFBD><EFBFBD>ϣ<EFBFBD><CFA3><EFBFBD><EFBFBD><EFBFBD>ܷ<EFBFBD><DCB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κεı<CEB5>֤
* <20><><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ի<EFBFBD><D4BB>ʺ<EFBFBD><CABA>ض<EFBFBD><D8B6><EFBFBD>;<EFBFBD>ı<EFBFBD>֤
@@ -30,7 +30,7 @@
*
* <20>޸ļ<DEB8>¼
* <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>ע
* 2022-09-15 <20><>W first version
* 2022-09-15 <20><> W first version
********************************************************************************************************************/
#include "zf_common_font.h"
@@ -93,7 +93,8 @@ const uint8 ascii_font_8x16[][16]=
{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x60,0x00,0x00,0x00,0x00}, // ; 27
{0x00,0x00,0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x01,0x02,0x04,0x08,0x10,0x20,0x00}, // < 28
{0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00}, // = 29
{0x00,0x08,0x10,0x20,0x40,0x80,0x00,0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,0x00}, // > 30
// {0x00,0x08,0x10,0x20,0x40,0x80,0x00,0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,0x00}, // > 30
{0xFE,0xFC,0xF8,0xF0,0xE0,0xC0,0x80,0x00,0x7F,0x3F,0x1F,0x0F,0x07,0x03,0x01,0x00}, // > 30
{0x00,0x70,0x48,0x08,0x08,0x08,0xF0,0x00,0x00,0x00,0x00,0x30,0x36,0x01,0x00,0x00}, // ? 31
{0xC0,0x30,0xC8,0x28,0xE8,0x10,0xE0,0x00,0x07,0x18,0x27,0x24,0x23,0x14,0x0B,0x00}, // @ 32
{0x00,0x00,0xC0,0x38,0xE0,0x00,0x00,0x00,0x20,0x3C,0x23,0x02,0x02,0x27,0x38,0x20}, // A 33
@@ -274,7 +275,7 @@ const uint8 ascii_font_6x8[][6] =
};
//-------------------------------------------------------------------------------------------------------------------
// ʹ<><CAB9>PCtoLCD2002<30><32><EFBFBD><EFBFBD>ȡģ
// ʹ<><CAB9> PCtoLCD2002 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡģ
// <20><><EFBFBD>롢<EFBFBD><EBA1A2><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD>˳<EFBFBD><CBB3> 16*16
//-------------------------------------------------------------------------------------------------------------------
const uint8 chinese_test[8][16] =
@@ -290,7 +291,7 @@ const uint8 chinese_test[8][16] =
};
//-------------------------------------------------------------------------------------------------------------------
// ʹ<><CAB9>PCtoLCD2002<30><32><EFBFBD><EFBFBD>ȡģ
// ʹ<><CAB9> PCtoLCD2002 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡģ
// <20><><EFBFBD>롢<EFBFBD><EBA1A2><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 16*16
//-------------------------------------------------------------------------------------------------------------------
const uint8 oled_16x16_chinese[][16]=
@@ -305,10 +306,10 @@ const uint8 oled_16x16_chinese[][16]=
{0x04,0x44,0x82,0x7F,0x01,0x80,0x80,0x40,0x43,0x2C,0x10,0x28,0x46,0x81,0x80,0x00},/*"<22><>",3*/
};
//16λBMP 240*80 <20><><EFBFBD>ɿƼ<C9BF>logoͼ<6F><CDBC>ȡģ<C8A1><C4A3><EFBFBD><EFBFBD>
//Image2LCDȡģѡ<C4A3><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//16 λ BMP 240*80 <20><><EFBFBD>ɿƼ<C9BF> logo ͼ<EFBFBD><EFBFBD>ȡģ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//Image2LCD ȡģѡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//ˮƽɨ<C6BD><C9A8>
//16λ
//16 λ
//240*80
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͼ<EFBFBD><CDBC>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD>
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>