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

feat:完成ui设计

Browse Source
This commit is contained in:
井明江
2024-02-24 15:06:30 +08:00
parent 27c50ceea8
commit bdd69e2e59
11 changed files with 364 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.vscode/tasks.json vendored Normal file
View File

@@ -0,0 +1,28 @@
{
"tasks": [
{
"type": "cppbuild",
"label": "C/C++: gcc.exe 生成活动文件",
"command": "D:\\MinGW\\bin\\gcc.exe",
"args": [
"-fdiagnostics-color=always",
"-g",
"${file}",
"-o",
"${fileDirname}\\${fileBasenameNoExtension}.exe"
],
"options": {
"cwd": "${fileDirname}"
},
"problemMatcher": [
"$gcc"
],
"group": {
"kind": "build",
"isDefault": true
},
"detail": "调试器生成的任务。"
}
],
"version": "2.0.0"
}

84
app/jj_param.c
View File

@@ -5,17 +5,59 @@
PARAM_INFO Param_Data[DATA_NUM]; PARAM_INFO Param_Data[DATA_NUM];
soft_iic_info_struct eeprom_param; soft_iic_info_struct eeprom_param;
TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM]; TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM];
float data0 = 1.0f;
void jj_param_eeprom_init() float data1 = 1.05f;
float data2 = 10.0f;
float data3 = 100.0f;
float data4 = 4.0f;
float data5 = 66.0f;
float data6 = 13.130f;
/**
* @brief 参数初始化注册
*
*/
void jj_param_eeprom_init(void)
{ {
soft_iic_init(&eeprom_param, K24C02_DEV_ADDR, K24C02_SOFT_IIC_DELAY, K24C02_SCL_PIN, K24C02_SDA_PIN); // eeprom初始化 soft_iic_init(&eeprom_param, K24C02_DEV_ADDR, K24C02_SOFT_IIC_DELAY, K24C02_SCL_PIN, K24C02_SDA_PIN); // eeprom初始化
// PARAM_REG(angle_Kp, &an_Kp, EFLOAT, 1, "an_P"); // 注冊 PARAM_REG(angle_Kp, &data0, EFLOAT, 1, "an_P:"); // 注冊
// PARAM_REG(angle_Ki, &an_Ki, EFLOAT, 1, "an_I"); // 注冊 PARAM_REG(angle_Ki, &data1, EFLOAT, 1, "an_I:"); // 注冊
// PARAM_REG(angle_Kd, &an_Kd, EFLOAT, 1, "an_D"); // 注冊 PARAM_REG(angle_Kd, &data2, EFLOAT, 1, "an_D:"); // 注冊
// PARAM_REG(imgax_Kp, &im_Kp, EFLOAT, 1, "im_P"); // 注冊 PARAM_REG(imgax_Kp, &data3, EFLOAT, 1, "im_P:"); // 注冊
// PARAM_REG(imgax_Ki, &im_Ki, EFLOAT, 1, "im_I"); // 注冊 PARAM_REG(imgax_Ki, &data4, EFLOAT, 1, "im_I:"); // 注冊
// PARAM_REG(imgax_Kd, &im_Kd, EFLOAT, 1, "im_D"); // 注冊 PARAM_REG(imgax_Kd, &data5, EFLOAT, 1, "im_D:");
PARAM_REG(other, &data6, EFLOAT, 1, "add:");
jj_param_read(); // 注冊
}
/**
* @brief 参数写入
*
*/
void jj_param_write(void)
{
for (uint8 i = 0; i < DATA_IN_FLASH_NUM; i++) {
switch (Param_Data[i].type) {
case EFLOAT:
iic_buffer[i].f32 = *((float *)(Param_Data[i].p_data));
break;
case EUINT32:
iic_buffer[i].u32 = *((uint32 *)(Param_Data[i].p_data));
break;
case EINT32:
iic_buffer[i].s32 = *((int32 *)(Param_Data[i].p_data));
break;
default:
break;
}
soft_iic_write_8bit_registers(&eeprom_param, 4 * i, (uint8 *)&iic_buffer[i], 4);
system_delay_ms(10);
}
}
/**
* @brief 参数读出
*
*/
void jj_param_read(void)
{
for (uint8 i = 0; i < DATA_IN_FLASH_NUM; i++) { for (uint8 i = 0; i < DATA_IN_FLASH_NUM; i++) {
soft_iic_read_8bit_registers(&eeprom_param, 4 * i, (uint8 *)&iic_buffer[i], 4); soft_iic_read_8bit_registers(&eeprom_param, 4 * i, (uint8 *)&iic_buffer[i], 4);
@@ -38,27 +80,3 @@ void jj_param_eeprom_init()
system_delay_ms(10); system_delay_ms(10);
} }
} }
/**
* @brief 参数更新
*
*/
void jj_param_update()
{
for (uint8 i = 0; i < DATA_IN_FLASH_NUM; i++) {
switch (Param_Data[i].type) {
case EFLOAT:
iic_buffer[i].f32 = *((float *)(Param_Data[i].p_data));
break;
case EUINT32:
iic_buffer[i].u32 = *((uint32 *)(Param_Data[i].p_data));
break;
case EINT32:
iic_buffer[i].s32 = *((int32 *)(Param_Data[i].p_data));
break;
default:
break;
}
soft_iic_write_8bit_registers(&eeprom_param, 4 * i, (uint8 *)&iic_buffer[i], 4);
system_delay_ms(10);
}
}

