fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Move ui_menu.c function prototypes from ui_menu.h to ui.c as extern

This commit is contained in:
Federico Amedeo Izzo 2021-01-09 18:33:40 +01:00
parent e34674151b
commit aef0eb30b1
3 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
openrtx/include/ui_menu.h
View File

@ -1,37 +0,0 @@
/***************************************************************************
* Copyright (C) 2020 by Federico Amedeo Izzo IU2NUO, *
* Niccolò Izzo IU2KIN, *
* Silvano Seva IU2KWO *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, see <http://www.gnu.org/licenses/> *
***************************************************************************/
#ifndef UI_MENU_H
#define UI_MENU_H
#include <ui.h>
void _ui_drawMenuList(point_t pos, const char *entries[],
uint8_t num_entries, uint8_t selected);
void _ui_drawChannelList(point_t pos, uint8_t selected);
void _ui_drawMenuTop(ui_state_t* ui_state);
void _ui_drawMenuChannel(ui_state_t* ui_state);
void _ui_drawMenuSettings(ui_state_t* ui_state);
#ifdef HAS_RTC
void _ui_drawSettingsTimeDate(state_t* last_state, ui_state_t* ui_state);
void _ui_drawSettingsTimeDateSet(state_t* last_state, ui_state_t* ui_state);
#endif
bool _ui_drawMenuMacro(state_t* last_state);
#endif /* UI_MENU_H */

14
openrtx/src/ui.c
View File

@ -66,7 +66,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <ui.h> #include <ui.h>
#include <ui_menu.h>
#include <interfaces/rtx.h> #include <interfaces/rtx.h>
#include <interfaces/platform.h> #include <interfaces/platform.h>
#include <interfaces/nvmem.h> #include <interfaces/nvmem.h>
@ -74,6 +73,19 @@
#include <battery.h> #include <battery.h>
#include <input.h> #include <input.h>
/* UI menu functions, their implementation is in "ui_menu.c" */
extern void _ui_drawMenuList(point_t pos, const char *entries[],
uint8_t num_entries, uint8_t selected);
extern void _ui_drawChannelList(point_t pos, uint8_t selected);
extern void _ui_drawMenuTop(ui_state_t* ui_state);
extern void _ui_drawMenuChannel(ui_state_t* ui_state);
extern void _ui_drawMenuSettings(ui_state_t* ui_state);
#ifdef HAS_RTC
extern void _ui_drawSettingsTimeDate(state_t* last_state, ui_state_t* ui_state);
extern void _ui_drawSettingsTimeDateSet(state_t* last_state, ui_state_t* ui_state);
#endif
extern bool _ui_drawMenuMacro(state_t* last_state);
const char *menu_items[6] = const char *menu_items[6] =
{ {
"Zone", "Zone",

1
openrtx/src/ui_menu.c
View File

@ -21,7 +21,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <ui.h> #include <ui.h>
#include <ui_menu.h>
#include <string.h> #include <string.h>
void _ui_drawMenuList(point_t pos, const char *entries[], void _ui_drawMenuList(point_t pos, const char *entries[],