Renamed Application to application.

526dd049 · Projects · 931f04b8 · 526dd049 · 526dd049 · 526dd049
Commit 526dd049 authored Aug 21, 2014 by Projects
6 changed files
--- a/sw/freertos/src/apps/application.c
+++ b/sw/freertos/src/apps/application.c
@@ -39,7 +39,7 @@

 xQueueHandle appQueue;

-void startMain(Application* app) {
+void startMain(application* app) {
    appQueue = xQueueCreate(APP_QUEUE_LEN, sizeof(struct event));
    if(!appQueue) {
        // TODO oops..

--- a/sw/freertos/src/apps/application.h
+++ b/sw/freertos/src/apps/application.h
@@ -51,14 +51,14 @@ typedef struct {
     * @params Optional parameters, dependendent on application.
     */
    void (*main)(void* params); 
-} Application;
+} application;

 /**
 * @brief Initializes the application task and event queue.
 * After that runs one as the main application.
 * @param app is the application to be run as the main one.
 */
-void startMain(Application* app);
+void startMain(application* app);

 #endif /* APPLICATION_H */

--- a/sw/freertos/src/apps/clock.c
+++ b/sw/freertos/src/apps/clock.c
@@ -109,7 +109,7 @@ void clock_main(void* params) {
    }
 }

-Application clock = {
+application clock = {
    .name = "Clock",
    .main = clock_main
 };

--- a/sw/freertos/src/apps/clock.h
+++ b/sw/freertos/src/apps/clock.h
@@ -24,7 +24,12 @@
 * Clock application.
 */

+#ifndef CLOCK_H
+#define CLOCK_H
+
 #include "application.h"

-extern Application clock;
+extern application clock;
+
+#endif /* CLOCK_H */

--- a/sw/freertos/src/apps/menu.c
+++ b/sw/freertos/src/apps/menu.c
@@ -70,7 +70,7 @@ struct ui_widget menu_screen = {
    WF_ACTIVE | WF_VISIBLE
 };

-static void run(Application *app) {
+static void run(application *app) {
    // Run the application
    app->main(NULL);

@@ -110,7 +110,7 @@ void menu_main(void* params) {
    }
 }

-Application menu = {
+application menu = {
    .name = "Menu",
    .main = menu_main
 };

--- a/sw/freertos/src/apps/menu.h
+++ b/sw/freertos/src/apps/menu.h
@@ -24,7 +24,12 @@
 * Menu application.
 */

+#ifndef MENU_H
+#define MENU_H
+
 #include "application.h"

-extern Application menu;
+extern application menu;
+
+#endif /* MENU_H */