kemonine/arduino_universal_serial_adapter
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Proper selection of line speed

Browse source
This commit is contained in:
Mike C 2013-03-10 21:38:46 -04:00
parent b3b3c34756
commit c807b2f384
1 changed files with 41 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Universal_Serial_Adapter/Universal_Serial_Adapter.ino
View file

@ -74,7 +74,7 @@ void loop() {
// Down // Down
if (!digitalRead(buttonPins[0])) { if (!digitalRead(buttonPins[0])) {
serialmode newMode = (serialmode)(selectedMode + 1); serialmode newMode = (serialmode)(selectedMode + 1);
if (newMode <= cisco) { if (newMode <= modelinespeed) {
setSelection(newMode); setSelection(newMode);
} }
// Wait for release before going on // Wait for release before going on
@ -96,10 +96,13 @@ void setLineSpeed(linespeed aLineSpeed) {
} }
void setMode(serialmode aMode) { void setMode(serialmode aMode) {
serialmode previousMode = currentMode; if (aMode != modelinespeed) {
currentMode = aMode; serialmode previousMode = currentMode;
lcd.setStr(" ", xLoc(previousMode), yLoc(0), TEXT, BACKGROUND); // Clear old * currentMode = aMode;
lcd.setStr("*", xLoc(currentMode), yLoc(0), TEXT, BACKGROUND); // Add new *
lcd.setStr(" ", xLoc(previousMode), yLoc(0), TEXT, BACKGROUND);
lcd.setStr("*", xLoc(currentMode), yLoc(0), TEXT, BACKGROUND);
}
} }
void setSelection(serialmode aMode) { void setSelection(serialmode aMode) {
@ -107,14 +110,40 @@ void setSelection(serialmode aMode) {
selectedMode = aMode; selectedMode = aMode;
int yLocOne = yLoc(1); int yLocOne = yLoc(1);
int xSelected = xLoc(selectedMode) + CHAR_HEIGHT;
int xPrevious = xLoc(previousSelection) + CHAR_HEIGHT; int xSelected = 0;
if (selectedMode != modelinespeed) {
xSelected = xLoc(selectedMode) + CHAR_HEIGHT;
}
int xPrevious = 0;
if (previousSelection != modelinespeed) {
xPrevious = xLoc(previousSelection) + CHAR_HEIGHT;
}
int previousLength = strlen(modeToText[previousSelection]) * CHAR_WIDTH; int previousLength = 0;
int selectedLength = strlen(modeToText[selectedMode]) * CHAR_WIDTH; if (previousSelection != modelinespeed) {
previousLength = strlen(modeToText[previousSelection]) * CHAR_WIDTH;
lcd.setLine(xSelected, yLocOne, xSelected, yLocOne + selectedLength, HILIGHT); }
lcd.setLine(xPrevious, yLocOne, xPrevious, yLocOne + previousLength, BACKGROUND);
int selectedLength = 0;
if (selectedMode != modelinespeed) {
selectedLength = strlen(modeToText[selectedMode]) * CHAR_WIDTH;
}
if (selectedMode != modelinespeed) {
lcd.setLine(xSelected, yLocOne, xSelected, yLocOne + selectedLength, HILIGHT);
}
else {
printLineSpeed(currentLineSpeed, true);
}
if (previousSelection != modelinespeed) {
lcd.setLine(xPrevious, yLocOne, xPrevious, yLocOne + previousLength, BACKGROUND);
}
else {
printLineSpeed(currentLineSpeed, false);
}
} }
void printTitles() { void printTitles() {