foldering

This commit is contained in:
bouletmarc 2016-09-04 14:58:57 -04:00 committed by GitHub
parent cf496e4e9b
commit 8e9faf36ae
1 changed files with 479 additions and 479 deletions

View File

@ -1,480 +1,480 @@
void CheckForInput() { void CheckForInput() {
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
if(currentMillis - previousMillis > interval) { if(currentMillis - previousMillis > interval) {
TouchSomething = false; TouchSomething = false;
} }
while (myTouch.dataAvailable() == true && TouchSomething == false) { while (myTouch.dataAvailable() == true && TouchSomething == false) {
myTouch.read(); myTouch.read();
long x = myTouch.getX(); long x = myTouch.getX();
long y = myTouch.getY(); long y = myTouch.getY();
if ((x!=-1) and (y!=-1)){ if ((x!=-1) and (y!=-1)){
//lcd_menu = 1 MainMenu //lcd_menu = 1 MainMenu
//lcd_menu = 2 Programming //lcd_menu = 2 Programming
//lcd_menu = 3 Display //lcd_menu = 3 Display
//lcd_menu = 4 Customize //lcd_menu = 4 Customize
//lcd_menu = 5 BeeM*R //lcd_menu = 5 BeeM*R
//lcd_menu = 6 SelectionMenu (for Rpm, time, etc) #USED FOR BEEM*R VARIABLES //lcd_menu = 6 SelectionMenu (for Rpm, time, etc) #USED FOR BEEM*R VARIABLES
//lcd_menu = 7 Board SelectionMenu (for X,Y Tables Values, etc) //lcd_menu = 7 Board SelectionMenu (for X,Y Tables Values, etc)
//lcd_menu = 8 SelectionMenu (for Rpm, time, etc) #USED FOR DATALOGGER BOARDS //lcd_menu = 8 SelectionMenu (for Rpm, time, etc) #USED FOR DATALOGGER BOARDS
//lcd_menu = 9 SelectionMenu (for Log, X&Y, Str) #USED FOR DATALOGGER BOARDS //lcd_menu = 9 SelectionMenu (for Log, X&Y, Str) #USED FOR DATALOGGER BOARDS
//lcd_menu = 10 Boards Diplays //lcd_menu = 10 Boards Diplays
//lcd_menu = 11 Load Presets //lcd_menu = 11 Load Presets
//#################### START MENU ##################### //#################### START MENU #####################
//Change From Start Menu to Main //Change From Start Menu to Main
if (lcd_menu == 0 && readyopen) { if (lcd_menu == 0 && readyopen) {
lcd_menu = 1; lcd_menu = 1;
PopMainMenu(); PopMainMenu();
TouchSomething = true; TouchSomething = true;
} }
//################### MAIN MENU ##################### //################### MAIN MENU #####################
if (lcd_menu == 1) { if (lcd_menu == 1) {
//Change From Main To Display //Change From Main To Display
if (x > 40 && x < 280 && y > 50 && y < 80 && TouchSomething == false) { if (x > 40 && x < 280 && y > 50 && y < 80 && TouchSomething == false) {
lcd_menu = 3; lcd_menu = 3;
PopDisplayMenu(); PopDisplayMenu();
TouchSomething = true; TouchSomething = true;
} }
//Change From Main To Programming //Change From Main To Programming
if (x > 40 && x < 280 && y > 90 && y < 120 && TouchSomething == false) { if (x > 40 && x < 280 && y > 90 && y < 120 && TouchSomething == false) {
lcd_menu = 2; lcd_menu = 2;
PopProgrammingMenu(); PopProgrammingMenu();
TouchSomething = true; TouchSomething = true;
} }
//Change From Main To BeeM*R //Change From Main To BeeM*R
if (x > 40 && x < 280 && y > 130 && y < 160 && TouchSomething == false) { if (x > 40 && x < 280 && y > 130 && y < 160 && TouchSomething == false) {
lcd_menu = 5; lcd_menu = 5;
PopBeeMRMenu(); PopBeeMRMenu();
TouchSomething = true; TouchSomething = true;
} }
} }
//################## BACK BUTTON #################### //################## BACK BUTTON ####################
if (x > 0 && x < 44 && y > 220 && y <= 239 && lcd_menu >= 2 && lcd_menu != 6 && TouchSomething == false) { if (x > 0 && x < 44 && y > 220 && y <= 239 && lcd_menu >= 2 && lcd_menu != 6 && TouchSomething == false) {
if (lcd_menu != 7) { if (lcd_menu != 7) {
//Go to Main Menu //Go to Main Menu
lcd_menu = 1; lcd_menu = 1;
PopMainMenu(); PopMainMenu();
} else { } else {
//Got to Datalogger //Got to Datalogger
lcd_menu = 2; lcd_menu = 2;
PopProgrammingMenu(); PopProgrammingMenu();
} }
TouchSomething = true; TouchSomething = true;
} }
//################ DATALOGGER MODE SELECTION ################## //################ DATALOGGER MODE SELECTION ##################
if (lcd_menu == 2) { if (lcd_menu == 2) {
//Pop Tables Selection //Pop Tables Selection
if (x > 15 && x < 230 && y > 70 && y <= 100 && TouchSomething == false) { if (x > 15 && x < 230 && y > 70 && y <= 100 && TouchSomething == false) {
lcd_menu = 7; lcd_menu = 7;
Prog_BoardType = 1; Prog_BoardType = 1;
PopProgSelectionMenu(); PopProgSelectionMenu();
TouchSomething = true; TouchSomething = true;
} }
//Pop Graphics Selection //Pop Graphics Selection
if (x > 15 && x < 230 && y > 150 && y <= 180 && TouchSomething == false) { if (x > 15 && x < 230 && y > 150 && y <= 180 && TouchSomething == false) {
lcd_menu = 7; lcd_menu = 7;
Prog_BoardType = 2; Prog_BoardType = 2;
PopProgSelectionMenu(); PopProgSelectionMenu();
TouchSomething = true; TouchSomething = true;
} }
} }
//################ DATALOGGER SELECTION ################## //################ DATALOGGER SELECTION ##################
if (lcd_menu == 7) { if (lcd_menu == 7) {
//Pop Rows Selection //Pop Rows Selection
if (x > 16 && x < 158 && y >= 52 && y <= 68 && TouchSomething == false) { if (x > 16 && x < 158 && y >= 52 && y <= 68 && TouchSomething == false) {
lcd_menu = 8; lcd_menu = 8;
if (Prog_BoardType == 1) { if (Prog_BoardType == 1) {
CurrentSelection = 10; CurrentSelection = 10;
PopIntSelectionMenu(Prog_Rows); PopIntSelectionMenu(Prog_Rows);
} else { } else {
CurrentSelection = 14; CurrentSelection = 14;
PopIntSelectionMenu(Prog_YMin); PopIntSelectionMenu(Prog_YMin);
} }
TouchSomething = true; TouchSomething = true;
} }
//Pop Cols Selection //Pop Cols Selection
if (x > 16 && x < 158 && y >= 74 && y <= 90 && TouchSomething == false) { if (x > 16 && x < 158 && y >= 74 && y <= 90 && TouchSomething == false) {
lcd_menu = 8; lcd_menu = 8;
if (Prog_BoardType == 1) { if (Prog_BoardType == 1) {
CurrentSelection = 11; CurrentSelection = 11;
PopIntSelectionMenu(Prog_Cols); PopIntSelectionMenu(Prog_Cols);
} else { } else {
CurrentSelection = 15; CurrentSelection = 15;
PopIntSelectionMenu(Prog_YMax); PopIntSelectionMenu(Prog_YMax);
} }
TouchSomething = true; TouchSomething = true;
} }
//Pop Log Selection //Pop Log Selection
if (x > 162 && x < 304 && y >= 52 && y <= 68 && TouchSomething == false) { if (x > 162 && x < 304 && y >= 52 && y <= 68 && TouchSomething == false) {
CurrentSelection = 16; CurrentSelection = 16;
lcd_menu = 9; lcd_menu = 9;
Prog_BoardMode = 1; Prog_BoardMode = 1;
PopStringSelectionMenu(Prog_Log_Value); PopStringSelectionMenu(Prog_Log_Value);
TouchSomething = true; TouchSomething = true;
} }
//Pop Board Display Menu //Pop Board Display Menu
if (x > 16 && x < 158 && y >= 186 && y <= 214 && TouchSomething == false) { if (x > 16 && x < 158 && y >= 186 && y <= 214 && TouchSomething == false) {
lcd_menu = 10; lcd_menu = 10;
PopBoardDisplayMenu(); PopBoardDisplayMenu();
TouchSomething = true; TouchSomething = true;
} }
//TABLES BOARD SELECTION ONLY HERE //TABLES BOARD SELECTION ONLY HERE
if (Prog_BoardType == 1) { if (Prog_BoardType == 1) {
//Pop XMin Selection //Pop XMin Selection
if (x > 16 && x < 158 && y >= 96 && y <= 112 && TouchSomething == false) { if (x > 16 && x < 158 && y >= 96 && y <= 112 && TouchSomething == false) {
CurrentSelection = 12; CurrentSelection = 12;
lcd_menu = 8; lcd_menu = 8;
PopIntSelectionMenu(Prog_XMin); PopIntSelectionMenu(Prog_XMin);
TouchSomething = true; TouchSomething = true;
} }
//Pop XMax Selection //Pop XMax Selection
if (x > 16 && x < 158 && y >= 116 && y <= 134 && TouchSomething == false) { if (x > 16 && x < 158 && y >= 116 && y <= 134 && TouchSomething == false) {
CurrentSelection = 13; CurrentSelection = 13;
lcd_menu = 8; lcd_menu = 8;
PopIntSelectionMenu(Prog_XMax); PopIntSelectionMenu(Prog_XMax);
TouchSomething = true; TouchSomething = true;
} }
//Pop YMin Selection //Pop YMin Selection
if (x > 16 && x < 158 && y >= 140 && y <= 156 && TouchSomething == false) { if (x > 16 && x < 158 && y >= 140 && y <= 156 && TouchSomething == false) {
CurrentSelection = 14; CurrentSelection = 14;
lcd_menu = 8; lcd_menu = 8;
PopIntSelectionMenu(Prog_YMin); PopIntSelectionMenu(Prog_YMin);
TouchSomething = true; TouchSomething = true;
} }
//Pop YMax Selection //Pop YMax Selection
if (x > 16 && x < 158 && y >= 162 && y <= 178 && TouchSomething == false) { if (x > 16 && x < 158 && y >= 162 && y <= 178 && TouchSomething == false) {
CurrentSelection = 15; CurrentSelection = 15;
lcd_menu = 8; lcd_menu = 8;
PopIntSelectionMenu(Prog_YMax); PopIntSelectionMenu(Prog_YMax);
TouchSomething = true; TouchSomething = true;
} }
//Pop X Selection //Pop X Selection
if (x > 162 && x < 304 && y >= 74 && y <= 90 && TouchSomething == false) { if (x > 162 && x < 304 && y >= 74 && y <= 90 && TouchSomething == false) {
CurrentSelection = 17; CurrentSelection = 17;
lcd_menu = 9; lcd_menu = 9;
Prog_BoardMode = 0; Prog_BoardMode = 0;
PopStringSelectionMenu(Prog_X_ID); PopStringSelectionMenu(Prog_X_ID);
TouchSomething = true; TouchSomething = true;
} }
//Pop Y Selection //Pop Y Selection
if (x > 162 && x < 304 && y >= 96 && y <= 112 && TouchSomething == false) { if (x > 162 && x < 304 && y >= 96 && y <= 112 && TouchSomething == false) {
CurrentSelection = 18; CurrentSelection = 18;
lcd_menu = 9; lcd_menu = 9;
Prog_BoardMode = 0; Prog_BoardMode = 0;
PopStringSelectionMenu(Prog_Y_ID); PopStringSelectionMenu(Prog_Y_ID);
TouchSomething = true; TouchSomething = true;
} }
//Pop Load Preset Menu //Pop Load Preset Menu
if (x > 162 && x < 304 && y >= 220 && y <= 239 && TouchSomething == false) { if (x > 162 && x < 304 && y >= 220 && y <= 239 && TouchSomething == false) {
lcd_menu = 11; lcd_menu = 11;
PopPresetSelectionMenu(); PopPresetSelectionMenu();
TouchSomething = true; TouchSomething = true;
} }
} }
} }
//################ PRESET SELECTION ################## //################ PRESET SELECTION ##################
if (lcd_menu == 11) { if (lcd_menu == 11) {
//Select#1 //Select#1
if (x > 60 && x < 260 && y >= 120 && y <= 142 && TouchSomething == false) { if (x > 60 && x < 260 && y >= 120 && y <= 142 && TouchSomething == false) {
lcd_menu = 7; lcd_menu = 7;
SetPreset(1); SetPreset(1);
PopProgSelectionMenu(); PopProgSelectionMenu();
TouchSomething = true; TouchSomething = true;
} }
//Select#2 //Select#2
if (x > 60 && x < 260 && y >= 144 && y <= 164 && TouchSomething == false) { if (x > 60 && x < 260 && y >= 144 && y <= 164 && TouchSomething == false) {
lcd_menu = 7; lcd_menu = 7;
SetPreset(2); SetPreset(2);
PopProgSelectionMenu(); PopProgSelectionMenu();
TouchSomething = true; TouchSomething = true;
} }
//Select#3 //Select#3
if (x > 60 && x < 260 && y >= 166 && y <= 187 && TouchSomething == false) { if (x > 60 && x < 260 && y >= 166 && y <= 187 && TouchSomething == false) {
lcd_menu = 7; lcd_menu = 7;
SetPreset(3); SetPreset(3);
PopProgSelectionMenu(); PopProgSelectionMenu();
TouchSomething = true; TouchSomething = true;
} }
//Select#4 //Select#4
if (x > 60 && x < 260 && y >= 189 && y <= 210 && TouchSomething == false) { if (x > 60 && x < 260 && y >= 189 && y <= 210 && TouchSomething == false) {
lcd_menu = 7; lcd_menu = 7;
SetPreset(4); SetPreset(4);
PopProgSelectionMenu(); PopProgSelectionMenu();
TouchSomething = true; TouchSomething = true;
} }
} }
//################ BeeM*R OPTIONS ################## //################ BeeM*R OPTIONS ##################
//Disable or Enable Launch Control //Disable or Enable Launch Control
if (lcd_menu == 5) { if (lcd_menu == 5) {
//Disable or Enable BeeM*R //Disable or Enable BeeM*R
if (x > 12 && x < 80 && y > 56 && y <= 70 && TouchSomething == false) { if (x > 12 && x < 80 && y > 56 && y <= 70 && TouchSomething == false) {
if (BeeMREnabled) { if (BeeMREnabled) {
BeeMREnabled = false; BeeMREnabled = false;
} else { } else {
BeeMREnabled = true; BeeMREnabled = true;
} }
PopBeeMRMenu(); PopBeeMRMenu();
TouchSomething = true; TouchSomething = true;
} }
if (BeeMREnabled) { if (BeeMREnabled) {
//Disable or Enable Launch Control //Disable or Enable Launch Control
if (x > 12 && x < 145 && y > 76 && y <= 90 && TouchSomething == false) { if (x > 12 && x < 145 && y > 76 && y <= 90 && TouchSomething == false) {
if (BeeMRLaunchEnabled) { if (BeeMRLaunchEnabled) {
BeeMRLaunchEnabled = false; BeeMRLaunchEnabled = false;
} else { } else {
BeeMRLaunchEnabled = true; BeeMRLaunchEnabled = true;
} }
PopBeeMRMenu(); PopBeeMRMenu();
TouchSomething = true; TouchSomething = true;
} }
//Change BeeM*R Mode //Change BeeM*R Mode
if (x > 110 && x < 308 && y > 56 && y <= 70 && TouchSomething == false) { if (x > 110 && x < 308 && y > 56 && y <= 70 && TouchSomething == false) {
if (BeeMRMode == 0) { if (BeeMRMode == 0) {
BeeMRMode = 1; BeeMRMode = 1;
} else { } else {
BeeMRMode = 0; BeeMRMode = 0;
} }
PopBeeMRMenu(); PopBeeMRMenu();
TouchSomething = true; TouchSomething = true;
} }
} }
} }
//################ BeeM*R SELECTION ################## //################ BeeM*R SELECTION ##################
if (lcd_menu == 5 && BeeMREnabled) { if (lcd_menu == 5 && BeeMREnabled) {
//Pop Vss Selection //Pop Vss Selection
if (x > 149 && x < 308 && y > 76 && y <= 90 && BeeMRLaunchEnabled && TouchSomething == false) { if (x > 149 && x < 308 && y > 76 && y <= 90 && BeeMRLaunchEnabled && TouchSomething == false) {
CurrentSelection = 1; CurrentSelection = 1;
lcd_menu = 6; lcd_menu = 6;
PopIntSelectionMenu(BeeMRLaunchVSS); PopIntSelectionMenu(BeeMRLaunchVSS);
TouchSomething = true; TouchSomething = true;
} }
//Pop Limiter Selection //Pop Limiter Selection
if (x > 12 && x < 160 && y > 102 && y <= 116 && TouchSomething == false) { if (x > 12 && x < 160 && y > 102 && y <= 116 && TouchSomething == false) {
CurrentSelection = 2; CurrentSelection = 2;
lcd_menu = 6; lcd_menu = 6;
PopIntSelectionMenu(BeeMRRevRPM); PopIntSelectionMenu(BeeMRRevRPM);
TouchSomething = true; TouchSomething = true;
} }
//Pop Launch Selection //Pop Launch Selection
if (x > 164 && x < 308 && y > 102 && y <= 116 && BeeMRLaunchEnabled && TouchSomething == false) { if (x > 164 && x < 308 && y > 102 && y <= 116 && BeeMRLaunchEnabled && TouchSomething == false) {
CurrentSelection = 3; CurrentSelection = 3;
lcd_menu = 6; lcd_menu = 6;
PopIntSelectionMenu(BeeMRLaunchRPM); PopIntSelectionMenu(BeeMRLaunchRPM);
TouchSomething = true; TouchSomething = true;
} }
//BEEMR MODE0 AND MODE1 OPTIONS //BEEMR MODE0 AND MODE1 OPTIONS
if (BeeMRMode == 0) { if (BeeMRMode == 0) {
//Pop Limiter Time Selection //Pop Limiter Time Selection
if (x > 12 && x < 218 && y > 120 && y <= 134 && TouchSomething == false) { if (x > 12 && x < 218 && y > 120 && y <= 134 && TouchSomething == false) {
CurrentSelection = 4; CurrentSelection = 4;
lcd_menu = 6; lcd_menu = 6;
PopIntSelectionMenu(BeeMRRevCutTime); PopIntSelectionMenu(BeeMRRevCutTime);
TouchSomething = true; TouchSomething = true;
} }
//Pop Launch Time Selection //Pop Launch Time Selection
if (x > 12 && x < 210 && y > 138 && y <= 152 && BeeMRLaunchEnabled && TouchSomething == false) { if (x > 12 && x < 210 && y > 138 && y <= 152 && BeeMRLaunchEnabled && TouchSomething == false) {
CurrentSelection = 5; CurrentSelection = 5;
lcd_menu = 6; lcd_menu = 6;
PopIntSelectionMenu(BeeMRLaunchCutTime); PopIntSelectionMenu(BeeMRLaunchCutTime);
TouchSomething = true; TouchSomething = true;
} }
} else if (BeeMRMode == 1) { } else if (BeeMRMode == 1) {
//Pop Limiter Cut Selection //Pop Limiter Cut Selection
if (x > 12 && x < 220 && y > 120 && y <= 134 && TouchSomething == false) { if (x > 12 && x < 220 && y > 120 && y <= 134 && TouchSomething == false) {
CurrentSelection = 6; CurrentSelection = 6;
lcd_menu = 6; lcd_menu = 6;
PopIntSelectionMenu(BeeMRRevCutRPM); PopIntSelectionMenu(BeeMRRevCutRPM);
TouchSomething = true; TouchSomething = true;
} }
//Pop Launch Cut Selection //Pop Launch Cut Selection
if (x > 12 && x < 212 && y > 138 && y <= 152 && BeeMRLaunchEnabled && TouchSomething == false) { if (x > 12 && x < 212 && y > 138 && y <= 152 && BeeMRLaunchEnabled && TouchSomething == false) {
CurrentSelection = 7; CurrentSelection = 7;
lcd_menu = 6; lcd_menu = 6;
PopIntSelectionMenu(BeeMRLaunchCutRPM); PopIntSelectionMenu(BeeMRLaunchCutRPM);
TouchSomething = true; TouchSomething = true;
} }
} }
} }
//################ SELECTION MENU ################## //################ SELECTION MENU ##################
if (lcd_menu == 6 | lcd_menu == 8 | lcd_menu == 9) { if (lcd_menu == 6 | lcd_menu == 8 | lcd_menu == 9) {
//Select #1 //Select #1
if (x > 60 && x < 126 && y > 120 && y <= 142) { if (x > 60 && x < 126 && y > 120 && y <= 142) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 1; TempValue1 = (TempValue1 * 10) + 1;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 0; TempValue1 = 0;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #2 //Select #2
if (x > 129 && x < 192 && y > 120 && y <= 142) { if (x > 129 && x < 192 && y > 120 && y <= 142) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 2; TempValue1 = (TempValue1 * 10) + 2;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 1; TempValue1 = 1;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #3 //Select #3
if (x > 194 && x < 260 && y > 120 && y <= 142) { if (x > 194 && x < 260 && y > 120 && y <= 142) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 3; TempValue1 = (TempValue1 * 10) + 3;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 2; TempValue1 = 2;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #4 //Select #4
if (x > 60 && x < 126 && y > 144 && y <= 164) { if (x > 60 && x < 126 && y > 144 && y <= 164) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 4; TempValue1 = (TempValue1 * 10) + 4;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 3; TempValue1 = 3;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #5 //Select #5
if (x > 129 && x < 192 && y > 144 && y <= 164) { if (x > 129 && x < 192 && y > 144 && y <= 164) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 5; TempValue1 = (TempValue1 * 10) + 5;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 4; TempValue1 = 4;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #6 //Select #6
if (x > 194 && x < 260 && y > 144 && y <= 164) { if (x > 194 && x < 260 && y > 144 && y <= 164) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 6; TempValue1 = (TempValue1 * 10) + 6;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 5; TempValue1 = 5;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//DONT SELECT #7 to #0 while in certain string Menu (datalogger X&Y menu) //DONT SELECT #7 to #0 while in certain string Menu (datalogger X&Y menu)
if (CurrentSelection != 17 && CurrentSelection != 18) { if (CurrentSelection != 17 && CurrentSelection != 18) {
//Select #7 //Select #7
if (x > 60 && x < 126 && y > 166 && y <= 187) { if (x > 60 && x < 126 && y > 166 && y <= 187) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 7; TempValue1 = (TempValue1 * 10) + 7;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 6; TempValue1 = 6;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #8 //Select #8
if (x > 129 && x < 192 && y > 166 && y <= 187) { if (x > 129 && x < 192 && y > 166 && y <= 187) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 8; TempValue1 = (TempValue1 * 10) + 8;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 7; TempValue1 = 7;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #9 //Select #9
if (x > 194 && x < 260 && y > 166 && y <= 187) { if (x > 194 && x < 260 && y > 166 && y <= 187) {
if (lcd_menu != 9) { if (lcd_menu != 9) {
TempValue1 = (TempValue1 * 10) + 9; TempValue1 = (TempValue1 * 10) + 9;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
} else { } else {
TempValue1 = 8; TempValue1 = 8;
StringSelectionMenuValText(TempValue1); StringSelectionMenuValText(TempValue1);
} }
TouchSomething = true; TouchSomething = true;
} }
//Select #0 //Select #0
if (x > 129 && x < 192 && y > 189 && y <= 210) { if (x > 129 && x < 192 && y > 189 && y <= 210) {
TempValue1 = (TempValue1 * 10); TempValue1 = (TempValue1 * 10);
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
TouchSomething = true; TouchSomething = true;
} }
//Select <-- //Select <--
if (x > 194 && x < 260 && y > 189 && y <= 210) { if (x > 194 && x < 260 && y > 189 && y <= 210) {
TempValue1 = 0; TempValue1 = 0;
SelectionMenuValText(TempValue1); SelectionMenuValText(TempValue1);
TouchSomething = true; TouchSomething = true;
} }
} }
//Select OK //Select OK
if (x > 60 && x < 126 && y > 189 && y <= 210) { if (x > 60 && x < 126 && y > 189 && y <= 210) {
//Set BeeM*R Menu Value //Set BeeM*R Menu Value
if (lcd_menu == 6) { if (lcd_menu == 6) {
if (CurrentSelection == 1) { if (CurrentSelection == 1) {
BeeMRLaunchVSS = TempValue1; BeeMRLaunchVSS = TempValue1;
} else if (CurrentSelection == 2) { } else if (CurrentSelection == 2) {
BeeMRRevRPM = TempValue1; BeeMRRevRPM = TempValue1;
} else if (CurrentSelection == 3) { } else if (CurrentSelection == 3) {
BeeMRLaunchRPM = TempValue1; BeeMRLaunchRPM = TempValue1;
} else if (CurrentSelection == 4) { } else if (CurrentSelection == 4) {
BeeMRRevCutTime = TempValue1; BeeMRRevCutTime = TempValue1;
} else if (CurrentSelection == 5) { } else if (CurrentSelection == 5) {
BeeMRLaunchCutTime = TempValue1; BeeMRLaunchCutTime = TempValue1;
} else if (CurrentSelection == 6) { } else if (CurrentSelection == 6) {
BeeMRRevCutRPM = TempValue1; BeeMRRevCutRPM = TempValue1;
} else if (CurrentSelection == 7) { } else if (CurrentSelection == 7) {
BeeMRLaunchCutRPM = TempValue1; BeeMRLaunchCutRPM = TempValue1;
} }
//Return Back to BeeM*R Menu //Return Back to BeeM*R Menu
lcd_menu = 5; lcd_menu = 5;
PopBeeMRMenu(); PopBeeMRMenu();
} }
//Set Datalogger Int Menu Value //Set Datalogger Int Menu Value
if (lcd_menu == 8) { if (lcd_menu == 8) {
if (CurrentSelection == 10) { if (CurrentSelection == 10) {
Prog_Rows = TempValue1; Prog_Rows = TempValue1;
} else if (CurrentSelection == 11) { } else if (CurrentSelection == 11) {
Prog_Cols = TempValue1; Prog_Cols = TempValue1;
} else if (CurrentSelection == 12) { } else if (CurrentSelection == 12) {
Prog_XMin = TempValue1; Prog_XMin = TempValue1;
} else if (CurrentSelection == 13) { } else if (CurrentSelection == 13) {
Prog_XMax = TempValue1; Prog_XMax = TempValue1;
} else if (CurrentSelection == 14) { } else if (CurrentSelection == 14) {
Prog_YMin = TempValue1; Prog_YMin = TempValue1;
} else if (CurrentSelection == 15) { } else if (CurrentSelection == 15) {
Prog_YMax = TempValue1; Prog_YMax = TempValue1;
} }
//Return Back to Board Menu //Return Back to Board Menu
lcd_menu = 7; lcd_menu = 7;
PopProgSelectionMenu(); PopProgSelectionMenu();
} }
//Set Datalogger String Menu Value //Set Datalogger String Menu Value
if (lcd_menu == 9) { if (lcd_menu == 9) {
if (CurrentSelection == 16) { if (CurrentSelection == 16) {
Prog_Log_Value = TempValue1; Prog_Log_Value = TempValue1;
} else if (CurrentSelection == 17) { } else if (CurrentSelection == 17) {
Prog_X_ID = TempValue1; Prog_X_ID = TempValue1;
} else if (CurrentSelection == 18) { } else if (CurrentSelection == 18) {
Prog_Y_ID = TempValue1; Prog_Y_ID = TempValue1;
} }
//Return Back to Board Menu //Return Back to Board Menu
lcd_menu = 7; lcd_menu = 7;
PopProgSelectionMenu(); PopProgSelectionMenu();
} }
TouchSomething = true; TouchSomething = true;
} }
} }
} }
//Set Timer for Touch Something //Set Timer for Touch Something
if (TouchSomething) { if (TouchSomething) {
previousMillis = currentMillis; previousMillis = currentMillis;
} }
} }
} }