Issue 187 enable skipped ztest suites (#189)

* Fix some ztests that were skipped

* Expose bacapp_same_value()

* Fix bacapp, ptransfer tests

* Fix bugs in Load_Control object & tests

* refactor days functions from datetime module

* fix legacy ctests

* Add bacnet/basic/sys/days.[ch] to Zephyr build

* Update ztest to match from Zephyr v2.6.0; update ringbuf, datetime to build

* Fixup ztest test for object/acc

* Fix bvlc_address_from_ascii; enable/fix bvlc test

* Comment cleanup

* test/bacnet/basic/object/lc partially enabled

* Fix bacapp_decode_data_len return status on erroneous input

* fix ztest include fatal error

* fix ztest strsignal reference fatal error

* fix zassert_mem_equal reference syntax error

* fix zassert_mem_equal reference syntax error

Co-authored-by: Gregory Shue <gregory.shue@legrand.us>
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Greg Shue
2021-08-16 15:29:40 -07:00
committed by GitHub
parent 541f4024fb
commit 8b8ef8f338
102 changed files with 3178 additions and 1208 deletions
+296
View File
@@ -0,0 +1,296 @@
/**
* @file
* @author Steve Karg <skarg@users.sourceforge.net>
* @date 1997
* @brief computes days from date, days of the week, days in a month,
* days in a year
*
* @section LICENSE
*
* Public domain algorithms from ACM
*
*/
#include <stdint.h>
#include <stdbool.h>
#include "bacnet/basic/sys/days.h"
/**
* Determines if a year is a leap year using Gregorian algorithm
*
* @param year - years after Christ birth (0..9999 AD)
* @return true if leap year
*/
bool days_is_leap_year(uint16_t year)
{
if ((year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0))
return true;
return (false);
}
/**
* Determines the number of days in given month and year
*
* @param year - years after Christ birth (0..9999 AD)
* @param month - months (1=Jan...12=Dec)
* @return number of days in a given month and year, or 0 on error
*/
uint8_t days_per_month(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 */
uint8_t month_days[13] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30,
31 };
if ((month == 2) && days_is_leap_year(year))
return (29);
else if (month >= 1 && month <= 12)
return (month_days[month]);
return 0;
}
/**
* Determines the number of days in given year
*
* @param year - years after Christ birth (0..9999 AD)
* @return number of days in a given year
*/
uint32_t days_per_year(uint16_t year)
{
uint32_t days = 365;
if (days_is_leap_year(year)) {
days++;
}
return days;
}
/**
* Determines the number of days (1..365) for a given date
*
* @param year - years after Christ birth (0..9999 AD)
* @param month - months (1=Jan...12=Dec)
* @param day - day of month (1-31)
* @param days - number of days of the year (1..365)
*/
uint16_t days_of_year(uint16_t year, uint8_t month, uint8_t day)
{
uint16_t days = 0; /* return value */
uint8_t mm = 0; /* months counter */
for (mm = 1; mm < month; mm++) {
days += days_per_month(year, mm);
}
days += day;
return days;
}
/**
* Determines the number of days remaining in the year for a given date
*
* @param year - years after Christ birth (0..9999 AD)
* @param month - months (1=Jan...12=Dec)
* @param day - day of month (1-31)
* @param days - number of days of the year (1..365)
*/
uint16_t days_of_year_remaining(uint16_t year, uint8_t month, uint8_t day)
{
uint16_t days = 0; /* return value */
uint8_t mm = 0; /* months counter */
days = days_per_month(year, month) - day;
for (mm = 12; mm > month; mm--) {
days += days_per_month(year, mm);
}
return days;
}
/**
* Converts days of year into date (year, month, day)
*
* @param days - number of days of the year (1..365)
* @param year - years after Christ birth (0..9999 AD)
* @param pMonth - months (1=Jan...12=Dec)
* @param pDay - day of month (1-31)
*/
void days_of_year_to_month_day(
uint32_t days, uint16_t year, uint8_t *pMonth, uint8_t *pDay)
{
uint8_t month = 1;
uint8_t day = 0;
while (days > (uint32_t)days_per_month(year, month)) {
days -= days_per_month(year, month);
month++;
}
day = (uint8_t)(day + days);
if (pMonth) {
*pMonth = month;
}
if (pDay) {
*pDay = day;
}
return;
}
/**
* Counts days apart between two dates
*
* @param year1 - years after Christ birth (0..9999 AD)
* @param month1 - months (1=Jan...12=Dec)
* @param day1 - day of month (1-31)
* @return number of days apart, or 0 if same dates
*/
uint32_t days_apart(uint16_t year1,
uint8_t month1,
uint8_t day1,
uint16_t year2,
uint8_t month2,
uint8_t day2)
{
uint32_t days = 0; /* return value */
uint32_t days1 = 0;
uint32_t days2 = 0;
uint16_t yy = 0; /* year */
if (year2 > year1) {
days = days_of_year_remaining(year1, month1, day1);
for (yy = year1 + 1; yy < year2; yy++) {
days += 365;
if (days_is_leap_year(yy)) {
days++;
}
}
days += days_of_year(year2, month2, day2);
} else if (year2 < year1) {
days = days_of_year_remaining(year2, month2, day2);
for (yy = year2 + 1; yy < year1; yy++) {
days += 365;
if (days_is_leap_year(yy)) {
days++;
}
}
days += days_of_year(year1, month1, day1);
} else {
days1 = days_of_year(year1, month1, day1);
days2 = days_of_year(year2, month2, day2);
if (days2 > days1) {
days = days2 - days1;
} else {
days = days1 - days2;
}
}
return days;
}
/**
* Converts date to days since epoch (Jan 0, epoch year)
*
* @param year - years after Christ birth (0..9999 AD)
* @param month - months (1=Jan...12=Dec)
* @param day - day of month (1-31)
* @return number of days since epoch, or 0 if out of range
*/
uint32_t days_since_epoch(uint16_t epoch_year,
uint16_t year,
uint8_t month,
uint8_t day)
{
uint32_t days = 0; /* return value */
uint16_t yy = 0; /* year */
uint8_t mm = 0; /* months counter */
uint8_t monthdays = 0; /* days in a month */
/* validate the date conforms to our range */
monthdays = days_per_month(year, month);
if ((year >= epoch_year) && (year <= 9999) &&
(monthdays > 0) && (day >= 1) && (day <= monthdays)) {
for (yy = epoch_year; yy < year; yy++) {
days += 365;
if (days_is_leap_year(yy)) {
days++;
}
}
for (mm = 1; mm < month; mm++) {
days += days_per_month(year, mm);
}
days += day;
}
return (days);
}
/**
* Converts epoch days into date (year, month, day)
*
* @param days - number of days since epoch
* @param pYear - years after Christ birth (2000..9999 AD)
* @param pMonth - months (1=Jan...12=Dec)
* @param pDay - day of month (1-31)
* @return nothing
*/
void days_since_epoch_to_date(
uint16_t epoch_year,
uint32_t days,
uint16_t * pYear,
uint8_t * pMonth,
uint8_t * pDay)
{
uint8_t month = 1;
uint8_t day = 0;
uint16_t year;
year = epoch_year;
while (days > days_per_year(year)) {
days -= days_per_year(year);
year++;
}
while (days > days_per_month(year, month)) {
days -= days_per_month(year, month);
month++;
}
day += days;
/* load values into the pointers */
if (pYear) {
*pYear = year;
}
if (pMonth) {
*pMonth = month;
}
if (pDay) {
*pDay = day;
}
return;
}
/**
* Determines if a given date is valid
*
* @param year - years after Christ birth (0..9999 AD)
* @param month - months (1=Jan...12=Dec)
* @param day - day of month (1-31)
* @return true if the date is valid
*/
bool days_date_is_valid(uint16_t year,
uint8_t month,
uint8_t day)
{
uint8_t month_days = 0;
bool valid = false; /* return value */
/* get the number of days in the month, and check for valid month too */
month_days = days_per_month(year, month);
if ((month_days > 0) && (day > 0) && (day <= month_days)) {
valid = true;
}
return (valid);
}
+58
View File
@@ -0,0 +1,58 @@
/**
* @file
* @author Steve Karg <skarg@users.sourceforge.net>
* @date 1997
* @brief This file contains the function prototypes for the days calculations
*/
#ifndef DAYS_H
#define DAYS_H
#include <stdint.h>
#include <stdbool.h>
#include "bacnet/bacnet_stack_exports.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
BACNET_STACK_EXPORT
bool days_is_leap_year(uint16_t year);
BACNET_STACK_EXPORT
uint8_t days_per_month(uint16_t year, uint8_t month);
BACNET_STACK_EXPORT
uint32_t days_per_year(uint16_t year);
BACNET_STACK_EXPORT
uint16_t days_of_year(uint16_t year, uint8_t month, uint8_t day);
BACNET_STACK_EXPORT
uint16_t days_of_year_remaining(uint16_t year, uint8_t month, uint8_t day);
BACNET_STACK_EXPORT
void days_of_year_to_month_day(
uint32_t days, uint16_t year, uint8_t *pMonth, uint8_t *pDay);
BACNET_STACK_EXPORT
uint32_t days_apart(uint16_t year1,
uint8_t month1,
uint8_t day1,
uint16_t year2,
uint8_t month2,
uint8_t day2);
BACNET_STACK_EXPORT
uint32_t days_since_epoch(uint16_t epoch_year,
uint16_t year,
uint8_t month,
uint8_t day);
BACNET_STACK_EXPORT
void days_since_epoch_to_date(
uint16_t epoch_year,
uint32_t days,
uint16_t * pYear,
uint8_t * pMonth,
uint8_t * pDay);
BACNET_STACK_EXPORT
bool days_date_is_valid(uint16_t year,
uint8_t month,
uint8_t day);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif