Ryan Scott
menu system menus complete
Fork of
menuSystemMbed
by 
Brad Smith
Revision 3:bdf42b6c15f4, committed 2013-03-08
- Comitter:
- Rybowonder
- Date:
- Fri Mar 08 17:37:11 2013 +0000
- Parent:
- 1:a3b65af969d4
- Commit message:
- menus complete
Changed in this revision
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_AGCPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_AGCPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,67 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+
+int AGCPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[AGC].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[AGC].erase();
+ printXY(" ", 5, 10);
+ userSelection = RECORDSET;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[AGC].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[AGC].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[AGC].getHighlightedItem() ;
+ break;
+ }//eo select
+
+ if (userSelection != 0 && userSelection != RECORDSET)
+ {
+ // place code here to handle actions processed directly from this page
+ switch(userSelection)
+ {
+ case AGCON:
+ printXY("AGC is On ", 5, 10);
+ //call function to perform task
+ break;
+ case AGCOFF:
+ printXY("AGC is Off ",5,10);
+ //call function to perform task
+ break;
+ }
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_ContrastPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_ContrastPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,67 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+
+int ContrastPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[CONTRAST].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[CONTRAST].erase();
+ printXY(" ", 5, 10);
+ userSelection = SCREENSET;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[CONTRAST].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[CONTRAST].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[CONTRAST].getHighlightedItem() ;
+ break;
+ }//eo select
+
+ if (userSelection != 0 && userSelection != SCREENSET)
+ {
+ // place code here to handle actions processed directly from this page
+ switch(userSelection)
+ {
+ case CONTRASTUP:
+ printXY("Contrast +1 ", 5, 10);
+ //call function to perform task
+ break;
+ case CONTRASTDOWN:
+ printXY("Contrast -1 ",5,10);
+ //call function to perform task
+ break;
+ }
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_DeletetrackPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_DeletetrackPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,66 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+
+int DeletetrackPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[DELETESCR].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[DELETESCR].erase();
+ printXY(" ", 5, 10); //erases the ACTION prompt
+ userSelection = PLAYBACK;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[DELETESCR].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[DELETESCR].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[DELETESCR].getHighlightedItem() ;
+ break;
+ }//eo select
+
+ // is the user selection an ACTION assigned to this page
+ if (userSelection != 0 && userSelection > DELETETRACKOFFSET ) //page selections are 0 through 12
+ {
+ // place code here to handle actions processed directly from this page
+ switch(userSelection)
+ {
+
+ case EX_DELETETRACK:
+ printXY("Example Track selected ", 5, 10); // Discuss with Brad ************---------------**************---------*************
+ //call function to perform task
+ break;
+ }
+
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_FilterPage.cpp --- a/HANDLER_FilterPage.cpp Thu Feb 28 00:42:06 2013 +0000 +++ b/HANDLER_FilterPage.cpp Fri Mar 08 17:37:11 2013 +0000 @@ -5,7 +5,7 @@ #include "console.h" extern BusInOut switches; //(p21, p22, p23, p24) -extern MainMenu pageMenu[12]; +extern MainMenu pageMenu[MAXPAGES ]; int FilterPageHandler()
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_HomePage.cpp
--- a/HANDLER_HomePage.cpp Thu Feb 28 00:42:06 2013 +0000
+++ b/HANDLER_HomePage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -5,7 +5,7 @@
extern BusInOut switches; //(p21, p22, p23, p24)
-extern MainMenu pageMenu[12];
+extern MainMenu pageMenu[MAXPAGES ];
int homePageHandler()
{
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_InputPage.cpp --- a/HANDLER_InputPage.cpp Thu Feb 28 00:42:06 2013 +0000 +++ b/HANDLER_InputPage.cpp Fri Mar 08 17:37:11 2013 +0000 @@ -5,7 +5,7 @@ #include "console.h" extern BusInOut switches; //(p21, p22, p23, p24) -extern MainMenu pageMenu[12]; +extern MainMenu pageMenu[MAXPAGES ]; int InputPageHandler()
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_OutputPage.cpp --- a/HANDLER_OutputPage.cpp Thu Feb 28 00:42:06 2013 +0000 +++ b/HANDLER_OutputPage.cpp Fri Mar 08 17:37:11 2013 +0000 @@ -5,7 +5,7 @@ #include "console.h" extern BusInOut switches; //(p21, p22, p23, p24) -extern MainMenu pageMenu[12]; +extern MainMenu pageMenu[MAXPAGES ]; int OutputPageHandler()
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_PlaybackmenuPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_PlaybackmenuPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,49 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+int PlaybackmenuPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[PLAYBACK].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[PLAYBACK].erase();
+ userSelection = HOME;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[PLAYBACK].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[PLAYBACK].highlightNextItem();
+ break;
+ case 0x07:
+ pageMenu[PLAYBACK].erase();
+ userSelection = pageMenu[PLAYBACK].getHighlightedItem() - PLAYBACKMENUOFFSET;
+ exitCurrentMenu = true;
+ break;
+ }//eo select
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_PlayscreenPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_PlayscreenPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,69 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES];
+
+
+int PlayscreenPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[PLAYSCR].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[PLAYSCR].erase();
+ printXY(" ", 5, 10); //erases the ACTION prompt
+ userSelection = PLAY;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[PLAYSCR].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[PLAYSCR].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[PLAYSCR].getHighlightedItem() ;
+ break;
+ }//eo select
+
+ // is the user selection an ACTION assigned to this page
+ if (userSelection != 0 && userSelection > PLAYSCROFFSET) //page selections are 0 through 12
+ {
+ // place code here to handle actions processed directly from this page
+
+ // TODO ask Brad about this section ******************---------------------*************
+ switch(userSelection)
+ {
+
+ case EX_PLAYTRACK :
+ printXY("Example Track selected ", 5, 10); //***********---------------***************------------********** Discuss with Brad
+ //call function to perform task
+ break;
+
+ }
+
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_PlaytrackPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_PlaytrackPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,67 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+
+int PlaytrackPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[PLAY].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[PLAY].erase();
+ printXY(" ", 5, 10); //erases the ACTION prompt
+ userSelection = PLAYBACK;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[PLAY].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[PLAY].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[PLAY].getHighlightedItem() ;
+ break;
+ }//eo select
+
+ // is the user selection an ACTION assigned to this page
+ if (userSelection != 0 && userSelection > PLAYTRACKOFFSET) //page selections are 0 through 12
+ {
+ // place code here to handle actions processed directly from this page
+ switch(userSelection)
+ {
+
+ case EX_PLAYTRACK :
+ printXY("Example Track selected ", 5, 10); //***********---------------***************------------********** Discuss with Brad
+ //call function to perform task
+ break;
+
+ }
+
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_RecordSettings.cpp
--- a/HANDLER_RecordSettings.cpp Thu Feb 28 00:42:06 2013 +0000
+++ b/HANDLER_RecordSettings.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -5,7 +5,7 @@
#include "console.h"
extern BusInOut switches; //(p21, p22, p23, p24)
-extern MainMenu pageMenu[12];
+extern MainMenu pageMenu[MAXPAGES ];
int RecordSettingsHandler()
{
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_RecordscreenPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_RecordscreenPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,69 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+
+int RecordscreenPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[RECORDSCR].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[RECORDSCR].erase();
+ printXY(" ", 5, 10); //erases the ACTION prompt
+ userSelection = HOME;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[RECORDSCR].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[RECORDSCR].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[RECORDSCR].getHighlightedItem() ;
+ break;
+ }//eo select
+
+ // is the user selection an ACTION assigned to this page
+ if (userSelection != 0 && userSelection > RECORDSCROFFSET) //page selections are 0 through 12
+ {
+ // place code here to handle actions processed directly from this page
+
+ // TODO ask Brad about this section ******************---------------------*************
+ switch(userSelection)
+ {
+
+ case EX_PLAYTRACK :
+ printXY("Example Track selected ", 5, 10); //***********---------------***************------------********** Discuss with Brad
+ //call function to perform task
+ break;
+
+ }
+
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_SamplingPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_SamplingPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,68 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+
+int SamplesPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[SAMPRATE].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[SAMPRATE].erase();
+ printXY(" ", 5, 10);
+ userSelection = RECORDSET;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[SAMPRATE].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[SAMPRATE].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[SAMPRATE].getHighlightedItem() ;
+ break;
+ }//eo select
+
+
+ if (userSelection != 0 && userSelection != RECORDSET)
+ {
+ // place code here to handle actions processed directly from this page
+ switch(userSelection)
+ {
+ case SPEED1:
+ printXY("44.1k Selected ", 5, 10);
+ //call function to perform task
+ break;
+ case SPEED2:
+ printXY("48k selected ",5,10);
+ //call function to perform task
+ break;
+ }
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_ScreensettingsPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_ScreensettingsPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,49 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+int ScreensettingsPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[SCREENSET].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[SCREENSET].erase();
+ userSelection = HOME;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[SCREENSET].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[SCREENSET].highlightNextItem();
+ break;
+ case 0x07:
+ pageMenu[SCREENSET].erase();
+ userSelection = pageMenu[SCREENSET].getHighlightedItem() - SCREENSETTINGSOFFSET;
+ exitCurrentMenu = true;
+ break;
+ }//eo select
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 HANDLER_WarningscreenPage.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/HANDLER_WarningscreenPage.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -0,0 +1,70 @@
+#include "mbed.h"
+
+#include "menuIDs.h"
+#include "MainMenu.h"
+#include "console.h"
+
+extern BusInOut switches; //(p21, p22, p23, p24)
+extern MainMenu pageMenu[MAXPAGES ];
+
+
+int WarningscreenPageHandler()
+{
+ int userSelection = 0;
+ pageMenu[WARNINGSCR].printMenu();
+
+ unsigned char lastState = 0x0f; //0000 1111
+ bool exitCurrentMenu = false;
+
+ while ( exitCurrentMenu == false)
+ {
+
+ unsigned char currentState = switches.read(); //reading a port add a AND MASK & 0b00000111
+ wait_ms(10);
+ if( currentState == switches.read() && currentState != lastState)
+ {
+ lastState = currentState;
+ switch(currentState)
+ {
+ case 0x0e:
+ pageMenu[WARNINGSCR].erase();
+ printXY(" ", 5, 10); //erases the ACTION prompt
+ userSelection = DELETESCR;
+ exitCurrentMenu = true;
+ break;
+ case 0x0d:
+ pageMenu[WARNINGSCR].highlightPrevItem();
+ break;
+ case 0x0b:
+ pageMenu[WARNINGSCR].highlightNextItem();
+ break;
+ case 0x07:
+ userSelection = pageMenu[WARNINGSCR].getHighlightedItem() ;
+ break;
+ }//eo select
+
+ // is the user selection an ACTION assigned to this page
+ if (userSelection != 0 && userSelection > WARNINGSCROFFSET) //page selections are 0 through 12
+ {
+ // place code here to handle actions processed directly from this page
+ switch(userSelection)
+ {
+ case DELETENO:
+ pageMenu[WARNINGSCR].erase();
+ printXY(" ", 5, 10); //erases the ACTION prompt
+ userSelection = DELETESCR;
+ exitCurrentMenu = true;
+ break;
+ case DELETEYES:
+ printXY("Track Deleted ",5,10);
+ //call function to perform task
+ break;
+ }
+ // eo place code here ......
+ userSelection = 0;
+ }
+ wait_ms(200);
+ }//eo if kbhit
+ }//eo while
+ return userSelection;
+}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 InitializeMenus.cpp
--- a/InitializeMenus.cpp Thu Feb 28 00:42:06 2013 +0000
+++ b/InitializeMenus.cpp Fri Mar 08 17:37:11 2013 +0000
@@ -3,7 +3,7 @@
#include "menuIDs.h"
#include "MainMenu.h"
-extern MainMenu pageMenu[12];
+extern MainMenu pageMenu[MAXPAGES ];
void initializeMenuSystem()
{
@@ -32,6 +32,43 @@
pageMenu[FILTER].setMenuItem(1, FILTER2, "High Pass", 5, 3);
pageMenu[FILTER].setMenuItem(2, FILTER3, "Band Pass", 5, 4);
pageMenu[FILTER].setMenuItem(3, FILTERNONE, "None", 5, 5);
- pageMenu[FILTER].setMaxItems(4);
-
+ pageMenu[FILTER].setMaxItems(4);
+
+ pageMenu[SAMPRATE].setMenuItem(0, SPEED1, "ON", 5, 2);
+ pageMenu[SAMPRATE].setMenuItem(1, SPEED2, "OFF", 5, 3);
+ pageMenu[SAMPRATE].setMaxItems(2);
+
+ pageMenu[AGC].setMenuItem(0, AGCON, "ON", 5, 2);
+ pageMenu[AGC].setMenuItem(1, AGCOFF, "OFF", 5, 3);
+ pageMenu[AGC].setMaxItems(2);
+
+ pageMenu[PLAYBACK].setMenuItem(0, PLAYTRACK, "Play Saved Tracks", 5, 2);
+ pageMenu[PLAYBACK].setMenuItem(1, DELETETRACK, "Delete Saved Tracks", 5, 3);
+ pageMenu[PLAYBACK].setMaxItems(2);
+
+ pageMenu[PLAY].setMenuItem(0, EX_PLAYTRACK, "Example track", 5, 2);
+ pageMenu[PLAY].setMaxItems(1);
+
+ pageMenu[DELETESCR].setMenuItem(0, EX_DELETETRACK, "Example track", 5, 2);
+ pageMenu[DELETESCR].setMaxItems(1);
+
+ pageMenu[SCREENSET].setMenuItem(0, CONTRAST, "Contrast", 5, 2);
+ pageMenu[SCREENSET].setMaxItems(1);
+
+ pageMenu[CONTRAST].setMenuItem(0, CONTRASTUP, "Increase Contrast", 5, 2);
+ pageMenu[CONTRAST].setMenuItem(1, CONTRASTDOWN , "Decrease Contrast", 5, 3);
+ pageMenu[CONTRAST].setMaxItems(2);
+
+// pageMenu[PLAYSCR].setMenuItem(0, CONTRASTUP, "Increase Contrast", 5, 2);
+// pageMenu[PLAYSCR].setMenuItem(1, CONTRASTDOWN , "Decrease Contrast", 5, 3);
+// pageMenu[PLAYSCR].setMaxItems(2);
+
+ pageMenu[WARNINGSCR].setMenuItem(0, DELETENO, "Delete Track", 5, 2);
+ pageMenu[WARNINGSCR].setMenuItem(1, DELETEYES , "DO NOT Delete", 5, 3);
+ pageMenu[WARNINGSCR].setMaxItems(2);
+
+// pageMenu[RECORDSCR].setMenuItem(0, CONTRASTUP, "Increase Contrast", 5, 2);
+// pageMenu[RECORDSCR].setMenuItem(1, CONTRASTDOWN , "Decrease Contrast", 5, 3);
+// pageMenu[RECORDSCR].setMaxItems(2);
+
}
\ No newline at end of file
diff -r a3b65af969d4 -r bdf42b6c15f4 menuIDs.h --- a/menuIDs.h Thu Feb 28 00:42:06 2013 +0000 +++ b/menuIDs.h Fri Mar 08 17:37:11 2013 +0000 @@ -1,52 +1,97 @@ -#ifndef __menuSystem__MenuIDs__ -#define __menuSystem__MenuIDs__ +#ifndef __menuSystem__MenuIDs__ +#define __menuSystem__MenuIDs__ -#define UNASSIGNED 99 - +#define UNASSIGNED 99 +#define MAXPAGES 15 //PAGE IDs -#define HOME 0 -#define RECORDSET 1 -#define OUTPUT 2 -#define INPUT 3 -#define FILTER 4 -#define SAMPRATE 5 -#define AGC 6 -#define PLAYBACK 7 -#define PLAY 8 -#define DELETESCR 9 -#define SCREENSET 10 -#define CONTRAST 11 +#define HOME 0 +#define RECORDSET 1 +#define OUTPUT 2 +#define INPUT 3 +#define FILTER 4 +#define SAMPRATE 5 // +#define AGC 6 // +#define PLAYBACK 7 // +#define PLAY 8 // +#define DELETESCR 9 // +#define SCREENSET 10 // +#define CONTRAST 11 // +#define PLAYSCR 12 // +#define WARNINGSCR 13 +#define RECORDSCR 14 //RECORD SETTINGS MENU IDs -#define RECSETOFFSET 100 -#define RECSETOUT 102 -#define RECSETIN 103 -#define RECSETFILTERS 104 -#define RECSETSAMPFRQ 105 -#define RECSETAGC 106 +#define RECSETOFFSET 100 +#define RECSETOUT 102 +#define RECSETIN 103 +#define RECSETFILTERS 104 +#define RECSETSAMPFRQ 105 +#define RECSETAGC 106 //OUTPUT MENU IDs -#define LINE 201 -#define HEADPHONES 202 -#define SPEAKERS 203 +#define LINE 201 +#define HEADPHONES 202 +#define SPEAKERS 203 //INPUT MENU IDs -#define INPUTOFFSET 300 -#define INMIC 301 -#define INLINE 302 +#define INPUTOFFSET 300 +#define INMIC 301 +#define INLINE 302 //FILTER MENU IDs -#define FILTEROFFSET 400 -#define FILTER1 401 -#define FILTER2 402 -#define FILTER3 403 -#define FILTERNONE 404 - - +#define FILTEROFFSET 400 +#define FILTER1 401 +#define FILTER2 402 +#define FILTER3 403 +#define FILTERNONE 404 +//SAMPRATE MENU IDSs +#define SAMPLINGOFFSET 500 +#define SPEED1 501 +#define SPEED2 502 + +//AGC MENU IDSs +#define AGCOFFSET 600 +#define AGCON 601 +#define AGCOFF 602 + +//PLAYBACK MENU IDSs +#define PLAYBACKMENUOFFSET 700 +#define PLAYTRACK 701 +#define DELETETRACK 702 + +//PLAY MENU +#define PLAYTRACKOFFSET 800 +#define EX_PLAYTRACK 801 +//Discuss with Brad ***-------------------------------***** + +//DELETESCR MENU +#define DELETETRACKOFFSET 900 +#define EX_DELETETRACK 901 +//Discuss with Brad ***--------------------------------***** + +//SCREENSET MENU +#define SCREENSETTINGSOFFSET 1000 +#define CONTRASTSELECT 1001 + +//CONTRAST SETTINGS MENU +#define CONTRASTOFFSET 1100 +#define CONTRASTUP 1101 +#define CONTRASTDOWN 1102 + +//PLAYSCR MENU +#define PLAYSCROFFSET 1200 + +//WARNINGSCR MENU +#define WARNINGSCROFFSET 1300 +#define DELETENO 1301 +#define DELETEYES 1302 + +//RECORDSCR MENU +#define RECORDSCROFFSET 1400 #endif \ No newline at end of file