20
app/jj_param.h
View File

@@ -15,13 +15,21 @@
Param_Data[_data_tag_].text = _text_; Param_Data[_data_tag_].text = _text_;
typedef enum { typedef enum {
DATA_HEAD = -1,
angle_Kp, Page1_head=0,
angle_Kp=Page1_head,
angle_Ki, angle_Ki,
angle_Kd, angle_Kd,
imgax_Kp, other,
Page2_head,
// 第二页参数
imgax_Kp=Page2_head,
imgax_Ki, imgax_Ki,
imgax_Kd, imgax_Kd,
Page3_head,
DATA_IN_FLASH_NUM, DATA_IN_FLASH_NUM,
DATA_NUM, DATA_NUM,
} data_tag_t; } data_tag_t;
@@ -49,7 +57,7 @@ typedef struct {
extern soft_iic_info_struct eeprom_param; extern soft_iic_info_struct eeprom_param;
extern PARAM_INFO Param_Data[DATA_NUM]; extern PARAM_INFO Param_Data[DATA_NUM];
extern TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM]; extern TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM];
void jj_param_eeprom_init(); void jj_param_eeprom_init(void);
void jj_param_update(); void jj_param_write(void);
void jj_param_show(); void jj_param_read(void);
#endif #endif

3
app/main.c
View File

@@ -43,8 +43,7 @@ int main(void)
by_button_init(); by_button_init();
jj_bt_init(); jj_bt_init();
// jj_param_eeprom_init(); jj_param_eeprom_init();
Page_Init(); Page_Init();
pit_ms_init(TIM6_PIT, 2); pit_ms_init(TIM6_PIT, 2);

14
app/page/page.c
View File

