ELEC2645 (2019/20) / Mbed 2 deprecated el18loc_final

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed

Diff: Menu/Menu.cpp

Revision:
12:7a399a476cfd
Parent:
8:f305ea78b2b1
Child:
13:27300c533dd1
--- a/Menu/Menu.cpp	Thu May 07 12:22:39 2020 +0000
+++ b/Menu/Menu.cpp	Fri May 08 20:08:36 2020 +0000
@@ -62,7 +62,12 @@
         s=scroll(lcd,pad);
         if (s==1) {
             printsubwaveforms(lcd);
+            submenu++;
         }
+        if (s==-1) {
+            printsubwaveforms(lcd);
+            submenu--;
+            }
         if (pad.A_pressed())  { //go back menu
             // printf("A pressed\n");
             printf("Submenu: %d selected\n", submenu); //debug
@@ -182,6 +187,7 @@
             }
             //printmainmenu(lcd); //reprints main
             //prntf("SubMenu= %d\n", submenu); //debug
+            return(-1);
         }
         if (d==1)  { //S scrolls down
             //printf("S \n");
@@ -193,9 +199,10 @@
             }
             //printmainmenu(lcd); //reprints menu
             //printf("SubMenu= %d\n", submenu); //debug
+            return(1);
         }
         wait_ms(200); //debounce
-        return(1);
+
     } else {
         return(0);
     }