Keypad Project
Dependencies: FPointer keypad mbed-rtos mbed
Revision 2:ad4d832c4399, committed 2015-11-18
- Comitter:
- bpp5046
- Date:
- Wed Nov 18 15:40:25 2015 +0000
- Parent:
- 1:8b931e33f8e3
- Commit message:
- donesky
Changed in this revision
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
diff -r 8b931e33f8e3 -r ad4d832c4399 main.cpp --- a/main.cpp Wed Nov 18 14:42:03 2015 +0000 +++ b/main.cpp Wed Nov 18 15:40:25 2015 +0000 @@ -51,7 +51,9 @@ } void menu(){ - PC.printf("1. DAC Input\n"); + + + PC.printf("\n1. DAC Input\n"); PC.printf("2. DigiPot Input\n"); PC.printf("3. ADC Input\n"); } @@ -60,14 +62,14 @@ { break1 = 0; Index = -1; - PC.printf("Select Start/Stop\n"); + PC.printf("\nSelect Start/Stop\n"); PC.printf("1. Start\n"); PC.printf("2. Stop\n"); PC.printf("Press # to go to main menu\n"); while (break1 != 1) { __wfi(); if (Index > -1) { - PC.printf("Index:%d => Key:%c\r\n", Index, Keytable[Index]); + input = Index + 1; switch (input){ case 1: @@ -110,7 +112,7 @@ { break1 = 0; Index = -1; - PC.printf("Select Waveform Type\n"); + PC.printf("\nSelect Waveform Type\n"); PC.printf("1. Turn Off\n"); PC.printf("2. 1 Hz Square Wave\n"); PC.printf("3. 10 Hz Square Wave\n"); @@ -121,7 +123,7 @@ while (break1 != 1) { __wfi(); if (Index > -1) { - PC.printf("Index:%d => Key:%c\r\n", Index, Keytable[Index]); + input = Index + 1; switch (input){ case 1: @@ -177,7 +179,7 @@ int DigiPot(){ break1 = 0; Index = -1; - PC.printf("Select Range\n"); + PC.printf("\nSelect Range\n"); PC.printf("1. Between 0 to 1\n"); PC.printf("2. Between 0 to 2\n"); PC.printf("3. Between 0 to 3\n"); @@ -187,7 +189,7 @@ while (break1 != 1) { __wfi(); if (Index > -1) { - PC.printf("Index:%d => Key:%c\r\n", Index, Keytable[Index]); + input = Index + 1; switch (input){ case 1: @@ -243,7 +245,8 @@ int main() { - PC.printf("Control Menu\r\n"); + + PC.printf("\nControl Menu\r\n"); menu(); // r0 r1 r2 r3 c0 c1 c2 c3 @@ -256,7 +259,7 @@ if (Index > -1) { - PC.printf("Index:%d => Key:%c\r\n", Index, Keytable[Index]); + group_num = Index + 1; switch (group_num){ case 1: