thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Add simulation data in formater

This commit is contained in:
norbert-walter 2022-02-25 19:00:12 +01:00
parent 2e887e9a81
commit f9c61369a0
2 changed files with 156 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
lib/obp60task/OBP60Formater.cpp
View File

@ -17,18 +17,22 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
String windspeedFormat = commondata.config->getString(commondata.config->windspeedFormat); // [m/s|km/h|kn|bft]
String tempFormat = commondata.config->getString(commondata.config->tempFormat); // [K|°C|°F]
String dateFormat = commondata.config->getString(commondata.config->dateFormat); // [DE|GB|US]
bool usesimudata = commondata.config->getBool(commondata.config->useSimuData); // [on|off]
if (! value->valid){
// If boat value not valid
if (! value->valid && !usesimudata){
result.svalue = "---";
return result;
}
static const int bsize = 30;
char buffer[bsize+1];
buffer[0]=0;
//########################################################
if (value->getFormat() == "formatDate"){
time_t tv=tNMEA0183Msg::daysToTime_t(value->value);
tmElements_t parts;
tNMEA0183Msg::breakTime(tv,parts);
if(usesimudata == false) {
if(String(dateFormat) == "DE"){
snprintf(buffer,bsize,"%02d.%02d.%04d",parts.tm_mday,parts.tm_mon+1,parts.tm_year+1900);
}
@ -42,16 +46,9 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
snprintf(buffer,bsize,"%02d.%02d.%04d",parts.tm_mday,parts.tm_mon+1,parts.tm_year+1900);
}
}
else if(value->getFormat() == "formatTime"){
double inthr;
double intmin;
double intsec;
double val;
val=modf(value->value/3600.0,&inthr);
inthr += timeZone;
val=modf(val*3600.0/60.0,&intmin);
modf(val*60.0,&intsec);
snprintf(buffer,bsize,"%02.0f:%02.0f:%02.0f",inthr,intmin,intsec);
else{
snprintf(buffer,bsize,"01.01.2022");
}
if(timeZone == 0){
result.unit = "UTC";
}
@ -59,14 +56,56 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
result.unit = "LOT";
}
}
//########################################################
else if(value->getFormat() == "formatTime"){
double inthr;
double intmin;
double intsec;
double val;
if(usesimudata == false) {
val=modf(value->value/3600.0,&inthr);
inthr += timeZone;
val=modf(val*3600.0/60.0,&intmin);
modf(val*60.0,&intsec);
snprintf(buffer,bsize,"%02.0f:%02.0f:%02.0f",inthr,intmin,intsec);
}
else{
static long sec;
static long lasttime;
if(millis() > lasttime + 990){
sec ++;
}
sec = sec % 60;
snprintf(buffer,bsize,"11:36:%02i", int(sec));
lasttime = millis();
}
if(timeZone == 0){
result.unit = "UTC";
}
else{
result.unit = "LOT";
}
}
//########################################################
else if (value->getFormat() == "formatFixed0"){
if(usesimudata == false) {
snprintf(buffer,bsize,"%.0f",value->value);
}
else{
snprintf(buffer,bsize,"%.0f", 8.0 + float(random(0, 10)) / 10.0);
}
result.unit = "";
}
//########################################################
else if (value->getFormat() == "formatCourse"){
double course = value->value;
double course = 0;
if(usesimudata == false) {
course = value->value;
}
else{
course = 2.53 + float(random(0, 10) / 100.0);
}
course = course * 57.2958; // Unit conversion form rad to deg
result.unit = "Deg";
if(course < 10){
snprintf(buffer,bsize,"%2.1f",course);
}
@ -76,9 +115,17 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
if(course >= 100){
snprintf(buffer,bsize,"%3.0f",course);
}
result.unit = "Deg";
}
//########################################################
else if (value->getFormat() == "formatKnots" || value->getFormat() == "formatWind"){
double speed = value->value;
double speed = 0;
if(usesimudata == false) {
speed = value->value;
}
else{
speed = 4.0 + float(random(0, 40));
}
if(String(speedFormat) == "km/h" || String(windspeedFormat) == "km/h"){
speed = speed * 3.6; // Unit conversion form m/s to km/h
result.unit = "m/s";
@ -148,8 +195,15 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
}
}
}
//########################################################
else if (value->getFormat() == "formatRot"){
double rotation = value->value;
double rotation = 0;
if(usesimudata == false) {
rotation = value->value;
}
else{
rotation = 0.04 + float(random(0, 10)) / 100.0;
}
rotation = rotation * 57.2958; // Unit conversion form rad/s to deg/s
result.unit = "deg/s";
if(rotation < 10){
@ -162,8 +216,15 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
snprintf(buffer,bsize,"%3.0f",rotation);
}
}
//########################################################
else if (value->getFormat() == "formatDop"){
double dop = value->value;
double dop = 0;
if(usesimudata == false) {
dop = value->value;
}
else{
dop = 2.0 + float(random(0, 40)) / 10.0;
}
result.unit = "m";
if(dop > 99.9){
dop = 99.9;
@ -175,7 +236,9 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
snprintf(buffer,bsize,"%2.1f",dop);
}
}
//########################################################
else if (value->getFormat() == "formatLatitude"){
if(usesimudata == false) {
double lat = value->value;
String latitude = "";
String latdir = "";
@ -192,7 +255,13 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
result.unit = "";
strcpy(buffer, latitude.c_str());
}
else{
snprintf(buffer,bsize," 51\" 35' %2.4f", 2.0 + float(random(0, 1000)) / 1000.0);
}
}
//########################################################
else if (value->getFormat() == "formatLongitude"){
if(usesimudata == false) {
double lon = value->value;
String longitude = "";
String londir = "";
@ -209,8 +278,19 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
result.unit = "";
strcpy(buffer, longitude.c_str());
}
else{
snprintf(buffer,bsize," 15\" 06' %2.4f", 9.0 + float(random(0, 1000)) / 1000.0);
}
}
//########################################################
else if (value->getFormat() == "formatDepth"){
double depth = value->value;
double depth = 0;
if(usesimudata == false) {
depth = value->value;
}
else{
depth = 18.0 + float(random(0, 100)) / 10.0;
}
if(String(lengthFormat) == "ft"){
depth = depth * 3.28084;
result.unit = "ft";
@ -228,8 +308,15 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
snprintf(buffer,bsize,"%3.0f",depth);
}
}
//########################################################
else if (value->getFormat() == "kelvinToC"){
double temp = value->value;
double temp = 0;
if(usesimudata == false) {
temp = value->value;
}
else{
temp = 296.0 + float(random(0, 10)) / 10.0;
}
if(String(tempFormat) == "°C"){
temp = temp - 273.15;
result.unit = "C";
@ -251,8 +338,15 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
snprintf(buffer,bsize,"%3.0f",temp);
}
}
//########################################################
else if (value->getFormat() == "mtr2nm"){
double distance = value->value;
double distance = 0;
if(usesimudata == false) {
distance = value->value;
}
else{
distance = 2960.0 + float(random(0, 10));
}
if(String(distanceFormat) == "km"){
distance = distance * 0.001;
result.unit = "km";
@ -261,8 +355,7 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
distance = distance * 0.000539957;
result.unit = "nm";
}
else{
distance = distance * 0.000539957;
else{;
result.unit = "m";
}
if(distance < 10){

9
lib/obp60task/PageOneValue.cpp
View File

@ -76,15 +76,8 @@ class PageOneValue : public Page{
display.setCursor(20, 240);
}
// Reading bus data or using simulation data
if(simulation == true){
value1 = 84;
value1 += float(random(0, 120)) / 10; // Simulation data
display.print(value1,1);
}
else{
// Show bus data or using simulation data
display.print(svalue1); // Real value as formated string
}
// Key Layout
display.setFont(&Ubuntu_Bold8pt7b);