From aef0eb30b1b6e3257d3279e682598505d15e37c6 Mon Sep 17 00:00:00 2001 From: Federico Amedeo Izzo Date: Sat, 9 Jan 2021 18:33:40 +0100 Subject: [PATCH] UI: Move ui_menu.c function prototypes from ui_menu.h to ui.c as extern --- openrtx/include/ui_menu.h | 37 ------------------------------------- openrtx/src/ui.c | 14 +++++++++++++- openrtx/src/ui_menu.c | 1 - 3 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 openrtx/include/ui_menu.h diff --git a/openrtx/include/ui_menu.h b/openrtx/include/ui_menu.h deleted file mode 100644 index e1139f7c..00000000 --- a/openrtx/include/ui_menu.h +++ /dev/null @@ -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 * - ***************************************************************************/ - -#ifndef UI_MENU_H -#define UI_MENU_H - -#include - -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 */ diff --git a/openrtx/src/ui.c b/openrtx/src/ui.c index b55ee2aa..296d7ac6 100644 --- a/openrtx/src/ui.c +++ b/openrtx/src/ui.c @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -74,6 +73,19 @@ #include #include + /* 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] = { "Zone", diff --git a/openrtx/src/ui_menu.c b/openrtx/src/ui_menu.c index f5710fc6..e350d9bb 100644 --- a/openrtx/src/ui_menu.c +++ b/openrtx/src/ui_menu.c @@ -21,7 +21,6 @@ #include #include #include -#include #include void _ui_drawMenuList(point_t pos, const char *entries[],