diff --git a/lib/obp60task/OBP60Formater.cpp b/lib/obp60task/OBP60Formatter.cpp similarity index 99% rename from lib/obp60task/OBP60Formater.cpp rename to lib/obp60task/OBP60Formatter.cpp index 3fb5cff..adfe96f 100644 --- a/lib/obp60task/OBP60Formater.cpp +++ b/lib/obp60task/OBP60Formatter.cpp @@ -49,9 +49,9 @@ String formatLongitude(double lon) { return String(degree, 0) + "\x90 " + String(minute, 4) + "' " + ((lon > 0) ? "E" : "W"); } -FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){ +FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){ GwLog *logger = commondata.logger; - FormatedData result; + FormattedData result; static int dayoffset = 0; double rawvalue = 0; diff --git a/lib/obp60task/PageClock.cpp b/lib/obp60task/PageClock.cpp index b567d1d..a0be7d7 100644 --- a/lib/obp60task/PageClock.cpp +++ b/lib/obp60task/PageClock.cpp @@ -120,7 +120,7 @@ bool homevalid = false; // homelat and homelon are valid } else{ value1 = simtime++; // Simulation data for time value 11:36 in seconds - } // Other simulation data see OBP60Formater.cpp + } // Other simulation data see OBP60Formatter.cpp bool valid1 = bvalue1->valid; // Valid information String svalue1 = formatValue(bvalue1, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places String unit1 = formatValue(bvalue1, *commonData).unit; // Unit of value diff --git a/lib/obp60task/PageCompass.cpp b/lib/obp60task/PageCompass.cpp index 783e8cd..db98c87 100644 --- a/lib/obp60task/PageCompass.cpp +++ b/lib/obp60task/PageCompass.cpp @@ -83,7 +83,7 @@ class PageCompass : public Page String DataText[HowManyValues]; String DataUnits[HowManyValues]; String DataFormat[HowManyValues]; - FormatedData TheFormattedData; + FormattedData TheFormattedData; for (int i = 0; i < HowManyValues; i++){ bvalue = pageData.values[i]; diff --git a/lib/obp60task/Pagedata.h b/lib/obp60task/Pagedata.h index 75a4b8c..aaa9648 100644 --- a/lib/obp60task/Pagedata.h +++ b/lib/obp60task/Pagedata.h @@ -197,7 +197,7 @@ typedef struct{ double value; String svalue; String unit; -} FormatedData; +} FormattedData; // Formatter for boat values -FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata); +FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata);