menu: Moved unnecessary headers to a single file (app_list.h).

d9cb2636 · Projects · 7aee3932 · d9cb2636 · d9cb2636 · d9cb2636
Commit d9cb2636 authored Aug 26, 2014 by Projects
7 changed files
--- a/sw/freertos/Makefile
+++ b/sw/freertos/Makefile
@@ -171,7 +171,7 @@ src/main.c \
 src/irq_dispatcher.c \
 src/low_power_tick_management.c

-s_SRC += 
+s_SRC +=

 S_SRC +=  \
 ../common/Device/EnergyMicro/EFM32GG/Source/GCC/startup_efm32gg.S

--- a/sw/freertos/src/apps/clock.h
+++ b/sw/freertos/src/apps/clock.h
@@ -21,15 +21,16 @@
 */

 /**
- * Clock application.
+ * List of applications.
 */

-#ifndef CLOCK_H
-#define CLOCK_H
+#ifndef APP_LIST_H
+#define APP_LIST_H

 #include "application.h"

+extern application menu;
 extern application clock;

-#endif /* CLOCK_H */
+#endif /* APP_LIST_H */

--- a/sw/freertos/src/apps/clock.c
+++ b/sw/freertos/src/apps/clock.c
@@ -25,7 +25,7 @@
 * Clock application.
 */

-#include "clock.h"
+#include "application.h"
 #include "widgets/status_bar.h"
 #include <drivers/rtc.h>


--- a/sw/freertos/src/apps/menu.c
+++ b/sw/freertos/src/apps/menu.c
@@ -24,9 +24,8 @@
 * Menu application.
 */

-#include "menu.h"
+#include "app_list.h"
 #include "menu_struct.h"
-#include "clock.h"
 #include "widgets/status_bar.h"

 static int selected_item = 0;

--- a/sw/freertos/src/apps/menu.h
+++ b/sw/freertos/src/apps/menu.h
-/*
- * Copyright (C) 2014 Julian Lewis
- * @author Maciej Suminski <maciej.suminski@cern.ch>
- *
- * 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 2
- * 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, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-/**
- * Menu application.
- */
-
-#ifndef MENU_H
-#define MENU_H
-
-#include "application.h"
-
-extern application menu;
-
-#endif /* MENU_H */
-
--- a/sw/freertos/src/apps/menu_struct.c
+++ b/sw/freertos/src/apps/menu_struct.c
@@ -25,7 +25,7 @@
 */

 #include "menu_struct.h"
-#include "clock.h"
+#include "app_list.h"

 int get_menu_size(const menu_list *menu) {
    int len = 0;

--- a/sw/freertos/src/main.c
+++ b/sw/freertos/src/main.c
@@ -29,7 +29,7 @@
 #include <em_cmu.h>
 #include <sleep.h>

-#include <apps/menu.h>
+#include <apps/app_list.h>
 #include <drivers/buttons.h>
 #include <drivers/lcd.h>
 #include <drivers/rtc.h>