Numerous changes

Author: dustinandrews

Arduino_LCD_Menu.ino

@@ -50,6 +50,28 @@ long g_timerTarget = 0;
 long g_autoReset = false;
 long g_stopMillis = 0;
 long g_startMillis = 0;
+
+byte g_smiley[8] = {
+  B00000,
+  B10001,
+  B00000,
+  B00000,
+  B10001,
+  B01110,
+  B00000,
+};
+
+byte g_frown[8] = {
+  B00000,
+  B10001,
+  B00000,
+  B00000,
+  B00000,
+  B01110,
+  B10001,
+};
+
+
 //end Global variables section
 
 //setupMenus
@@ -119,6 +141,11 @@ void setupMenus()
   g_menuManager.addSibling( new MenuEntry( "Credits", NULL, CreditsCallback) );
   //Make sure the menu is drawn correctly after all changes are done
   g_menuManager.DrawMenu();
+
+  g_menuManager.addSibling( new MenuEntry( "Draw Smiley", NULL, SmileyCallback) );
+  
+  g_menuLCD.getLCD()->createChar( 0, g_smiley );
+  g_menuLCD.getLCD()->createChar( 1, g_frown );
 }
 
 
@@ -273,3 +300,18 @@ void CreditsCallback( char* pMenuText, void *pUserData )
   g_isDisplaying = true;
 }  
 
+void SmileyCallback( char* pMenuText, void *pUserData )
+{
+  for( int i = 0; i < 10 ; ++i )
+  {
+    g_menuLCD.ClearLCD();
+    g_menuLCD.getLCD()->setCursor( 8,0 );
+    g_menuLCD.getLCD()->print( (char)0 );
+    delay(500);
+    g_menuLCD.ClearLCD();
+    g_menuLCD.getLCD()->setCursor( 8,0 );
+    g_menuLCD.getLCD()->print( (char)1 );
+    delay(500);
+  }   
+}
+

MenuEntry.h

@@ -27,6 +27,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
 
 typedef void (*MENU_ACTION_CALLBACK_FUNC)( char * pMenuText, void * pUserData );
 
+
+//To use these functions, pass a function pointer as the argument to the MenuEntry constructor.
+//pUserData should point to an unsigned int that will be set to true or false.
+void MenuEntry_BoolTrueCallbackFunc( char * pMenuText, void * pUserData );
+void MenuEntry_BoolFalseCallbackFunc( char * pMenuText, void * pUserData );
+
+//Use this callback function for a "Back" menu item for hardware that doesn't include a back button
+//pUserData should point to a MenfsuManager object.
+void MenuEntry_BackCallbackFunc( char * pMenuText, void * pUserData );
+
 //The MenuEntry class represents one menu item in the overall menu system, such as "Set Time" or "Back"
 //The MenuEntry classes point to each other to create a tree of menu items.  You can navigate
 // the classes using the get* calls.  MenuManager uses the get* calls to figure out what to draw to the LCD
@@ -57,6 +67,8 @@ class MenuEntry
   //This call will call the action callback for use when the menu item is selected.
   //if this menu entry has any children, the callback will not be executed.
   void ExecuteCallback();
+
+  bool isBackEntry() { return (m_callback == MenuEntry_BackCallbackFunc); }
 
 
   private:
@@ -69,14 +81,6 @@ class MenuEntry
   MenuEntry* m_prevSibling;
 };
 
-//To use these functions, pass a function pointer as the argument to the MenuEntry constructor.
-//pUserData should point to an unsigned int that will be set to true or false.
-void MenuEntry_BoolTrueCallbackFunc( char * pMenuText, void * pUserData );
-void MenuEntry_BoolFalseCallbackFunc( char * pMenuText, void * pUserData );
-
-//Use this callback function for a "Back" menu item for hardware that doesn't include a back button
-//pUserData should point to a MenfsuManager object.
-void MenuEntry_BackCallbackFunc( char * pMenuText, void * pUserData );
 
 
 #endif

MenuIntHelper.cpp

