aaron/reversegeocache
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
id101010
2015-12-04 18:52:07 +01:00
parent 308fcd51b8
commit 13513d7641
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/sketch.ino
View File

@@ -40,9 +40,8 @@ String destination = "N46 55.090, E007 26.442"; // Gurten
// Prototypes // Prototypes
void useInterrupt(boolean); void useInterrupt(boolean);
void print_message(String Line1, String Line2); void printMessage16x2(String line1, String line2);
void useInterrupt(boolean v); void useInterrupt(boolean v);
void print_message(String Line1, String Line2);
float haversine(float lat1, float lon1, float lat2, float lon2); float haversine(float lat1, float lon1, float lat2, float lon2);
float string2lon(String position); float string2lon(String position);
float string2lat(String position); float string2lat(String position);
@@ -85,31 +84,31 @@ void loop()
tmp = String(range); tmp = String(range);
tmp += " [m]"; tmp += " [m]";
print_message("Walk further!", tmp); printMessage16x2("Walk further!", tmp);
} else {
print_message("No GPS!", "Take me outside!"); // No fix available
}
if (range < 20.0) { if (range < 20.0) {
print_message("Unlocked!", "Password"); // Destination reached printMessage16x2("Unlocked!", "Password"); // Destination reached
}
} else {
printMessage16x2("No GPS!", "Take me outside!"); // No fix available
} }
} }
/************************************************** /**************************************************
* Name: print_message() * Name: printMessage16x2()
* Returns: nothing * Returns: nothing
* Params: Line1, Line2 * Params: Line1, Line2
* Descr: Print two strings on a 16x2 lcd * Descr: Print two strings on a 16x2 lcd
**************************************************/ **************************************************/
void print_message(String Line1, String Line2) void printMessage16x2(String line1, String line2)
{ {
lcd.clear(); lcd.clear();
lcd.setCursor(0,0); lcd.setCursor(0,0);
lcd.print(Line1); lcd.print(line1);
lcd.setCursor(0,1); lcd.setCursor(0,1);
lcd.print(Line2); lcd.print(line2);
delay(ANTIFLICKER); delay(ANTIFLICKER);
} }