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

Auto stash before checking out "HEAD"

This commit is contained in:
norbert-walter 2022-03-12 17:46:16 +01:00
parent c12f12e7b0
commit 509166216d
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/obp60task/OBP60Formater.cpp
View File

@ -30,10 +30,29 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
char buffer[bsize+1]; char buffer[bsize+1];
buffer[0]=0; buffer[0]=0;
//######################################################## //########################################################
time_t tv = 0;
if (value->getFormat() == "formatDate"){ if (value->getFormat() == "formatDate"){
double utctime = commondata.time->value; // UTC time in secounds of the day (GPS or bus data)
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/*
time_t now;
char strftime_buf[64];
struct tm timeinfo;
time(&now);
// Set timezone to China Standard Time
setenv("TZ", "CST-8", 1);
tzset();
localtime_r(&now, &timeinfo);
strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo);
*/
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tmElements_t parts; tmElements_t parts;
time_t tv=tNMEA0183Msg::daysToTime_t(value->value + dayoffset); time_t tv=tNMEA0183Msg::daysToTime_t(value->value + dayoffset);
tNMEA0183Msg::breakTime(tv,parts); tNMEA0183Msg::breakTime(tv,parts);
if(usesimudata == false) { if(usesimudata == false) {
if(String(dateFormat) == "DE"){ if(String(dateFormat) == "DE"){
@ -76,7 +95,7 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
timeInSeconds = value->value + timeZone * 3600 + 86400; // Add one day timeInSeconds = value->value + timeZone * 3600 + 86400; // Add one day
timeInSeconds = int(timeInSeconds) % 86400; // Reduce to one day (86400s) timeInSeconds = int(timeInSeconds) % 86400; // Reduce to one day (86400s)
} }
/*
// Changing day depends on time offset // Changing day depends on time offset
utcTime = value->value; utcTime = value->value;
if(timeZone + (utcTime/3600) > 24 && timeZone > 0){ if(timeZone + (utcTime/3600) > 24 && timeZone > 0){
@ -94,7 +113,7 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
else{ else{
dayoffset = -1; dayoffset = -1;
} }
*/
if(usesimudata == false) { if(usesimudata == false) {
val=modf(timeInSeconds/3600.0,&inthr); val=modf(timeInSeconds/3600.0,&inthr);

4
lib/obp60task/git_commands.txt Normal file
View File

@ -0,0 +1,4 @@
git status
git fetch upstream
git diff --name-status upstream/master
git checkout upstream/master platformio.ini