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

feat: 完成eeprom及页面ui更新

Browse Source
This commit is contained in:
井明江
2024-03-02 16:00:05 +08:00
parent 54b14bc47c
commit a758d0f94f
16 changed files with 348 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/page/page.c
View File

@@ -4,9 +4,13 @@
PAGE_LIST pagelist[page_max];
static uint8_t page_busy = 0;
int8_t new_page = page_menu;
static int8_t new_page = page_menu;
static int8_t now_page = page_menu;
int8_t Get_new_page(void)
{
return new_page;
}
/**
* @brief 注册一个基本页面，包含一个初始化函数，循环函数，退出函数，事件函数
* @param pageID: 页面编号
@@ -127,7 +131,7 @@ void Page_Init(void)
PAGE_REG(page_rtcam, "rtcam");
PAGE_REG(page_param1, "Param1");
PAGE_REG(page_param2, "param2");
PAGE_REG(page_dparam, "dparam");
PAGE_REG(page_dparam, "dparam");
// PAGE_REG(page_argv);
// PAGE_REG(page_sys);
// PAGE_REG(page_run);

2
app/page/page.h
View File

@@ -67,7 +67,7 @@ void Page_OpenCurrentPage(void);
uint8_t Page_GetStatus(void);
void Page_Run(void);
void Page_Init(void);
int8_t Get_new_page(void);
extern PAGE_LIST pagelist[page_max];
extern int8_t new_page ;
#endif

15
app/page/page_dparam.c
View File

@@ -1,7 +1,7 @@
#include "zf_common_headfile.h"
#include "page_ui_widget.h"
#include "page.h"
float ddata0=0.0f;
#include "jj_param.h"
// #define LINE_HEAD 1
// #define LINE_END 7
// static int8_t Curser = LINE_HEAD; // 定义光标位置
@@ -21,8 +21,10 @@ static void Setup()
{
ips200_clear();
// 显示参数名称
ips200_show_string(0, 0, "Dparam");
ips200_show_string(20, 18 + 2, "ddata0:");
ips200_show_string(0, 0, "Dparam");
ips200_show_string(20, 18 + 2, (Param_Data[delta_x].text));
ips200_show_string(20, 18 + 20, (Param_Data[delta_y].text));
}
/**
@@ -32,7 +34,6 @@ static void Setup()
*/
static void Exit()
{
}
/**
@@ -43,8 +44,8 @@ static void Exit()
static void Loop()
{
// 刷新参数数值
ips200_show_float(80, 18 + 2, ddata0, 4, 5);
ddata0+=0.01f;
ips200_show_float(90, 18 + 2, *((float *)(Param_Data[delta_x].p_data)), 4, 5);
ips200_show_float(90, 18 + 20, *((float *)(Param_Data[delta_x].p_data)), 4, 5);
}
/**
@@ -55,7 +56,7 @@ static void Loop()
*/
static void Event(page_event event)
{
if (page_event_press_long == event) {
if (page_event_press_long == event) {
Page_Shift(page_menu);
}
}

4
app/page/page_menu.c
View File

@@ -25,7 +25,7 @@ static void Setup()
{
ips200_clear();
Print_Menu_p();
Print_Curser(Curser, Curser_Last,RGB565_PURPLE);
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
}
/**
@@ -72,7 +72,7 @@ static void Event(page_event event)
Curser = LINE_HEAD;
}
Print_Curser(Curser, Curser_Last,RGB565_PURPLE);
Print_Curser(Curser, Curser_Last, RGB565_PURPLE);
}
/**

11
app/page/page_sparam.c → app/page/page_sparam1.c
View File

@@ -1,6 +1,7 @@
#include "jj_param.h"
#include "page_ui_widget.h"
#include "page.h"
#include <math.h>
#define LINE_HEAD 1
@@ -25,11 +26,11 @@ static void Setup()
{
ips200_clear();
if (new_page == page_param1) {
if (Get_new_page() == page_param1) {
pafrist = 0;
paend = Page2_head;
ips200_show_string(0, 0, "Param1");
} else if (new_page == page_param2) {
} else if (Get_new_page() == page_param2) {
pafrist = Page2_head;
paend = Page3_head;
ips200_show_string(0, 0, "Param2");
@@ -104,7 +105,7 @@ static void Event(page_event event)
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);
*((float *)(Param_Data[Curser + pafrist - 1].p_data)) += powf(10, index_power);
break;
case EINT32:
*((int32 *)(Param_Data[Curser + pafrist - 1].p_data)) += 1;
@@ -157,7 +158,3 @@ 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);
}

160
app/page/page_sparam2.c Normal file
View File

@@ -0,0 +1,160 @@
#include "jj_param.h"
#include "page_ui_widget.h"
#include "page.h"
#include <math.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 (Get_new_page() == page_param1) {
pafrist = 0;
paend = Page2_head;
ips200_show_string(0, 0, "Param1");
} else if (Get_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, 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_param2(unsigned char pageID)
{
Page_Register(pageID, Setup, Loop, Exit, Event);
}