@@ -28,7 +28,7 @@ int MenuIntHelper::numIncrease()
 {
   //This function may have bugs when m_max is near the MAXINT limit 
   //but if your UI requires users to input MAXINT numbers, you have bigger problems.
-  if( m_curNum + m_step < m_max )
+  if( m_curNum + m_step <= m_max )
   {
     m_curNum += m_step;
   }

MenuLCD.cpp

@@ -18,7 +18,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
+#include <arduino.h>
 #include <LiquidCrystal.h>
 #include "MenuLCD.h"
 
@@ -36,34 +36,73 @@ MenuLCD::MenuLCD(int LCDRS, int LCDE, int LCDD4, int LCDD5, int LCDD6, int LCDD7
 
 bool MenuLCD::MenuLCDSetup()
 {
-  m_pLcd = new LiquidCrystal(m_LCDRS, m_LCDE, m_LCDD4, m_LCDD5, m_LCDD6, m_LCDD7);
-  m_pLcd->begin(m_characters, m_lines);
+  m_pLCD = new LiquidCrystal(m_LCDRS, m_LCDE, m_LCDD4, m_LCDD5, m_LCDD6, m_LCDD7);
+  m_pLCD->begin(m_characters, m_lines);
 }
 
 bool MenuLCD::PrintMenu( char* pString[], int nLines, int nSelectedLine = 0 )
 {
-  m_pLcd->clear();
+  m_pLCD->clear();
   for( int i =0; i < nLines; i++ )
 
   {
     if( i == nSelectedLine )
     {//this line should be surrounded by []
-       m_pLcd->setCursor(0, i);
-       m_pLcd->write( '[');
-       m_pLcd->setCursor(1,i);
-       m_pLcd->print( pString[i] );
-       m_pLcd->setCursor(m_characters - 1, i);
-       m_pLcd->write( ']');
+       m_pLCD->setCursor(0, i);
+       m_pLCD->write( '[');
+       m_pLCD->setCursor(1,i);
+       m_pLCD->print( pString[i] );
+       m_pLCD->setCursor(m_characters - 1, i);
+       m_pLCD->write( ']');
     }
     else
     {
-      m_pLcd->setCursor(0,i);
-      m_pLcd->print( pString[i] );
+      m_pLCD->setCursor(0,i);
+      m_pLCD->print( pString[i] );
     }
 
   }
 }
 
+void MenuLCD::WipeMenu( char* pString[], int nLines, MenuLCD::Direction dir )
+{
+  char lineBuff[ 256 ];  
+  m_pLCD->clear();
+  for( int i = 0; i < m_characters; ++i )
+  {
+    for( int j =0; j < nLines; ++j )
+    {
+      m_pLCD->setCursor( 0, j );
+      m_pLCD->setCursor(0,j);
+      if (strlen( pString[j] ) > i )
+      {
+        if( dir == LEFT )
+        {
+          strcpy(lineBuff, (pString[j] + i ) );
+          strcat(lineBuff, "  " );
+        }
+        else
+        {
+          lineBuff[0] = '\0';
+          for( int k = 0; k < i; ++k )
+          {
+            strcat(lineBuff, " " );
+          }
+          strcat(lineBuff, pString[j]);
+        }
+      }
+      else
+      {
+        strcpy(lineBuff, " " );
+      }
+      m_pLCD->print( lineBuff );
+      
+    }
+  delay(50);
+  }
+}
+
+
 bool MenuLCD::PrintLineRight( char* pString, int iRow )
 {
   //clear the line
@@ -72,11 +111,18 @@ bool MenuLCD::PrintLineRight( char* pString, int iRow )
   {
     buff[i] = ' ';
   }
-  m_pLcd->setCursor( 0, iRow );
-  m_pLcd->print( buff );
+  m_pLCD->setCursor( 0, iRow );
+  m_pLCD->print( buff );
   //now print the new number
-  m_pLcd->setCursor(m_characters - strlen(pString),iRow);
-  m_pLcd->print( pString );  
+  m_pLCD->setCursor(m_characters - strlen(pString),iRow);
+  m_pLCD->print( pString );  
+}
+
+bool MenuLCD::PrintLine( char* pString, int iRow )
+{
+  //clear the line
+  m_pLCD->setCursor( 0, iRow );
+  m_pLCD->print( pString );
 }
 
 int MenuLCD::getLines()
@@ -89,5 +135,11 @@ int MenuLCD::getCharacters()
 }
 void MenuLCD::ClearLCD()
 {
-  m_pLcd->clear();
+  m_pLCD->clear();
 }
+
+LiquidCrystal * MenuLCD::getLCD()
+{
+  return m_pLCD;
+}
+

MenuLCD.h

@@ -30,12 +30,20 @@ class MenuLCD
   bool MenuLCDSetup();
   bool PrintMenu( char ** pString, int nLines, int nSelectedLine /*= 0*/ );
   bool PrintLineRight( char* pString, int iRow );
+  bool PrintLine( char* pString, int iRow );
   int getLines();
   int getCharacters();
   void ClearLCD();
+  LiquidCrystal * getLCD();
+
+  enum Direction{ LEFT, RIGHT };
+
+
+  void WipeMenu( char* pString[], int nLines, MenuLCD::Direction dir );
+
 
   private:
-  LiquidCrystal* m_pLcd;
+  LiquidCrystal* m_pLCD;
   int m_LCDRS;
   int m_LCDE;
   int m_LCDD4;

MenuManager.cpp

@@ -19,6 +19,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
 */
 
 
+
 #include "MenuManager.h"
 #include "MenuEntry.h"
 
@@ -51,6 +52,26 @@ MenuEntry * MenuManager::getMenuRoot()
 }
 
 
