dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed datetime add minutes to allow adding or subtracting minutes. Corrected it to not zero the seconds upon conversion.

Browse Source
This commit is contained in:
skarg
2012-08-30 01:42:03 +00:00
parent d3c63ad4c4
commit 550cfb3fb9
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/include/datetime.h
+1 -1
View File
@@ -116,7 +116,7 @@ extern "C" {
/* utility add function */ /* utility add function */
void datetime_add_minutes( void datetime_add_minutes(
BACNET_DATE_TIME * bdatetime, BACNET_DATE_TIME * bdatetime,
uint32_t minutes); int32_t minutes);
/* date and time wildcards */ /* date and time wildcards */
bool datetime_wildcard( bool datetime_wildcard(
bacnet-stack/src/datetime.c
+11 -6
View File
@@ -49,7 +49,7 @@
/* wday 1=Monday...7=Sunday */ /* wday 1=Monday...7=Sunday */
/* Wildcards: /* Wildcards:
A value of X'FF' in any of the four octets A value of X'FF' in any of the four octets
shall indicate that the value is unspecified. shall indicate that the value is unspecified.
If all four octets = X'FF', the corresponding If all four octets = X'FF', the corresponding
time or date may be interpreted as "any" or "don't care" time or date may be interpreted as "any" or "don't care"
@@ -349,13 +349,18 @@ static void seconds_since_midnight_into_hms(
*pSeconds = (uint8_t) seconds; *pSeconds = (uint8_t) seconds;
} }
/** Utility to add or subtract minutes to a BACnet DateTime structure
*
* @param bdatetime [in] the starting date and time
* @param minutes [in] number of minutes to add or subtract from the time
*/
void datetime_add_minutes( void datetime_add_minutes(
BACNET_DATE_TIME * bdatetime, BACNET_DATE_TIME * bdatetime,
uint32_t minutes) int32_t minutes)
{ {
uint32_t bdatetime_minutes = 0; uint32_t bdatetime_minutes = 0;
uint32_t bdatetime_days = 0; uint32_t bdatetime_days = 0;
uint32_t days = 0; int32_t days = 0;
/* convert bdatetime to seconds and days */ /* convert bdatetime to seconds and days */
bdatetime_minutes = bdatetime_minutes =
@@ -375,7 +380,7 @@ void datetime_add_minutes(
/* convert bdatetime from seconds and days */ /* convert bdatetime from seconds and days */
seconds_since_midnight_into_hms(bdatetime_minutes * 60, seconds_since_midnight_into_hms(bdatetime_minutes * 60,
&bdatetime->time.hour, &bdatetime->time.min, &bdatetime->time.sec); &bdatetime->time.hour, &bdatetime->time.min, NULL);
days_since_epoch_into_ymd(bdatetime_days, &bdatetime->date.year, days_since_epoch_into_ymd(bdatetime_days, &bdatetime->date.year,
&bdatetime->date.month, &bdatetime->date.day); &bdatetime->date.month, &bdatetime->date.day);
bdatetime->date.wday = bdatetime->date.wday =
@@ -401,8 +406,8 @@ bool datetime_wildcard(
return wildcard_present; return wildcard_present;
} }
/* Returns true if any type of wildcard is present except for day of week /* Returns true if any type of wildcard is present except for day of week
* on it's own. * on it's own.
*/ */
bool datetime_wildcard_present( bool datetime_wildcard_present(
BACNET_DATE_TIME * bdatetime) BACNET_DATE_TIME * bdatetime)