Move setting_t declaration to settings.h

5560e971 · Theodor-Adrian Stana · 81a5945e · 5560e971 · 5560e971 · 5560e971
Commit 5560e971 authored Oct 04, 2014 by Theodor-Adrian Stana
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

menu_struct.h sw/freertos/src/apps/menu_struct.h +1 -6

settings.c sw/freertos/src/apps/settings/settings.c +2 -2

settings.h sw/freertos/src/apps/settings/settings.h +6 -1

No files found.
--- a/sw/freertos/src/apps/menu_struct.h
+++ b/sw/freertos/src/apps/menu_struct.h
@@ -29,6 +29,7 @@
 #include "application.h"
 #include "bitmaps.h"
+#include "settings/settings.h"
 /**
 * @brief Type of menu entry.
@@ -40,12 +41,6 @@ enum entry_type {
    END         // sentinel, should be put as the last entry
 };
-typedef struct setting {
-    char name[16];
-    uint32_t val;
-    uint32_t valmod;
-} setting_t;
 /**
 * @brief Structure that represents a single
 * entry - either application or submenu.

--- a/sw/freertos/src/apps/settings/settings.c
+++ b/sw/freertos/src/apps/settings/settings.c
@@ -30,11 +30,11 @@ setting_t setting_coord_style = {"Coord style", 1, 3};
 void setting_change(setting_t *setting)
 {
-    uint32_t v = setting->val;
+    int v = setting->val;
    char s[16];
    v++;
-    v %= setting->valmod;
+    v %= setting->nrvals;
    sprintf(s, ": %d", v);

--- a/sw/freertos/src/apps/settings/settings.h
+++ b/sw/freertos/src/apps/settings/settings.h
@@ -29,7 +29,12 @@
 #define SETTINGS_H
 #include "application.h"
-#include "menu_struct.h"
+typedef struct setting {
+    char name[16];
+    int val;
+    int nrvals;
+} setting_t;
 extern application set_time;
 extern application set_date;