Merge branch 'master' of http://git.brisky.space:441/btl143/firmware_clover
This commit is contained in:
@@ -4,9 +4,13 @@
|
||||
|
||||
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;
|
||||
|
||||
int8_t Get_new_page(void)
|
||||
{
|
||||
return new_page;
|
||||
}
|
||||
/**
|
||||
* @brief 注册一个基本页面,包含一个初始化函数,循环函数,退出函数,事件函数
|
||||
* @param pageID: 页面编号
|
||||
@@ -17,11 +21,11 @@ static int8_t new_page = page_menu;
|
||||
* @param eventCallback: 事件函数回调
|
||||
* @retval 无
|
||||
*/
|
||||
void Page_Register(uint8_t pageID, char *pageText,
|
||||
void Page_Register(uint8_t pageID,
|
||||
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;
|
||||
@@ -123,9 +127,11 @@ void Page_Run(void)
|
||||
*/
|
||||
void Page_Init(void)
|
||||
{
|
||||
PAGE_REG(page_menu);
|
||||
PAGE_REG(page_rtcam);
|
||||
PAGE_REG(page_param);
|
||||
PAGE_REG(page_menu, "main");
|
||||
PAGE_REG(page_rtcam, "rtcam");
|
||||
PAGE_REG(page_param1, "Param1");
|
||||
PAGE_REG(page_param2, "param2");
|
||||
PAGE_REG(page_dparam, "dparam");
|
||||
// PAGE_REG(page_argv);
|
||||
// PAGE_REG(page_sys);
|
||||
// PAGE_REG(page_run);
|
||||
|
||||
Reference in New Issue
Block a user