Luke Cartwright / Mbed 2 deprecated ELEC2645_Project_el18loc_nearlythere

Dependencies:   mbed

Revision:
8:f305ea78b2b1
Parent:
7:33cb5f2db1ee
Child:
9:f6ba53e355a0
--- a/main.cpp	Tue May 05 14:32:04 2020 +0000
+++ b/main.cpp	Tue May 05 16:46:01 2020 +0000
@@ -12,29 +12,28 @@
 */
 
 /* TO DO:
-LEDS INSTALL
-pass variables between functions using pointers
+add Menu functionality from front.cpp
+front.h warning sort
 Settings tab
 Other wavetables
 Generate sound
 ADSR
-Startup.h
-
+MIDI
+LEDS INSTALL
 */
 // Includes
 #include "mbed.h"
 #include "Gamepad.h"
 #include "N5110.h"
-#include "menu.h"
+#include "Menu.h"
 #include "startup.h"
 #include "Front.h"
 
 // Objects
 Gamepad pad;
 N5110 lcd;
-menu menu;
+Menu menu;
 startup start;
-//Front front;
 Ticker down;
 Ticker period;
 
@@ -64,7 +63,7 @@
     printf("RUNNING CODE \n");
     start.initialise(lcd,pad); //initialises board and displays start screen
     menu.mainmenu(lcd,pad);
-    //menu.mainmenu(lcd, pad); //generates main menu
+    //Menu.mainmenu(lcd, pad); //generates main menu
     //squareWave(); //generates pulse wave modulated by sin wave
     //sinspeak();
 }