From e201de0d975f8ea50cf28998b2ea4c782c0c8969 Mon Sep 17 00:00:00 2001
From: mmi <mmi@05563f52-14a8-4384-a975-3d1654cca0fa>
Date: Tue, 17 Oct 2017 08:31:34 +0000
Subject: [PATCH] Update for TLA

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@254 05563f52-14a8-4384-a975-3d1654cca0fa
---
 .../0 - Code/hsb-mrts/inc/repairMenu.h        | 41 ++++++++++++++++++-
 .../0 - Code/hsb-mrts/src/repairMenu.c        | 36 +---------------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/repairMenu.h b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/repairMenu.h
index 1cacaa8..9203aae 100644
--- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/repairMenu.h	
+++ b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/inc/repairMenu.h	
@@ -49,7 +49,8 @@
 // Constant and macro definitions 
 // -----------------------------------------------------------------------------
 
-
+#define REPAIRMENU_MAX_NUMBER_OF_ROWS  (11)
+#define REPAIRMENU_MAX_NUMBER_OF_KEYS  (16)
 
 // -----------------------------------------------------------------------------
 // Type definitions. 
@@ -70,6 +71,42 @@ typedef enum
    NUMBER_OF_MENUS
 } T_MenuState;
 
+struct RepairMenu;
+typedef void (*RepairMenuFunctionCall)(struct RepairMenu* self, int cursorIndex);
+
+typedef enum
+{
+   NO_ACTION = 0,
+   HOTKEY_SELECT,
+   SELECT,
+   SCROLL_UP,
+   SCROLL_DOWN,
+   DIGIT_INSERT
+} T_KeyAction;
+
+struct MenuRow
+{
+   char text[20];
+   int newState;
+   RepairMenuFunctionCall actionPointer;
+};
+
+struct KeyActionBinding
+{
+   char key;
+   T_KeyAction action;
+   int argument;
+};
+
+
+struct MenuPage
+{
+   bool hasCursor;
+   int numberOfRows;
+   struct MenuRow row[REPAIRMENU_MAX_NUMBER_OF_ROWS];
+   struct KeyActionBinding keyActionBinding[REPAIRMENU_MAX_NUMBER_OF_KEYS];
+};
+
 struct RepairMenu
 {
    TaskHandle_t taskHandle;
@@ -87,7 +124,7 @@ struct RepairMenu
    struct RepairProcess repairProcess;
    const struct RepairPreset* repairPreset;
    struct RepairProcessParameters rpParameters;
-   static struct MenuPage menuArray[NUMBER_OF_MENUS];
+   struct MenuPage menuArray[NUMBER_OF_MENUS];
 };
 
 // -----------------------------------------------------------------------------
diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/repairMenu.c b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/repairMenu.c
index 9f7c41a..2ac13e7 100644
--- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/repairMenu.c	
+++ b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/repairMenu.c	
@@ -46,47 +46,13 @@
 
 #define MENU_HAS_CURSOR                (true)
 #define MENU_HAS_NO_CURSOR             (false)
-#define REPAIRMENU_MAX_NUMBER_OF_ROWS  (11)
-#define REPAIRMENU_MAX_NUMBER_OF_KEYS  (16)
+
 
 // -----------------------------------------------------------------------------
 // Type definitions
 // -----------------------------------------------------------------------------
 
-typedef void (*RepairMenuFunctionCall)(struct RepairMenu* self, int cursorIndex);
 
-typedef enum
-{
-   NO_ACTION = 0,
-   HOTKEY_SELECT,
-   SELECT,
-   SCROLL_UP,
-   SCROLL_DOWN,
-   DIGIT_INSERT
-} T_KeyAction;
-
-struct MenuRow
-{
-   char text[20];
-   int newState;
-   RepairMenuFunctionCall actionPointer;
-};
-
-struct KeyActionBinding
-{
-   char key;
-   T_KeyAction action;
-   int argument;
-};
-
-
-struct MenuPage
-{
-   bool hasCursor;
-   int numberOfRows;
-   struct MenuRow row[REPAIRMENU_MAX_NUMBER_OF_ROWS];
-   struct KeyActionBinding keyActionBinding[REPAIRMENU_MAX_NUMBER_OF_KEYS];
-};
 
 // -----------------------------------------------------------------------------
 // File-scope variables