+void MenuManager::WipeMenu( MenuLCD::Direction dir )
+{
+  if( dir == MenuLCD::LEFT )
+  {
+    for( int i = 0; i < m_pMenuLCD->getCharacters(); ++i )
+    { 
+      m_pMenuLCD->getLCD()->scrollDisplayLeft();
+      delay(75);
+    }
+  }
+  else
+  {
+    for( int i = 0; i < m_pMenuLCD->getCharacters(); ++i )
+    {
+      m_pMenuLCD->getLCD()->scrollDisplayRight();
+      delay(75);
+    }
+  }
+}
+
 
 void MenuManager::DrawMenu()
 {
@@ -83,13 +104,13 @@ void MenuManager::DoMenuAction( MENU_ACTION action )
     switch (action )
     {
       case MENU_ACTION_UP:
-        iNewNum = m_pMenuIntHelper->numIncrease();
+        iNewNum = m_pMenuIntHelper->numDecrease();
         itoa( iNewNum, buff, 10 );
         DrawInputRow( buff );
         *m_pInt = iNewNum;
         break;
       case MENU_ACTION_DOWN:
-        iNewNum = m_pMenuIntHelper->numDecrease();
+        iNewNum = m_pMenuIntHelper->numIncrease();
         itoa( iNewNum, buff, 10 );
         DrawInputRow( buff );
         *m_pInt = iNewNum;
@@ -161,19 +182,29 @@ void MenuManager::MenuSelect()
   MenuEntry *child = m_pCurrentMenuEntry->getChild();
   if( child != NULL )
   {
+    WipeMenu( MenuLCD::LEFT);
     m_pCurrentMenuEntry = child;
     DrawMenu();
   }
   else
   {
+    if( !m_pCurrentMenuEntry->isBackEntry() )
+    {
+      WipeMenu( MenuLCD::LEFT);
+    }
     m_pCurrentMenuEntry->ExecuteCallback();
+    if( !m_fDoingIntInput )
+    {
+      DrawMenu();
+    }
   }  
 }
 
 void MenuManager::MenuBack()
 {
   if( m_pCurrentMenuEntry->getParent() != NULL )
   {
+    WipeMenu( MenuLCD::RIGHT);
     m_pCurrentMenuEntry = m_pCurrentMenuEntry->getParent();
     DrawMenu();
   }

MenuManager.h

@@ -43,6 +43,9 @@ class MenuManager
   void DoIntInput( int iMin, int iMax, int iStart, int iSteps, char **label, int iLabelLines, int *pInt );
   void DrawInputRow( char *pString );
 
+  void WipeMenu( MenuLCD::Direction dir);
+
+
 
   private:
   MenuEntry* m_pRootMenuEntry;