ELEC2645 (2019/20) / Mbed 2 deprecated el18loc_final

Dependencies:   mbed

Revision:
31:cfdb014ff086
Parent:
30:08cc4ec58d07
--- a/Menu/Menu.h	Tue May 26 10:17:47 2020 +0000
+++ b/Menu/Menu.h	Tue May 26 14:21:36 2020 +0000
@@ -38,20 +38,15 @@
     */
     void subinstructions(N5110 &lcd, Gamepad &pad);
     
-    /** Credits submenu function
-    * @Runs Credits submenu code
-    */
-    void subcredits(N5110 &lcd, Gamepad &pad);
-    
     /** Settings submenu function
     * @Runs Settings submenu code
     */
     void subsettings(N5110 &lcd, Gamepad &pad);
     
-    /** Screen Mode adjust function
-    * @toggles inverse/normal mode
+    /** Credits submenu function
+    * @Runs Credits submenu code
     */
-    void inverse_mode(N5110 &lcd, Gamepad &pad);
+    void subcredits(N5110 &lcd, Gamepad &pad);
     
     /** Scrolling function
     * @Function controlling scrolling in menus
@@ -65,16 +60,21 @@
     */
     void volumerun(N5110 &lcd, Gamepad &pad);
     
+    /** Backlight adjust function
+    * @toggles Backlight
+    */
+    void backlightrun(N5110 &lcd, Gamepad &pad);
+    
     /** Contrast adjust function
     * @Runs Contrast adjustment code
     */
     void contrastrun(N5110 &lcd, Gamepad &pad);
     
-    /** Backlight adjust function
-    * @toggles Backlight
+    /** Screen Mode adjust function
+    * @toggles inverse/normal mode
     */
-    void backlightrun(N5110 &lcd, Gamepad &pad);
-
+    void inverse_mode(N5110 &lcd, Gamepad &pad);
+    
 private: //---------------------------------------------------------------------
     //Global Variables
     int g_selecty; //variable to manage select box y coordinate
@@ -89,8 +89,8 @@
     int s_1; //previous direction as int
     bool toggle; //Variable used for Backlight toggle 
 
-
     //Methods
+    
     /** Prints Main Menu to LCD */
     void printmainmenu(N5110 &lcd);
     
@@ -103,9 +103,6 @@
     /** Prints Contrast adjust screen to LCD */
     void printcontrast(N5110 &lcd, float contrast);
     
-    /**Prints if submenu par is unavailable */
-    void subunavailiable(N5110 &lcd); //prints error for sub
-    
     /**Function checks for joystick movement
     * @returns intiger value of scroll direction
     */