@@ -4,8 +4,8 @@
PAGE_LIST pagelist[page_max]; PAGE_LIST pagelist[page_max];
static uint8_t page_busy = 0; static uint8_t page_busy = 0;
int8_t new_page = page_menu;
static int8_t now_page = page_menu; static int8_t now_page = page_menu;
static int8_t new_page = page_menu;
/** /**
* @brief 注册一个基本页面，包含一个初始化函数，循环函数，退出函数，事件函数 * @brief 注册一个基本页面，包含一个初始化函数，循环函数，退出函数，事件函数
@@ -17,11 +17,11 @@ static int8_t new_page = page_menu;
* @param eventCallback: 事件函数回调 * @param eventCallback: 事件函数回调
* @retval 无 * @retval 无
*/ */
void Page_Register(uint8_t pageID, char *pageText, void Page_Register(uint8_t pageID,
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].SetupCallback = setupCallback; pagelist[pageID].SetupCallback = setupCallback;
pagelist[pageID].LoopCallback = loopCallback; pagelist[pageID].LoopCallback = loopCallback;
pagelist[pageID].ExitCallback = exitCallback; pagelist[pageID].ExitCallback = exitCallback;
@@ -123,9 +123,11 @@ void Page_Run(void)
*/ */
void Page_Init(void) void Page_Init(void)
{ {
PAGE_REG(page_menu); PAGE_REG(page_menu, "main");
PAGE_REG(page_rtcam); PAGE_REG(page_rtcam, "rtcam");
PAGE_REG(page_param); PAGE_REG(page_param1, "Param1");
PAGE_REG(page_param2, "param2");
PAGE_REG(page_dparam, "dparam");
// PAGE_REG(page_argv); // PAGE_REG(page_argv);
// PAGE_REG(page_sys); // PAGE_REG(page_sys);
// PAGE_REG(page_run); // PAGE_REG(page_run);

18
app/page/page.h
View File

@@ -20,7 +20,9 @@ enum PageID {
//...... //......
page_menu, page_menu,
page_rtcam, page_rtcam,
page_param, page_param1,
page_param2,
page_dparam,
// page_argv, // page_argv,
// page_sys, // page_sys,
// page_run, // page_run,
@@ -46,13 +48,15 @@ typedef struct {
} PAGE_LIST; } PAGE_LIST;
// 页面注册函数 // 页面注册函数
#define PAGE_REG(name) \ #define PAGE_REG(_name_, _text_) \
do { \ do { \
extern void PageRegister_##name(unsigned char pageID); \ extern void PageRegister_##_name_(unsigned char pageID); \
PageRegister_##name(name); \ PageRegister_##_name_(_name_); \
} while (0) } while (0); \
pagelist[_name_].Text = _text_ ;
void Page_Register(uint8_t pageID, char *pageText,
void Page_Register(uint8_t pageID,
CallbackFunction_t setupCallback, CallbackFunction_t loopCallback, CallbackFunction_t setupCallback, CallbackFunction_t loopCallback,
CallbackFunction_t exitCallback, EventFunction_t eventCallback); CallbackFunction_t exitCallback, EventFunction_t eventCallback);
@@ -65,5 +69,5 @@ void Page_Run(void);
void Page_Init(void); void Page_Init(void);
extern PAGE_LIST pagelist[page_max]; extern PAGE_LIST pagelist[page_max];
extern int8_t new_page ;
#endif #endif

71
app/page/page_dparam.c Normal file
View File

@@ -0,0 +1,71 @@
#include "zf_common_headfile.h"
#include "page_ui_widget.h"
#include "page.h"
float ddata0=0.0f;
// #define LINE_HEAD 1
// #define LINE_END 7
// static int8_t Curser = LINE_HEAD; // 定义光标位置
// static int8_t Curser_Last = LINE_HEAD; // 定义光标位置
/***************************************************************************************
*
* 以下为页面模板函数
*
***************************************************************************************/
/**
* @brief 页面初始化事件
* @param 无
* @retval 无
*/
static void Setup()
{
ips200_clear();
// 显示参数名称
ips200_show_string(0, 0, "Dparam");
ips200_show_string(20, 18 + 2, "ddata0:");
}
/**
* @brief 页面退出事件
* @param 无
* @retval 无
*/
static void Exit()
{
}
/**
* @brief 页面循环执行的内容
* @param 无
* @retval 无
*/
static void Loop()
{
// 刷新参数数值
ips200_show_float(80, 18 + 2, ddata0, 4, 5);
ddata0+=0.01f;
}
/**
* @brief 页面事件
* @param btn:发出事件的按键
* @param event:事件编号
* @retval 无
*/
static void Event(page_event event)
{
if (page_event_press_long == event) {
Page_Shift(page_menu);
}
}
/**
* @brief 页面注册函数
*
* @param pageID
*/
void PageRegister_page_dparam(unsigned char pageID)
{
Page_Register(pageID, Setup, Loop, Exit, Event);
}

6
app/page/page_menu.c
View File

@@ -57,9 +57,9 @@ static void Event(page_event event)
Curser_Last = Curser; Curser_Last = Curser;
if (page_event_forward == event) { if (page_event_forward == event) {
Curser--; // 光标上移 Curser++; // 光标上移
} else if (page_event_backward == event) { } else if (page_event_backward == event) {
Curser++; // 光标下移 Curser--; // 光标下移
} else if (page_event_press_short == event) { } else if (page_event_press_short == event) {
if (page_max > Curser && page_menu < Curser) { if (page_max > Curser && page_menu < Curser) {
Page_Shift(Curser); // 切换到光标选中的页面 Page_Shift(Curser); // 切换到光标选中的页面
@@ -82,7 +82,7 @@ static void Event(page_event event)
*/ */
void PageRegister_page_menu(unsigned char pageID) void PageRegister_page_menu(unsigned char pageID)
{ {
Page_Register(pageID, Text, Setup, Loop, Exit, Event); Page_Register(pageID, Setup, Loop, Exit, Event);
} }
/*************************************************************************************** /***************************************************************************************

133
app/page/page_param.c
View File

@@ -1,133 +0,0 @@
#include "jj_param.h"
#include "page_ui_widget.h"
#include "page.h"
#define LINE_HEAD 0
#define LINE_END DATA_NUM - 2
static char Text[] = "Param";
int event_flag = 0;
int32_t index_power = 0;
static int8_t Curser = LINE_HEAD; // 定义光标位置
static int8_t Curser_Last = LINE_HEAD; // 定义光标位置
void jj_param_show();
/***************************************************************************************
*
* 以下为页面模板函数
*
***************************************************************************************/
/**
* @brief 页面初始化事件
* @param 无
* @retval 无
*/
static void Setup()
{
ips200_clear();
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
for (int16 i = 0; i < DATA_NUM - 1; i++) {
ips200_show_string(10, i * 18 + 2, Param_Data[i].text);
if (Param_Data[i].type == EINT32)
ips200_show_int(50, i * 18 + 2, *((int32 *)(Param_Data[i].p_data)), 5);
else if (Param_Data[i].type == EFLOAT)
ips200_show_float(50, i * 18 + 2, *((float *)(Param_Data[i].p_data)), 4, 5);
}
ips200_show_int(50, (DATA_NUM-1)* 18 + 2, index_power, 5);
}
/**
* @brief 页面退出事件
* @param 无
* @retval 无
*/
static void Exit()
{
}
/**
* @brief 页面循环执行的内容
* @param 无
* @retval 无
*/
static void Loop()
{
}
/**
* @brief 页面事件
* @param btn:发出事件的按键
* @param event:事件编号
* @retval 无
*/
static void Event(page_event event)
{
if (0 == event_flag) {
Curser_Last = Curser;
if (page_event_forward == event) {
Curser--; // 光标上移
} else if (page_event_backward == event) {
Curser++; // 光标下移
} else if (page_event_press_short == event) {
event_flag = 1; // 选中参数
Print_Curser(Curser, Curser_Last, RGB565_RED);
return;
} else if (page_event_press_long == event) {
jj_param_update();
Page_Shift(page_menu);
return;
}
if (Curser < LINE_HEAD) {
Curser = LINE_END;
} else if (Curser > LINE_END) {
Curser = LINE_HEAD;
}
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
} else if (1 == event_flag) {
if (page_event_forward == event) {
if (Param_Data[Curser].type == EFLOAT) {
*((float *)(Param_Data[Curser].p_data)) += powf(10.0f,(float)index_power);
} else if (Param_Data[Curser].type == EINT32) {
*((int32 *)(Param_Data[Curser].p_data)) += 1;
} else if (Param_Data[Curser].type == EUINT32) {
*((uint32 *)(Param_Data[Curser].p_data)) += 1;
}
} else if (page_event_backward == event) {
if (Param_Data[Curser].type == EFLOAT) {
*((float *)(Param_Data[Curser].p_data)) -=powf(10.0f,(float)index_power);
} else if (Param_Data[Curser].type == EINT32) {
*((int32 *)(Param_Data[Curser].p_data)) -= 1;
} else if (Param_Data[Curser].type == EUINT32) {
*((uint32 *)(Param_Data[Curser].p_data)) -= 1;
}
} else if (page_event_press_short == event) {
index_power++;
if (index_power > 2) {
index_power = -2;
}
ips200_show_int(50, (DATA_NUM-1)* 18 + 2, index_power, 5);
} else if (page_event_press_long == event) {
event_flag = 0;
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
}
jj_param_show();
}
}
void jj_param_show()
{
if (EINT32 == Param_Data[Curser].type)
ips200_show_int(50, Curser * 18 + 2, *((int32 *)(Param_Data[Curser].p_data)), 5);
else if (EUINT32 == Param_Data[Curser].type)
ips200_show_uint(50, Curser * 18 + 2, *((int32 *)(Param_Data[Curser].p_data)), 5);
else if (EFLOAT == Param_Data[Curser].type)
ips200_show_float(50, Curser * 18 + 2, *((float *)(Param_Data[Curser].p_data)), 4, 5);
}
/**
* @brief 页面注册函数
*
* @param pageID
*/
void PageRegister_page_param(unsigned char pageID)
{
Page_Register(pageID, Text, Setup, Loop, Exit, Event);
}

4
app/page/page_rtcam.c
View File

@@ -5,8 +5,6 @@
#define LINE_HEAD 11 #define LINE_HEAD 11
#define LINE_END 16 #define LINE_END 16
static char Text[] = "RealTime Image";
static int8_t Curser = LINE_HEAD; // 定义光标位置 static int8_t Curser = LINE_HEAD; // 定义光标位置
static int8_t Curser_Last = LINE_HEAD; // 定义光标位置 static int8_t Curser_Last = LINE_HEAD; // 定义光标位置
/*************************************************************************************** /***************************************************************************************
@@ -81,7 +79,7 @@ static void Event(page_event event)
*/ */
void PageRegister_page_rtcam(unsigned char pageID) void PageRegister_page_rtcam(unsigned char pageID)
{ {
Page_Register(pageID, Text, Setup, Loop, Exit, Event); Page_Register(pageID, Setup, Loop, Exit, Event);
} }
/*************************************************************************************** /***************************************************************************************

163
app/page/page_sparam.c Normal file
View File

@@ -0,0 +1,163 @@
#include "jj_param.h"
#include "page_ui_widget.h"
#include "page.h"
#define LINE_HEAD 1
static int16 pafrist;
static int16 paend;
static int16 palong;
static int event_flag = 0;
static int32_t index_power = 0;
static int8_t Curser = LINE_HEAD; // 定义光标位置
static int8_t Curser_Last = LINE_HEAD; // 定义光标位置
/***************************************************************************************
*
* 以下为页面模板函数
*
***************************************************************************************/
/**
* @brief 页面初始化事件
* @param 无
* @retval 无
*/
static void Setup()
{
ips200_clear();
if (new_page == page_param1) {
pafrist = 0;
paend = Page2_head;
ips200_show_string(0, 0, "Param1");
} else if (new_page == page_param2) {
pafrist = Page2_head;
paend = Page3_head;
ips200_show_string(0, 0, "Param2");
}
palong = paend - pafrist;
if (Curser < LINE_HEAD) {
Curser = palong;
} else if (Curser > palong) {
Curser = LINE_HEAD;
}
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
for (int16 i = 0; i < palong; i++) {
ips200_show_string(20, i * 18 + 20, Param_Data[i + pafrist].text);
if (Param_Data[i].type == EINT32)
ips200_show_int(60, i * 18 + 20, *((int32 *)(Param_Data[i + pafrist].p_data)), 5);
else if (Param_Data[i].type == EFLOAT)
ips200_show_float(60, i * 18 + 20, *((float *)(Param_Data[i + pafrist].p_data)), 4, 5);
}
ips200_show_int(50, palong * 18 + 20, index_power, 5);
}
/**
* @brief 页面退出事件
* @param 无
* @retval 无
*/
static void Exit()
{
}
/**
* @brief 页面循环执行的内容
* @param 无
* @retval 无
*/
static void Loop()
{
}
/**
* @brief 页面事件
* @param btn:发出事件的按键
* @param event:事件编号
* @retval 无
*/
static void Event(page_event event)
{
if (0 == event_flag) {
Curser_Last = Curser;
if (page_event_forward == event) {
Curser++; // 光标上移
} else if (page_event_backward == event) {
Curser--; // 光标下移
} else if (page_event_press_short == event) {
event_flag = 1; // 选中参数
Print_Curser(Curser, Curser_Last, RGB565_RED);
return;
} else if (page_event_press_long == event) {
jj_param_write();
Page_Shift(page_menu);
return;
}
if (Curser < LINE_HEAD) {
Curser = palong;
} else if (Curser > palong) {
Curser = LINE_HEAD;
}
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
} else if (1 == event_flag) {
if (page_event_forward == event) {
switch (Param_Data[Curser + pafrist - 1].type) {
case EFLOAT:
*((float *)(Param_Data[Curser + pafrist - 1].p_data)) += powf(10.0f, (float)index_power);
break;
case EINT32:
*((int32 *)(Param_Data[Curser + pafrist - 1].p_data)) += 1;
break;
case EUINT32:
*((uint32 *)(Param_Data[Curser + pafrist - 1].p_data)) += 1;
break;
default:
break;
}
} else if (page_event_backward == event) {
switch (Param_Data[Curser + pafrist - 1].type) {
case EFLOAT:
*((float *)(Param_Data[Curser + pafrist - 1].p_data)) -= powf(10.0f, (float)index_power);
break;
case EINT32:
*((int32 *)(Param_Data[Curser + pafrist - 1].p_data)) -= 1;
break;
case EUINT32:
*((uint32 *)(Param_Data[Curser + pafrist - 1].p_data)) -= 1;
break;
default:
break;
}
} else if (page_event_press_short == event) {
index_power++;
if (index_power > 2) {
index_power = -2;
}
ips200_show_int(50, palong * 18 + 20, index_power, 5);
} else if (page_event_press_long == event) {
event_flag = 0;
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
}
if (EINT32 == Param_Data[Curser + pafrist - 1].type)
ips200_show_int(60, Curser * 18 + 2, *((int32 *)(Param_Data[Curser + pafrist - 1].p_data)), 5);
else if (EUINT32 == Param_Data[Curser + pafrist - 1].type)
ips200_show_uint(60, Curser * 18 + 2, *((int32 *)(Param_Data[Curser + pafrist - 1].p_data)), 5);
else if (EFLOAT == Param_Data[Curser + pafrist - 1].type)
ips200_show_float(60, Curser * 18 + 2, *((float *)(Param_Data[Curser + pafrist - 1].p_data)), 4, 5);
}
}
/**
* @brief 页面注册函数
*
* @param pageID
*/
void PageRegister_page_param1(unsigned char pageID)
{
Page_Register(pageID, Setup, Loop, Exit, Event);
}
void PageRegister_page_param2(unsigned char pageID)
{
Page_Register(pageID, Setup, Loop, Exit, Event);
}