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) void by_pwm_update_duty(uint32_t update_pwm_duty)
{ {
if (7000UL > update_pwm_duty) { if (4000UL < update_pwm_duty) {
update_pwm_duty = 7000UL; update_pwm_duty = 4000UL;
} }
pwm_set_duty(TIM4_PWM_MAP1_CH1_D12, update_pwm_duty); 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_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) 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

21
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 "zf_common_headfile.h"
#include "by_imu.h" #include "by_imu.h"
uint8_t potate_button; uint8_t rotate_button;
void by_gpio_init(void) void by_gpio_init(void)
{ {
@@ -14,18 +14,23 @@ void by_exit_init(void)
exti_init(E11, EXTI_TRIGGER_FALLING); 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; uint8_t temp_s = rotate_button;
potate_button = 0; rotate_button = 0;
return temp_s; return temp_s;
} }
void by_ips_show(void) void by_ips_show(void)
{ {
ips200_show_string(0, 0, "button statu:"); ips200_show_string(0, 0, "button status:");
// ips200_show_uint(104, 0, by_get_pb_statu(), 1); // ips200_show_uint(104, 0, by_get_rb_status(), 1);
switch (by_get_pb_statu()) { switch (by_get_rb_status()) {
case 1: case 1:
ips200_show_string(104, 0, "press"); ips200_show_string(104, 0, "press");
break; break;

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

9
app/isr.c
View File

@@ -34,7 +34,8 @@
********************************************************************************************************************/ ********************************************************************************************************************/
#include "zf_common_headfile.h" #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 NMI_Handler(void) __attribute__((interrupt()));
void HardFault_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 == EXTI_GetITStatus(EXTI_Line9)) {
if (SET == gpio_get_level(E10)) { if (SET == gpio_get_level(E10)) {
potate_button = POTATE_BUTTOM_BACKWARD; rotate_button = ROTATE_BUTTON_BACKWARD;
} else { } else {
potate_button = POTATE_BUTTOM_FOREWARD; rotate_button = ROTATE_BUTTON_FORWARD;
} }
EXTI_ClearITPendingBit(EXTI_Line9); EXTI_ClearITPendingBit(EXTI_Line9);
} }
@@ -220,7 +221,7 @@ void EXTI15_10_IRQHandler(void)
system_delay_us(200); system_delay_us(200);
if (SET == !gpio_get_level(E11)) { if (SET == !gpio_get_level(E11)) {
potate_button = POTATE_BUTTOM_PRESS; rotate_button = ROTATE_BUTTON_PRESS;
} }
EXTI_ClearITPendingBit(EXTI_Line11); EXTI_ClearITPendingBit(EXTI_Line11);
} }

23
app/main.c
View File

@@ -23,7 +23,7 @@
********************************************************************************************************************/ ********************************************************************************************************************/
#include "zf_common_headfile.h" #include "zf_common_headfile.h"
#include "gl_headfile.h" #include "gl_headfile.h"
#include "by_pt_button.h" #include "by_rt_button.h"
#include "by_fan_control.h" #include "by_fan_control.h"
#include "cw_servo.h" #include "cw_servo.h"
#include "./page/cw_page.h" #include "./page/cw_page.h"
@@ -71,6 +71,8 @@ enum track_type_e track_type = TRACK_RIGHT;
int frame_count = 0; int frame_count = 0;
uint16_t pwm_cnt = 500;
void img_processing(); void img_processing();
void get_corners(); void get_corners();
@@ -79,17 +81,34 @@ int main(void)
clock_init(SYSTEM_CLOCK_120M); clock_init(SYSTEM_CLOCK_120M);
debug_init(); debug_init();
mt9v03x_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); ips200_init(IPS200_TYPE_SPI);
by_gpio_init(); by_gpio_init();
by_exit_init(); by_exit_init();
by_pwm_init(); by_pwm_init();
cw_servo_init(); // cw_servo_init();
// while (imu660ra_init()) // while (imu660ra_init())
// ; // ;
Page_Init(); Page_Init();
while (1) { 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(); Page_Run();
if (mt9v03x_finish_flag) { if (mt9v03x_finish_flag) {

31
app/page/cw_page.c
View File

@@ -1,5 +1,7 @@
#include "cw_page.h" #include "cw_page.h"
#include "by_rt_button.h"
PAGE_LIST pagelist[page_max]; PAGE_LIST pagelist[page_max];
static uint8_t page_busy = 0; static uint8_t page_busy = 0;
static int8_t now_page = page_menu; static int8_t now_page = page_menu;
@@ -17,7 +19,8 @@ static int8_t new_page = page_menu;
*/ */
void Page_Register(uint8_t pageID, char *pageText, void Page_Register(uint8_t pageID, char *pageText,
CallbackFunction_t setupCallback, CallbackFunction_t loopCallback, CallbackFunction_t setupCallback, CallbackFunction_t loopCallback,
CallbackFunction_t exitCallback, EventFunction_t eventCallback) { CallbackFunction_t exitCallback, EventFunction_t eventCallback)
{
pagelist[pageID].Text = pageText; pagelist[pageID].Text = pageText;
pagelist[pageID].SetupCallback = setupCallback; pagelist[pageID].SetupCallback = setupCallback;
pagelist[pageID].LoopCallback = loopCallback; pagelist[pageID].LoopCallback = loopCallback;
@@ -30,7 +33,8 @@ void Page_Register(uint8_t pageID, char *pageText,
* @param event: 事件编号 * @param event: 事件编号
* @retval 无 * @retval 无
*/ */
void Page_EventTransmit(unsigned char event) { void Page_EventTransmit(unsigned char event)
{
/*将事件传递到当前页面*/ /*将事件传递到当前页面*/
if (pagelist[now_page].EventCallback != 0) if (pagelist[now_page].EventCallback != 0)
pagelist[now_page].EventCallback(event); pagelist[now_page].EventCallback(event);
@@ -41,7 +45,8 @@ void Page_EventTransmit(unsigned char event) {
* @param pageID：页面号 * @param pageID：页面号
* @retval 1：成功 0：失败 * @retval 1：成功 0：失败
*/ */
void Page_Shift(unsigned char pageID) { void Page_Shift(unsigned char pageID)
{
if (page_busy == 0) { if (page_busy == 0) {
new_page = pageID; new_page = pageID;
} }
@@ -51,7 +56,8 @@ void Page_Shift(unsigned char pageID) {
* @brief 关闭当前页面 * @brief 关闭当前页面
* *
*/ */
void Page_CloseCurrentPage() { void Page_CloseCurrentPage()
{
pagelist[now_page].ExitCallback(); pagelist[now_page].ExitCallback();
} }
@@ -59,7 +65,8 @@ void Page_CloseCurrentPage() {
* @brief 打开当前页面 * @brief 打开当前页面
* *
*/ */
void Page_OpenCurrentPage() { void Page_OpenCurrentPage()
{
pagelist[now_page].SetupCallback(); pagelist[now_page].SetupCallback();
} }
@@ -68,7 +75,8 @@ void Page_OpenCurrentPage() {
* *
* @return uint8_t 页面忙返回 1 空闲返回 0 * @return uint8_t 页面忙返回 1 空闲返回 0
*/ */
uint8_t Page_GetStatus(void) { uint8_t Page_GetStatus(void)
{
if (page_busy) if (page_busy)
return 1; return 1;
else else
@@ -79,7 +87,12 @@ uint8_t Page_GetStatus(void) {
* @brief 页面运行函数 * @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 (now_page != new_page) {
if (new_page >= page_max && new_page < page_menu) { if (new_page >= page_max && new_page < page_menu) {
@@ -108,8 +121,10 @@ void Page_Run(void) {
* @brief 页面初始化（注册，构建） //ATTENTION 在此处添加新加入的页面 * @brief 页面初始化（注册，构建） //ATTENTION 在此处添加新加入的页面
* *
*/ */
void Page_Init(void) { void Page_Init(void)
{
PAGE_REG(page_menu); PAGE_REG(page_menu);
PAGE_REG(page_rtcam);
// PAGE_REG(page_argv); // PAGE_REG(page_argv);
// PAGE_REG(page_sys); // PAGE_REG(page_sys);
// PAGE_REG(page_run); // PAGE_REG(page_run);

9
app/page/cw_page.h
View File

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

7
app/page/cw_page_menu.c
View File

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

3
libraries/zf_common/zf_common_font.c
View File

@@ -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,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 {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 {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 {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 {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 {0x00,0x00,0xC0,0x38,0xE0,0x00,0x00,0x00,0x20,0x3C,0x23,0x02,0x02,0x27,0x38,0x20}, // A 33