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

Merge pull request '日常更新 2401062038' (#12) from define/firmware_violet_zf:master into master

Browse Source 
Reviewed-on: http://git.isthmus.tk:441/btl143/firmware_violet_zf/pulls/12
This commit is contained in:
CaoWangrenbo
2024-01-06 20:39:51 +08:00
parent 7d7a939630 21fa49966f
commit 6bb5b9eaad
18 changed files with 277 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/by_rt_button.h
View File

@@ -4,6 +4,9 @@
#include "stdio.h"
#include "ch32v30x.h"
#define LONG_PRESS_THRESHOLD_MS (300ULL)
#define LONG_PRESS_THRESHOLD_TICK (LONG_PRESS_THRESHOLD_MS * 18000ULL)
typedef enum rotate_button_event {
rotate_button_press_short = 1,
rotate_button_press_long = 2,

17
app/cw_servo.c
View File

@@ -1,17 +0,0 @@
#include "zf_common_headfile.h"
#include "cw_servo.h"
void cw_servo_init(void)
{
pwm_init(SERVO_L_PWM_CHANNEL, 50, 1000);
pwm_init(SERVO_R_PWM_CHANNEL, 50, 1000);
}
void cw_servo_set_angle(float servo_l_angle, float servo_r_angle)
{
uint32_t servo_l_duty_s = (uint32_t)(servo_l_angle * SERVO_L_DUTY_PER_ANGLE);
uint32_t servo_r_duty_s = (uint32_t)(servo_r_angle * SERVO_R_DUTY_PER_ANGLE);
pwm_set_duty(SERVO_L_PWM_CHANNEL, servo_l_duty_s);
pwm_set_duty(SERVO_R_PWM_CHANNEL, servo_r_duty_s);
}

20
app/cw_servo.h
View File

@@ -1,20 +0,0 @@
#ifndef _CW_SERVO_H__
#define _CW_SERVO_H__
#include "zf_common_headfile.h"
#define SERVO_L_PWM_CHANNEL TIM2_PWM_MAP0_CH1_A0
#define SERVO_R_PWM_CHANNEL TIM2_PWM_MAP0_CH2_A1
#define SERVO_MAX_ANGLE_RANGE (90.0F)
#define SERVO_L_DUTY_MAX (1100.0F)
#define SERVO_L_DUTY_MIN (900.0F)
#define SERVO_R_DUTY_MAX (1100.0F)
#define SERVO_R_DUTY_MIN (900.0F)
#define SERVO_L_DUTY_PER_ANGLE ((SERVO_L_DUTY_MAX - SERVO_L_DUTY_MIN) / SERVO_MAX_ANGLE_RANGE)
#define SERVO_R_DUTY_PER_ANGLE ((SERVO_R_DUTY_MAX - SERVO_R_DUTY_MIN) / SERVO_MAX_ANGLE_RANGE)
extern void cw_servo_init(void);
extern void cw_servo_set_angle(float servo_l_angle, float servo_r_angle);
#endif

10
app/gl_common.h
View File

@@ -1,8 +1,6 @@
#ifndef COMMON_H_
#define COMMON_H_
#define IMAGE_H (MT9V03X_H)
#define IMAGE_W (MT9V03X_W)
#define BEGINH_L (61)
@@ -16,9 +14,9 @@
#define FILTER_KERNELSIZE (7) // 滤波核大小
#define SELFADAPT_OFFSET (8) // 适应性块大小
#define PIXPERMETER (56)
#define RESAMPLEDIST (0.02)
#define ANGLEDIST (0.2)
#define ROADWIDTH (0.45)
#define RESAMPLEDIST (0.02f)
#define ANGLEDIST (0.2f)
#define ROADWIDTH (0.45f)
#define FRAMENONE (1)
#define FRAMETOLEFT (5)
#define FRAMETORIGHT (5)
@@ -27,6 +25,4 @@ int32_t limit(int32_t x, int32_t low, int32_t up);
int clip(int x, int low, int up);
float fclip(float x, float low, float up);
#endif /* COMMON_H_ */

62
app/gl_data.c Normal file
View File

@@ -0,0 +1,62 @@
#include "gl_data.h"
uint8_t (*Img_Gray)[MT9V03X_W];
int32_t pts_left[PT_MAXLEN][2];
int32_t pts_right[PT_MAXLEN][2];
int32_t pts_left_count;
int32_t pts_right_count;
float pts_inv_l[PT_MAXLEN][2];
float pts_inv_r[PT_MAXLEN][2];
int32_t pts_inv_l_count;
int32_t pts_inv_r_count;
float pts_filter_l[PT_MAXLEN][2];
float pts_filter_r[PT_MAXLEN][2];
int32_t pts_filter_l_count;
int32_t pts_filter_r_count;
float pts_resample_left[PT_MAXLEN][2];
float pts_resample_right[PT_MAXLEN][2];
int32_t pts_resample_left_count;
int32_t pts_resample_right_count;
float mid_left[PT_MAXLEN][2];
float mid_right[PT_MAXLEN][2];
int32_t mid_left_count;
int32_t mid_right_count;
float angle_new_left[PT_MAXLEN];
float angle_new_right[PT_MAXLEN];
int angle_new_left_num;
int angle_new_right_num;
uint8_t mt9v03x_image_copy[MT9V03X_H][MT9V03X_W];
float angle_left[PT_MAXLEN];
float angle_right[PT_MAXLEN];
int angle_left_num;
int angle_right_num;
int Lpt0_rpts0s_id;
int Lpt1_rpts1s_id;
bool Lpt0_found;
bool Lpt1_found;
int Lpt1[2];
int Lpt0[2];
int Lpt_in0_rpts0s_id;
int Lpt_in1_rpts1s_id;
bool Lpt_in0_found;
bool Lpt_in1_found;
int Lpt_in1[2];
int Lpt_in0[2];
bool is_straight0;
bool is_straight1;
bool is_turn0;
bool is_turn1;
float rptsn[PT_MAXLEN][2];
int32_t rptsn_num;
float aim_distance;
track_type_e track_type = TRACK_RIGHT;

74
app/gl_data.h Normal file
View File

@@ -0,0 +1,74 @@
#pragma once
#ifndef _GL_DATA_H
#define _GL_DATA_H
#include "gl_headfile.h"
typedef enum track_type_e {
TRACK_LEFT = 0,
TRACK_RIGHT,
} track_type_e;
extern uint8_t (*Img_Gray)[MT9V03X_W];
extern int32_t pts_left[PT_MAXLEN][2];
extern int32_t pts_right[PT_MAXLEN][2];
extern int32_t pts_left_count;
extern int32_t pts_right_count;
extern float pts_inv_l[PT_MAXLEN][2];
extern float pts_inv_r[PT_MAXLEN][2];
extern int32_t pts_inv_l_count;
extern int32_t pts_inv_r_count;
extern float pts_filter_l[PT_MAXLEN][2];
extern float pts_filter_r[PT_MAXLEN][2];
extern int32_t pts_filter_l_count;
extern int32_t pts_filter_r_count;
extern float pts_resample_left[PT_MAXLEN][2];
extern float pts_resample_right[PT_MAXLEN][2];
extern int32_t pts_resample_left_count;
extern int32_t pts_resample_right_count;
extern float mid_left[PT_MAXLEN][2];
extern float mid_right[PT_MAXLEN][2];
extern int32_t mid_left_count;
extern int32_t mid_right_count;
extern float angle_new_left[PT_MAXLEN];
extern float angle_new_right[PT_MAXLEN];
extern int angle_new_left_num;
extern int angle_new_right_num;
extern uint8_t mt9v03x_image_copy[MT9V03X_H][MT9V03X_W];
extern float angle_left[PT_MAXLEN];
extern float angle_right[PT_MAXLEN];
extern int angle_left_num;
extern int angle_right_num;
extern int Lpt0_rpts0s_id;
extern int Lpt1_rpts1s_id;
extern bool Lpt0_found;
extern bool Lpt1_found;
extern int Lpt1[2];
extern int Lpt0[2];
extern int Lpt_in0_rpts0s_id;
extern int Lpt_in1_rpts1s_id;
extern bool Lpt_in0_found;
extern bool Lpt_in1_found;
extern int Lpt_in1[2];
extern int Lpt_in0[2];
extern bool is_straight0;
extern bool is_straight1;
extern bool is_turn0;
extern bool is_turn1;
extern float rptsn[PT_MAXLEN][2];
extern int32_t rptsn_num;
extern float aim_distance;
extern track_type_e track_type;
#endif

5
app/gl_headfile.h
View File

@@ -1,8 +1,6 @@
#ifndef GL_HEADFILE
#define GL_HEADFILE
#include "gl_state.h"
#include "gl_img_process.h"
#include "gl_common.h"
@@ -14,8 +12,7 @@
#include "gl_tracking.h"
#include "gl_circle.h"
#include "gl_cross.h"
#include "gl_data.h"
#include "math.h"
#endif /* STATE_H_ */

26
app/gl_state.h
View File

@@ -3,20 +3,26 @@
enum state_type_e {
COMMON_STATE = 0,
CROSS_STATE,HALF_STATE,
CIRCLE_IN_STATE,CIRCLE_BEGIN_STATE,
CIRCLE_RUNNING_STATE,CIRCLE_OUT_STATE,
TURN_STATE,STRAIGHT_STATE,
BREAK_STATE,BAR_STATE,
RAMP_STATE,GARAGE_OUT_STATE,
GARAGE_IN_STATE,GARAGE_STOP_STATE,
CROSS_STATE,
HALF_STATE,
CIRCLE_IN_STATE,
CIRCLE_BEGIN_STATE,
CIRCLE_RUNNING_STATE,
CIRCLE_OUT_STATE,
TURN_STATE,
STRAIGHT_STATE,
BREAK_STATE,
BAR_STATE,
RAMP_STATE,
GARAGE_OUT_STATE,
GARAGE_IN_STATE,
GARAGE_STOP_STATE,
GARAGE_PASS_STATE,
};
extern enum state_type_e state_type;
#define CROSS_AIM (0.49)
#define COMMON_AIM (0.31)
#define CROSS_AIM (0.49f)
#define COMMON_AIM (0.31f)
#endif /* STATE_H_ */

10
app/isr.c
View File

@@ -219,16 +219,11 @@ void EXTI15_10_IRQHandler(void)
}
if (SET == EXTI_GetITStatus(EXTI_Line11)) {
static uint64_t time_via = 0;
if (RESET == gpio_get_level(E11)) {
system_delay_us(200);
system_delay_ms(10);
if (RESET == gpio_get_level(E11)) {
time_via = system_get_tick();
}
EXTI_ClearITPendingBit(EXTI_Line11);
} else {
system_delay_us(200);
if (SET == gpio_get_level(E11)) {
} else if (SET == gpio_get_level(E11)) {
time_via = system_get_tick() - time_via;
if (time_via > LONG_PRESS_THRESHOLD_TICK) {
rotate_button = rotate_button_press_long;
@@ -236,7 +231,6 @@ void EXTI15_10_IRQHandler(void)
rotate_button = rotate_button_press_short;
}
time_via = 0;
}
EXTI_ClearITPendingBit(EXTI_Line11);
}
if (SET == EXTI_GetITStatus(EXTI_Line12)) {

67
app/main.c
View File

@@ -25,94 +25,29 @@
#include "gl_headfile.h"
#include "by_rt_button.h"
#include "by_fan_control.h"
#include "cw_servo.h"
#include "./page/cw_page.h"
uint8_t (*Img_Gray)[MT9V03X_W];
// uint8_t *mt9v03x_image_copy[0];
int32_t pts_left[PT_MAXLEN][2];
int32_t pts_right[PT_MAXLEN][2];
int32_t pts_left_count, pts_right_count;
float pts_inv_l[PT_MAXLEN][2], pts_inv_r[PT_MAXLEN][2];
int32_t pts_inv_l_count, pts_inv_r_count;
float pts_filter_l[PT_MAXLEN][2], pts_filter_r[PT_MAXLEN][2];
int32_t pts_filter_l_count, pts_filter_r_count;
float pts_resample_left[PT_MAXLEN][2], pts_resample_right[PT_MAXLEN][2];
int32_t pts_resample_left_count, pts_resample_right_count;
float mid_left[PT_MAXLEN][2], mid_right[PT_MAXLEN][2];
int32_t mid_left_count, mid_right_count;
float angle_new_left[PT_MAXLEN];
float angle_new_right[PT_MAXLEN];
int angle_new_left_num, angle_new_right_num;
uint8_t mt9v03x_image_copy[MT9V03X_H][MT9V03X_W];
float angle_left[PT_MAXLEN];
float angle_right[PT_MAXLEN];
int angle_left_num, angle_right_num;
int Lpt0_rpts0s_id, Lpt1_rpts1s_id;
bool Lpt0_found, Lpt1_found;
int Lpt1[2], Lpt0[2];
int Lpt_in0_rpts0s_id, Lpt_in1_rpts1s_id;
bool Lpt_in0_found, Lpt_in1_found;
int Lpt_in1[2], Lpt_in0[2];
bool is_straight0, is_straight1;
bool is_turn0, is_turn1;
float rptsn[PT_MAXLEN][2];
int rptsn_num;
float aim_distance;
enum track_type_e track_type = TRACK_RIGHT;
int frame_count = 0;
uint16_t pwm_cnt = 500;
void img_processing();
void get_corners();
int main(void)
{
clock_init(SYSTEM_CLOCK_120M);
system_delay_init();
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();
// 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) {
// 该操作消耗大概 1970 个 tick，折合约 110us
memcpy(mt9v03x_image_copy[0], mt9v03x_image[0], (sizeof(mt9v03x_image_copy) / sizeof(uint8_t)));
mt9v03x_finish_flag = 0;

45
app/main.h
View File

@@ -2,50 +2,5 @@
#define MAIN_H
#include "zf_common_headfile.h"
#include "gl_common.h"
// extern uint8 *mt9v03x_image_copy[0];
extern int32_t pts_left[PT_MAXLEN][2], pts_right[PT_MAXLEN][2]; // 0:H,1:W
extern int32_t pts_left_count, pts_right_count;
extern float pts_inv_l[PT_MAXLEN][2], pts_inv_r[PT_MAXLEN][2];
extern int32_t pts_inv_l_count, pts_inv_r_count;
extern float pts_filter_l[PT_MAXLEN][2], pts_filter_r[PT_MAXLEN][2];
extern int32_t pts_filter_l_count, pts_filter_r_count;
extern float pts_resample_left[PT_MAXLEN][2], pts_resample_right[PT_MAXLEN][2];
extern int32_t pts_resample_left_count, pts_resample_right_count;
extern uint8_t mt9v03x_image_copy[MT9V03X_H][MT9V03X_W];
extern float mid_left[PT_MAXLEN][2], mid_right[PT_MAXLEN][2];
extern int32_t mid_left_count, mid_right_count;
extern float angle_left[PT_MAXLEN];
extern float angle_right[PT_MAXLEN];
extern int angle_left_num, angle_right_num;
extern float angle_new_left[PT_MAXLEN];
extern float angle_new_right[PT_MAXLEN];
extern int angle_new_left_num, angle_new_right_num;
extern int Lpt0_rpts0s_id, Lpt1_rpts1s_id;
extern bool Lpt0_found, Lpt1_found;
extern int Lpt1[2], Lpt0[2];
extern int Lpt_in0_rpts0s_id, Lpt_in1_rpts1s_id;
extern bool Lpt_in0_found, Lpt_in1_found;
extern int Lpt_in1[2], Lpt_in0[2];
extern bool is_straight0, is_straight1;
extern bool is_turn0, is_turn1;
extern float rptsn[PT_MAXLEN][2];
extern int rptsn_num;
extern float aim_distance;
enum track_type_e {
TRACK_LEFT,
TRACK_RIGHT,
};
extern enum track_type_e track_type;
#endif // MAIN_H

2
app/page/cw_page_menu.c
View File

@@ -100,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(10, i * 16, pagelist[i].Text);
ips200_show_string(10, i * 18, pagelist[i].Text);
// SCREEN_showstr(8, i, pagelist[i].Text);
}
}

14
app/page/cw_page_rtcam.c
View File

@@ -3,13 +3,12 @@
#include "cw_page.h"
#define LINE_HEAD 11
#define LINE_END 18
#define LINE_END 16
static char Text[] = "RealTime Image";
static int8_t Curser = LINE_HEAD; // 定义光标位置
static int8_t Curser_Last = LINE_HEAD; // 定义光标位置
static void Print_Menu_p(void);
/***************************************************************************************
*
* 以下为页面模板函数
@@ -24,7 +23,6 @@ static void Print_Menu_p(void);
static void Setup()
{
ips200_clear();
Print_Menu_p();
Print_Curser(Curser, Curser_Last);
}
@@ -91,13 +89,3 @@ void PageRegister_page_rtcam(unsigned char pageID)
* 以下为页面自定义功能函数
*
***************************************************************************************/
/**
* @brief 打印菜单项
*
*/
static void Print_Menu_p(void)
{
// SCREEN_showstr_style(5 * 8, 0, RED, WHITE, "#### MAIN MENU ####");
ips200_show_string(0, 0, Text);
}

18
app/page/cw_page_ui_widget.c
View File

@@ -1,6 +1,6 @@
#include "cw_page_ui_widget.h"
#include "zf_common_headfile.h"
#include "main.h"
#include "gl_data.h"
/**
* @brief 绘制光标
@@ -10,8 +10,17 @@
*/
void Print_Curser(uint8_t Curser_In, uint8_t Curser_Last_In)
{
ips200_show_string(0, Curser_Last_In * 16, " ");
ips200_show_string(0, Curser_In * 16, ">");
// ips200_show_string(0, Curser_Last_In * 18, " ");
// ips200_show_string(0, Curser_In * 18, ">");
for (uint8_t i = 0; i < 160; i++) {
ips200_draw_point(10 + i, Curser_Last_In * 18 + 19, IPS200_DEFAULT_BGCOLOR);
// system_delay_us(200);
}
for (uint8_t i = 0; i < 160; i++) {
ips200_draw_point(10 + i, Curser_In * 18 + 19, RGB565_WHITE);
system_delay_ms(1);
}
}
/**
@@ -20,9 +29,8 @@ void Print_Curser(uint8_t Curser_In, uint8_t Curser_Last_In)
*/
void Print_Menu(const ITEM *item, uint8_t item_sum)
{
ips200_show_string(0, 0, " --return--");
for (uint8_t i = 0; i < item_sum; i++) {
ips200_show_string(8, i * 16 + 16, item[i].text);
ips200_show_string(8, i * 18 + 16, item[i].text);
}
}

112
libraries/zf_device/zf_device_ips200.c
View File

@@ -316,10 +316,10 @@ static void ips200_set_region(uint16 x1, uint16 y1, uint16 x2, uint16 y2)
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
// 检查一下你的显示调用的函数 自己计算一下哪里超过了屏幕显示范围
zf_assert(x1 < ips200_x_max);
zf_assert(y1 < ips200_y_max);
zf_assert(x2 < ips200_x_max);
zf_assert(y2 < ips200_y_max);
// zf_assert(x1 < ips200_x_max);
// zf_assert(y1 < ips200_y_max);
// zf_assert(x2 < ips200_x_max);
// zf_assert(y2 < ips200_y_max);
ips200_write_command(0x2a);
ips200_write_16bit_data(x1);
@@ -484,8 +484,8 @@ void ips200_draw_point(uint16 x, uint16 y, const uint16 color)
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
if (IPS200_TYPE_SPI == ips200_display_type) {
IPS200_CS(0);
@@ -512,10 +512,10 @@ void ips200_draw_line(uint16 x_start, uint16 y_start, uint16 x_end, uint16 y_end
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x_start < ips200_x_max);
zf_assert(y_start < ips200_y_max);
zf_assert(x_end < ips200_x_max);
zf_assert(y_end < ips200_y_max);
// zf_assert(x_start < ips200_x_max);
// zf_assert(y_start < ips200_y_max);
// zf_assert(x_end < ips200_x_max);
// zf_assert(y_end < ips200_y_max);
int16 x_dir = (x_start < x_end ? 1 : -1);
int16 y_dir = (y_start < y_end ? 1 : -1);
@@ -565,33 +565,14 @@ void ips200_show_char(uint16 x, uint16 y, const char dat)
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
uint8 i = 0, j = 0;
if (IPS200_TYPE_SPI == ips200_display_type) {
IPS200_CS(0);
}
switch (ips200_display_font) {
case IPS200_6X8_FONT: {
uint16 display_buffer[6 * 8];
ips200_set_region(x, y, x + 5, y + 7);
for (i = 0; 6 > i; i++) {
// 减 32 因为是取模是从空格开始取得 空格在 ascii 中序号是 32
uint8 temp_top = ascii_font_6x8[dat - 32][i];
for (j = 0; 8 > j; j++) {
if (temp_top & 0x01) {
display_buffer[i + j * 6] = (ips200_pencolor);
} else {
display_buffer[i + j * 6] = (ips200_bgcolor);
}
temp_top >>= 1;
}
}
ips200_write_16bit_data_array(display_buffer, 6 * 8);
} break;
case IPS200_8X16_FONT: {
uint16 display_buffer[8 * 16];
ips200_set_region(x, y, x + 7, y + 15);
for (i = 0; 8 > i; i++) {
@@ -613,13 +594,10 @@ void ips200_show_char(uint16 x, uint16 y, const char dat)
}
temp_bottom >>= 1;
}
}
ips200_write_16bit_data_array(display_buffer, 8 * 16);
} break;
case IPS200_16X16_FONT: {
// 暂不支持
} break;
}
if (IPS200_TYPE_SPI == ips200_display_type) {
IPS200_CS(1);
}
@@ -638,8 +616,8 @@ void ips200_show_string(uint16 x, uint16 y, const char dat[])
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
uint16 j = 0;
while ('\0' != dat[j]) {
@@ -671,10 +649,10 @@ void ips200_show_int(uint16 x, uint16 y, const int32 dat, uint8 num)
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(0 < num);
zf_assert(10 >= num);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(0 < num);
// zf_assert(10 >= num);
int32 dat_temp = dat;
int32 offset = 1;
@@ -708,10 +686,10 @@ void ips200_show_uint(uint16 x, uint16 y, const uint32 dat, uint8 num)
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(0 < num);
zf_assert(10 >= num);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(0 < num);
// zf_assert(10 >= num);
uint32 dat_temp = dat;
int32 offset = 1;
@@ -748,12 +726,12 @@ void ips200_show_float(uint16 x, uint16 y, const double dat, uint8 num, uint8 po
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(0 < num);
zf_assert(8 >= num);
zf_assert(0 < pointnum);
zf_assert(6 >= pointnum);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(0 < num);
// zf_assert(8 >= num);
// zf_assert(0 < pointnum);
// zf_assert(6 >= pointnum);
double dat_temp = dat;
double offset = 1.0;
@@ -790,9 +768,9 @@ void ips200_show_binary_image(uint16 x, uint16 y, const uint8 *image, uint16 wid
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(NULL != image);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(NULL != image);
uint32 i = 0, j = 0;
uint8 temp = 0;
@@ -844,9 +822,9 @@ void ips200_show_gray_image(uint16 x, uint16 y, const uint8 *image, uint16 width
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(NULL != image);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(NULL != image);
uint32 i = 0, j = 0;
uint16 color = 0, temp = 0;
@@ -901,9 +879,9 @@ void ips200_show_rgb565_image(uint16 x, uint16 y, const uint16 *image, uint16 wi
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(NULL != image);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(NULL != image);
uint32 i = 0, j = 0;
uint16 data_buffer[dis_width];
@@ -947,9 +925,9 @@ void ips200_show_wave(uint16 x, uint16 y, const uint16 *wave, uint16 width, uint
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(NULL != wave);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(NULL != wave);
uint32 i = 0, j = 0;
uint32 width_index = 0, value_max_index = 0;
@@ -992,9 +970,9 @@ void ips200_show_chinese(uint16 x, uint16 y, uint8 size, const uint8 *chinese_bu
{
// 如果程序在输出了断言信息 并且提示出错位置在这里
// 那么一般是屏幕显示的时候超过屏幕分辨率范围了
zf_assert(x < ips200_x_max);
zf_assert(y < ips200_y_max);
zf_assert(NULL != chinese_buffer);
// zf_assert(x < ips200_x_max);
// zf_assert(y < ips200_y_max);
// zf_assert(NULL != chinese_buffer);
int i = 0, j = 0, k = 0;
uint8 temp = 0, temp1 = 0, temp2 = 0;

4
libraries/zf_device/zf_device_ips200.h
View File

@@ -115,8 +115,8 @@
// --------------------双排 SPI 接口两寸屏幕引脚定义--------------------//
#define IPS200_DEFAULT_DISPLAY_DIR (IPS200_PORTAIT) // 默认的显示方向
#define IPS200_DEFAULT_PENCOLOR (RGB565_BLACK ) // 默认的画笔颜色
#define IPS200_DEFAULT_BGCOLOR (RGB565_YELLOW ) // 默认的背景颜色
#define IPS200_DEFAULT_PENCOLOR (RGB565_YELLOW ) // 默认的画笔颜色
#define IPS200_DEFAULT_BGCOLOR (RGB565_BLACK ) // 默认的背景颜色
#define IPS200_DEFAULT_DISPLAY_FONT (IPS200_8X16_FONT) // 默认的字体模式
// 控制语句

3
libraries/zf_driver/zf_driver_delay.h
View File

@@ -39,9 +39,6 @@
#include "zf_common_clock.h"
#include "zf_common_typedef.h"
#define LONG_PRESS_THRESHOLD_MS (300ULL)
#define LONG_PRESS_THRESHOLD_TICK (LONG_PRESS_THRESHOLD_MS * 18000ULL)
void system_delay_ms(uint32 time);
void system_delay_us(uint32 time);
uint64_t system_get_tick(void);