Merge branch 'HitNotBLE'

This commit is contained in:
2020-10-27 08:07:13 -05:00

View File

@@ -223,7 +223,7 @@ char const * GetDateTimeStr( const char * DateSeparator, const char * TimeSepar
// Build String // Build String
sprintf( ReturnStr, "%04d%s%02d%s%02d%s%02d%s%02d%s%02d", sprintf( ReturnStr, "%04d%s%02d%s%02d%s%02d%s%02d%s%02d",
Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day, Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day,
Separator, ((Separator)? Separator : ""),
Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds ); Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds );
return (ReturnStr); return (ReturnStr);
@@ -424,7 +424,7 @@ char const * BuildDateTimeStr( unsigned char Day, unsigned char Month, unsigned
// Build String // Build String
sprintf( ReturnStr, "%04d%s%02d%s%02d%s%02d%s%02d%s%02d", sprintf( ReturnStr, "%04d%s%02d%s%02d%s%02d%s%02d%s%02d",
Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day, Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day,
Separator, ((Separator)? Separator : ""),
Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds ); Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds );
return (ReturnStr); return (ReturnStr);