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

Moved BACnet date and time into their own module.

Browse Source
This commit is contained in:
skarg
2007-01-22 16:51:08 +00:00
parent 5aee2513fa
commit f1df19f07c
6 changed files with 493 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/bacapp.c
+1 -130
View File
@@ -42,6 +42,7 @@
#include "bacdef.h"
#include "bacapp.h"
#include "bactext.h"
#include "datetime.h"
int bacapp_encode_application_data(uint8_t * apdu,
BACNET_APPLICATION_DATA_VALUE * value)
@@ -362,136 +363,6 @@ int bacapp_data_len(uint8_t *apdu, int max_apdu_len,
return total_len;
}
/* returns true if matching or same, false if different */
bool bacapp_same_date(BACNET_DATE * date1, BACNET_DATE * date2)
{
bool status = false;
if (date1 && date2) {
status = true;
if (date1->year != date2->year)
status = false;
if (date1->month != date2->month)
status = false;
if (date1->day != date2->day)
status = false;
if (date1->wday != date2->wday)
status = false;
}
return status;
}
/* returns true if matching or same, false if different */
bool bacapp_same_time(BACNET_TIME * time1, BACNET_TIME * time2)
{
bool status = false;
if (time1 && time2) {
status = true;
if (time1->hour != time2->hour)
status = false;
if (time1->min != time2->min)
status = false;
if (time1->sec != time2->sec)
status = false;
if (time1->hundredths != time2->hundredths)
status = false;
}
return status;
}
bool bacapp_same_datetime(BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2)
{
return (bacapp_same_time(&datetime1->time,&datetime2->time) &&
bacapp_same_date(&datetime1->date,&datetime2->date));
}
void bacapp_copy_date(BACNET_DATE * dest_date, BACNET_DATE * src_date)
{
if (dest_date && src_date) {
dest_date->year = src_date->year;
dest_date->month = src_date->month;
dest_date->day = src_date->day;
dest_date->wday = src_date->wday;
}
}
void bacapp_copy_time(BACNET_TIME * dest_time, BACNET_TIME * src_time)
{
if (dest_time && src_time) {
dest_time->hour = src_time->hour;
dest_time->min = src_time->min;
dest_time->sec = src_time->sec;
dest_time->hundredths = src_time->hundredths;
}
}
void bacapp_copy_datetime(
BACNET_DATE_TIME * dest_datetime,
BACNET_DATE_TIME * src_datetime)
{
bacapp_copy_time(&dest_datetime->time,&src_datetime->time);
bacapp_copy_date(&dest_datetime->date,&src_datetime->date);
}
void bacapp_set_date(BACNET_DATE * bdate,
uint16_t year, uint8_t month, uint8_t day, uint8_t wday)
{
if (bdate) {
bdate->year = year;
bdate->month = month;
bdate->day = day;
bdate->wday = wday;
}
}
void bacapp_set_time(BACNET_TIME * btime,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths)
{
if (btime) {
btime->hour = hour;
btime->min = minute;
btime->sec = seconds;
btime->hundredths = hundredths;
}
}
void bacapp_set_datetime(BACNET_DATE_TIME * bdatetime,
BACNET_DATE * bdate,
BACNET_TIME * btime)
{
if (bdate && btime && bdatetime) {
bdatetime->time.hour = btime->hour;
bdatetime->time.min = btime->min;
bdatetime->time.sec = btime->sec;
bdatetime->time.hundredths = btime->hundredths;
bdatetime->date.year = bdate->year;
bdatetime->date.month = bdate->month;
bdatetime->date.day = bdate->day;
bdatetime->date.wday = bdate->wday;
}
}
void bacapp_set_datetime_values(BACNET_DATE_TIME * bdatetime,
uint16_t year, uint8_t month, uint8_t day, uint8_t wday,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths)
{
if (bdatetime) {
bdatetime->date.year = year;
bdatetime->date.month = month;
bdatetime->date.day = day;
bdatetime->date.wday = wday;
bdatetime->time.hour = hour;
bdatetime->time.min = minute;
bdatetime->time.sec = seconds;
bdatetime->time.hundredths = hundredths;
}
}
#ifdef BACAPP_PRINT_ENABLED
bool bacapp_print_value(FILE * stream,
BACNET_APPLICATION_DATA_VALUE * value, BACNET_PROPERTY_ID property)
bacnet-stack/bacapp.h
-26
View File
@@ -87,30 +87,6 @@ extern "C" {
int bacapp_data_len(uint8_t *apdu, int max_apdu_len,
BACNET_PROPERTY_ID property);
/* utility comparison functions */
bool bacapp_same_date(BACNET_DATE * date1, BACNET_DATE * date2);
bool bacapp_same_time(BACNET_TIME * time1, BACNET_TIME * time2);
bool bacapp_same_datetime(
BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2);
void bacapp_copy_date(BACNET_DATE * date1, BACNET_DATE * date2);
void bacapp_copy_time(BACNET_TIME * time1, BACNET_TIME * time2);
void bacapp_copy_datetime(
BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2);
void bacapp_set_date(BACNET_DATE * bdate,
uint16_t year, uint8_t month, uint8_t day, uint8_t wday);
void bacapp_set_time(BACNET_TIME * btime,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths);
void bacapp_set_datetime(BACNET_DATE_TIME * bdatetime,
BACNET_DATE * bdate,
BACNET_TIME * btime);
void bacapp_set_datetime_values(BACNET_DATE_TIME * bdatetime,
uint16_t year, uint8_t month, uint8_t day, uint8_t wday,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths);
#if PRINT_ENABLED
#define BACAPP_PRINT_ENABLED
#else
@@ -133,8 +109,6 @@ extern "C" {
#ifdef TEST
#include "ctest.h"
bool bacapp_same_time(BACNET_TIME * time1, BACNET_TIME * time2);
bool bacapp_same_date(BACNET_DATE * date1, BACNET_DATE * date2);
bool bacapp_same_value(BACNET_APPLICATION_DATA_VALUE * value,
BACNET_APPLICATION_DATA_VALUE * test_value);
bacnet-stack/bacdef.h
-21
View File
@@ -86,27 +86,6 @@ struct BACnet_Device_Address {
};
typedef struct BACnet_Device_Address BACNET_ADDRESS;
/* date */
typedef struct BACnet_Date {
uint16_t year; /* AD */
uint8_t month; /* 1=Jan */
uint8_t day; /* 1..31 */
uint8_t wday; /* 1=Monday-7=Sunday */
} BACNET_DATE;
/* time */
typedef struct BACnet_Time {
uint8_t hour;
uint8_t min;
uint8_t sec;
uint8_t hundredths;
} BACNET_TIME;
typedef struct BACnet_DateTime {
BACNET_DATE date;
BACNET_TIME time;
} BACNET_DATE_TIME;
/* note: with microprocessors having lots more code space than memory,
it might be better to have a packed encoding with a library to
easily access the data. */
bacnet-stack/datetime.c
+394
View File
@@ -0,0 +1,394 @@
/*####COPYRIGHTBEGIN####
-------------------------------------------
Copyright (C) 2007 Steve Karg <skarg@users.sourceforge.net>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA.
As a special exception, if other files instantiate templates or
use macros or inline functions from this file, or you compile
this file and link it with other works to produce a work based
on this file, this file does not by itself cause the resulting
work to be covered by the GNU General Public License. However
the source code for this file must still be made available in
accordance with section (3) of the GNU General Public License.
This exception does not invalidate any other reasons why a work
based on this file might be covered by the GNU General Public
License.
-------------------------------------------
####COPYRIGHTEND####*/
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include "datetime.h"
/* BACnet Date */
/* year = years since 1900 */
/* month 1=Jan */
/* day = day of month 1..31 */
/* wday 1=Monday...7=Sunday */
static bool is_leap_year(uint16_t year)
{
if ((year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0))
return (true);
else
return (false);
}
static uint8_t month_days(uint16_t year, uint8_t month)
{
/* note: start with a zero in the first element to save us from a
month - 1 calculation in the lookup */
int month_days[13] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
/* February */
if ((month == 2) && is_leap_year(year))
return 29;
else if (month >= 1 && month <= 12)
return month_days[month];
else
return 0;
}
static uint32_t days_since_epoch(uint16_t year, uint8_t month, uint8_t day)
{
uint32_t days = 0; /* return value */
uint8_t monthdays; /* days in a month */
uint16_t years = 0; /* loop counter for years */
uint8_t months = 0; /* loop counter for months */
monthdays = month_days(year, month);
if ((year >= 1900) && (monthdays) &&
(day >= 1) && (day <= monthdays))
{
for (years = 1900; years < year; years++)
{
days += 365;
if (is_leap_year(years))
days++;
}
for (months = 1; months < month; months++)
{
days += month_days(months,year);
}
days += (day - 1);
}
return (days);
}
/* Jan 1, 1900 is a Monday */
/* wday 1=Monday...7=Sunday */
static uint8_t day_of_week(uint16_t year, uint8_t month, uint8_t day)
{
return ((days_since_epoch(year, month, day)%7)+1);
}
/* if the date1 is the same as date2, return is 0
if date1 is after date2, returns positive
if date1 is before date2, returns negative */
int datetime_compare_date(BACNET_DATE * date1, BACNET_DATE * date2)
{
int diff = 0;
if (date1 && date2) {
diff = (int)date1->year - (int)date2->year;
if (diff == 0) {
diff = (int)date1->month - (int)date2->month;
if (diff == 0) {
diff = (int)date1->day - (int)date2->day;
}
}
}
return diff;
}
/* if the time1 is the same as time2, return is 0
if time1 is after time2, returns positive
if time1 is before time2, returns negative */
int datetime_compare_time(BACNET_TIME * time1, BACNET_TIME * time2)
{
int diff = 0;
if (time1 && time2) {
diff = (int)time1->hour - (int)time2->hour;
if (diff == 0) {
diff = (int)time1->min - (int)time2->min;
if (diff == 0) {
diff = (int)time1->sec - (int)time2->sec;
if (diff == 0) {
diff = (int)time1->hundredths - (int)time2->hundredths;
}
}
}
}
return diff;
}
/* if the datetime1 is the same as datetime2, return is 0
if datetime1 is before datetime2, returns negative
if datetime1 is after datetime2, returns positive */
bool datetime_compare(BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2)
{
int diff = 0;
diff = datetime_compare_date(&datetime1->date,&datetime2->date);
if (diff == 0) {
diff = datetime_compare_time(&datetime1->time,&datetime2->time);
}
return diff;
}
void datetime_copy_date(BACNET_DATE * dest_date, BACNET_DATE * src_date)
{
if (dest_date && src_date) {
dest_date->year = src_date->year;
dest_date->month = src_date->month;
dest_date->day = src_date->day;
dest_date->wday = src_date->wday;
}
}
void datetime_copy_time(BACNET_TIME * dest_time, BACNET_TIME * src_time)
{
if (dest_time && src_time) {
dest_time->hour = src_time->hour;
dest_time->min = src_time->min;
dest_time->sec = src_time->sec;
dest_time->hundredths = src_time->hundredths;
}
}
void datetime_copy(
BACNET_DATE_TIME * dest_datetime,
BACNET_DATE_TIME * src_datetime)
{
datetime_copy_time(&dest_datetime->time,&src_datetime->time);
datetime_copy_date(&dest_datetime->date,&src_datetime->date);
}
void datetime_set_date(BACNET_DATE * bdate,
uint16_t year, uint8_t month, uint8_t day)
{
if (bdate) {
bdate->year = year;
bdate->month = month;
bdate->day = day;
bdate->wday = day_of_week(year,month,day);
}
}
void datetime_set_time(BACNET_TIME * btime,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths)
{
if (btime) {
btime->hour = hour;
btime->min = minute;
btime->sec = seconds;
btime->hundredths = hundredths;
}
}
void datetime_set(BACNET_DATE_TIME * bdatetime,
BACNET_DATE * bdate,
BACNET_TIME * btime)
{
if (bdate && btime && bdatetime) {
bdatetime->time.hour = btime->hour;
bdatetime->time.min = btime->min;
bdatetime->time.sec = btime->sec;
bdatetime->time.hundredths = btime->hundredths;
bdatetime->date.year = bdate->year;
bdatetime->date.month = bdate->month;
bdatetime->date.day = bdate->day;
bdatetime->date.wday = bdate->wday;
}
}
void datetime_set_values(BACNET_DATE_TIME * bdatetime,
uint16_t year, uint8_t month, uint8_t day,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths)
{
if (bdatetime) {
bdatetime->date.year = year;
bdatetime->date.month = month;
bdatetime->date.day = day;
bdatetime->date.wday = day_of_week(year,month,day);
bdatetime->time.hour = hour;
bdatetime->time.min = minute;
bdatetime->time.sec = seconds;
bdatetime->time.hundredths = hundredths;
}
}
#ifdef TEST
#include <assert.h>
#include <string.h>
#include "ctest.h"
void testBACnetDate(Test * pTest)
{
BACNET_DATE bdate1, bdate2;
int diff = 0;
datetime_set_date(&bdate1, 1900,1,1);
datetime_copy_date(&bdate2, &bdate1);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff == 0);
datetime_set_date(&bdate2, 1900,1,2);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
datetime_set_date(&bdate2, 1900,2,1);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
datetime_set_date(&bdate2, 1901,1,1);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
datetime_set_date(&bdate1, 2007,7,15);
datetime_copy_date(&bdate2, &bdate1);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff == 0);
datetime_set_date(&bdate2, 2007,7,14);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff > 0);
datetime_set_date(&bdate2, 2007,7,1);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff > 0);
datetime_set_date(&bdate2, 2007,7,31);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
datetime_set_date(&bdate2, 2007,8,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
datetime_set_date(&bdate2, 2007,12,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
datetime_set_date(&bdate2, 2007,6,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff > 0);
datetime_set_date(&bdate2, 2007,1,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff > 0);
datetime_set_date(&bdate2, 2006,7,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff > 0);
datetime_set_date(&bdate2, 1900,7,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff > 0);
datetime_set_date(&bdate2, 2008,7,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
datetime_set_date(&bdate2, 2154,7,15);
diff = datetime_compare_date(&bdate1, &bdate2);
ct_test(pTest, diff < 0);
return;
}
void testBACnetTime(Test * pTest)
{
BACNET_TIME btime1, btime2;
int diff = 0;
datetime_set_time(&btime1, 0,0,0,0);
datetime_copy_time(&btime2, &btime1);
diff = datetime_compare_time(&btime1, &btime2);
ct_test(pTest, diff == 0);
datetime_set_time(&btime1, 23,59,59,99);
datetime_copy_time(&btime2, &btime1);
diff = datetime_compare_time(&btime1, &btime2);
ct_test(pTest, diff == 0);
return;
}
void testBACnetDateTime(Test * pTest)
{
BACNET_DATE_TIME bdatetime;
BACNET_DATE_TIME test_bdatetime;
int diff = 0;
(void)pTest;
return;
}
void testBACnetDayOfWeek(Test * pTest)
{
uint8_t dow = 0;
/* 1/1/1900 is a Monday */
dow = day_of_week(1900, 1, 1);
ct_test(pTest, dow == 1);
/* 1/1/2007 is a Monday */
dow = day_of_week(2007, 1, 1);
ct_test(pTest, dow == 1);
dow = day_of_week(2007, 1, 2);
ct_test(pTest, dow == 2);
dow = day_of_week(2007, 1, 3);
ct_test(pTest, dow == 3);
dow = day_of_week(2007, 1, 4);
ct_test(pTest, dow == 4);
dow = day_of_week(2007, 1, 5);
ct_test(pTest, dow == 5);
dow = day_of_week(2007, 1, 6);
ct_test(pTest, dow == 6);
dow = day_of_week(2007, 1, 7);
ct_test(pTest, dow == 7);
dow = day_of_week(2007, 1, 31);
ct_test(pTest, dow == 3);
}
#ifdef TEST_DATE_TIME
int main(void)
{
Test *pTest;
bool rc;
pTest = ct_create("BACnet Date Time", NULL);
/* individual tests */
rc = ct_addTestFunction(pTest, testBACnetDayOfWeek);
assert(rc);
rc = ct_addTestFunction(pTest, testBACnetDate);
assert(rc);
rc = ct_addTestFunction(pTest, testBACnetTime);
assert(rc);
ct_setStream(pTest, stdout);
ct_run(pTest);
(void) ct_report(pTest);
ct_destroy(pTest);
return 0;
}
#endif /* TEST_DATE_TIME */
#endif /* TEST */
bacnet-stack/datetime.h
+98
View File
@@ -0,0 +1,98 @@
/*####COPYRIGHTBEGIN####
-------------------------------------------
Copyright (C) 2007 Steve Karg <skarg@users.sourceforge.net>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
The Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA.
As a special exception, if other files instantiate templates or
use macros or inline functions from this file, or you compile
this file and link it with other works to produce a work based
on this file, this file does not by itself cause the resulting
work to be covered by the GNU General Public License. However
the source code for this file must still be made available in
accordance with section (3) of the GNU General Public License.
This exception does not invalidate any other reasons why a work
based on this file might be covered by the GNU General Public
License.
-------------------------------------------
####COPYRIGHTEND####*/
#ifndef DATETIME_H
#define DATETIME_H
#include <stdint.h>
#include <stdbool.h>
/* date */
typedef struct BACnet_Date {
uint16_t year; /* AD */
uint8_t month; /* 1=Jan */
uint8_t day; /* 1..31 */
uint8_t wday; /* 1=Monday-7=Sunday */
} BACNET_DATE;
/* time */
typedef struct BACnet_Time {
uint8_t hour;
uint8_t min;
uint8_t sec;
uint8_t hundredths;
} BACNET_TIME;
typedef struct BACnet_DateTime {
BACNET_DATE date;
BACNET_TIME time;
} BACNET_DATE_TIME;
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* utility initialization functions */
void bacapp_set_date(BACNET_DATE * bdate,
uint16_t year, uint8_t month, uint8_t day);
void bacapp_set_time(BACNET_TIME * btime,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths);
void bacapp_set_datetime(BACNET_DATE_TIME * bdatetime,
BACNET_DATE * bdate,
BACNET_TIME * btime);
void bacapp_set_datetime_values(BACNET_DATE_TIME * bdatetime,
uint16_t year, uint8_t month, uint8_t day,
uint8_t hour, uint8_t minute, uint8_t seconds, uint8_t hundredths);
/* utility comparison functions:
if the date/times are the same, return is 0
if date1 is before date2, returns negative
if date1 is after date2, returns positive */
int bacapp_date_compare(BACNET_DATE * date1, BACNET_DATE * date2);
int bacapp_time_compare(BACNET_TIME * time1, BACNET_TIME * time2);
int bacapp_datetime_compare(
BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2);
/* utility copy functions */
void bacapp_copy_date(BACNET_DATE * date1, BACNET_DATE * date2);
void bacapp_copy_time(BACNET_TIME * time1, BACNET_TIME * time2);
void bacapp_copy_datetime(
BACNET_DATE_TIME * datetime1,
BACNET_DATE_TIME * datetime2);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* DATETIME_H */
bacnet-stack/datetime.ide
BIN
View File
Binary file not shown.