Added basic timer object, internal state machine, and unit tests (#1123)
* Added basic timer object, internal state machine, and unit tests * Added BACnetTimerStateChangeValue encode, decode, parse, print, and diff with unit tests * Changed handler of add/remove list element to check if the property is a BACnetLIST * Added BACnetLIST utility for handling WriteProperty to a list. * Fixed outlier ReadProperty object handlers to return zero when the RP parameter is NULL.
This commit is contained in:
@@ -22,6 +22,8 @@ The git repositories are hosted at the following sites:
|
|||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
* Added a basic timer object type example. (#1123)
|
||||||
|
* Added BACnetLIST utility for handling WriteProperty to a list. (#1123)
|
||||||
* Added Device_Object_Functions() API to return basic object API table
|
* Added Device_Object_Functions() API to return basic object API table
|
||||||
of functions for all objects. Added Device_Object_Functions_Find() API
|
of functions for all objects. Added Device_Object_Functions_Find() API
|
||||||
to enable override of basic object API function. (#1115)
|
to enable override of basic object API function. (#1115)
|
||||||
|
|||||||
@@ -412,6 +412,8 @@ add_library(${PROJECT_NAME}
|
|||||||
src/bacnet/basic/object/structured_view.h
|
src/bacnet/basic/object/structured_view.h
|
||||||
src/bacnet/basic/object/time_value.c
|
src/bacnet/basic/object/time_value.c
|
||||||
src/bacnet/basic/object/time_value.h
|
src/bacnet/basic/object/time_value.h
|
||||||
|
src/bacnet/basic/object/timer.c
|
||||||
|
src/bacnet/basic/object/timer.h
|
||||||
src/bacnet/basic/object/trendlog.c
|
src/bacnet/basic/object/trendlog.c
|
||||||
src/bacnet/basic/object/trendlog.h
|
src/bacnet/basic/object/trendlog.h
|
||||||
src/bacnet/basic/service/h_alarm_ack.c
|
src/bacnet/basic/service/h_alarm_ack.c
|
||||||
@@ -663,6 +665,8 @@ add_library(${PROJECT_NAME}
|
|||||||
src/bacnet/rp.h
|
src/bacnet/rp.h
|
||||||
src/bacnet/rpm.c
|
src/bacnet/rpm.c
|
||||||
src/bacnet/rpm.h
|
src/bacnet/rpm.h
|
||||||
|
src/bacnet/timer_value.c
|
||||||
|
src/bacnet/timer_value.h
|
||||||
src/bacnet/timestamp.c
|
src/bacnet/timestamp.c
|
||||||
src/bacnet/timestamp.h
|
src/bacnet/timestamp.h
|
||||||
src/bacnet/timesync.c
|
src/bacnet/timesync.c
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ BACNET_OBJECT_SRC := \
|
|||||||
$(BACNET_OBJECT_DIR)/nc.c \
|
$(BACNET_OBJECT_DIR)/nc.c \
|
||||||
$(BACNET_OBJECT_DIR)/netport.c \
|
$(BACNET_OBJECT_DIR)/netport.c \
|
||||||
$(BACNET_OBJECT_DIR)/time_value.c \
|
$(BACNET_OBJECT_DIR)/time_value.c \
|
||||||
|
$(BACNET_OBJECT_DIR)/timer.c \
|
||||||
$(BACNET_OBJECT_DIR)/trendlog.c \
|
$(BACNET_OBJECT_DIR)/trendlog.c \
|
||||||
$(BACNET_OBJECT_DIR)/schedule.c \
|
$(BACNET_OBJECT_DIR)/schedule.c \
|
||||||
$(BACNET_OBJECT_DIR)/structured_view.c \
|
$(BACNET_OBJECT_DIR)/structured_view.c \
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ SRC = main.c \
|
|||||||
$(BACNET_OBJECT_DIR)/osv.c \
|
$(BACNET_OBJECT_DIR)/osv.c \
|
||||||
$(BACNET_OBJECT_DIR)/program.c \
|
$(BACNET_OBJECT_DIR)/program.c \
|
||||||
$(BACNET_OBJECT_DIR)/structured_view.c \
|
$(BACNET_OBJECT_DIR)/structured_view.c \
|
||||||
|
$(BACNET_OBJECT_DIR)/timer.c \
|
||||||
$(BACNET_OBJECT_DIR)/time_value.c
|
$(BACNET_OBJECT_DIR)/time_value.c
|
||||||
|
|
||||||
# TARGET_EXT is defined in apps/Makefile as .exe or nothing
|
# TARGET_EXT is defined in apps/Makefile as .exe or nothing
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ SRC = main.c \
|
|||||||
$(BACNET_OBJECT_DIR)/netport.c \
|
$(BACNET_OBJECT_DIR)/netport.c \
|
||||||
$(BACNET_OBJECT_DIR)/program.c \
|
$(BACNET_OBJECT_DIR)/program.c \
|
||||||
$(BACNET_OBJECT_DIR)/time_value.c \
|
$(BACNET_OBJECT_DIR)/time_value.c \
|
||||||
|
$(BACNET_OBJECT_DIR)/timer.c \
|
||||||
$(BACNET_OBJECT_DIR)/trendlog.c \
|
$(BACNET_OBJECT_DIR)/trendlog.c \
|
||||||
$(BACNET_OBJECT_DIR)/schedule.c \
|
$(BACNET_OBJECT_DIR)/schedule.c \
|
||||||
$(BACNET_OBJECT_DIR)/structured_view.c \
|
$(BACNET_OBJECT_DIR)/structured_view.c \
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ SRC = main.c \
|
|||||||
$(BACNET_OBJECT_DIR)/nc.c \
|
$(BACNET_OBJECT_DIR)/nc.c \
|
||||||
$(BACNET_OBJECT_DIR)/netport.c \
|
$(BACNET_OBJECT_DIR)/netport.c \
|
||||||
$(BACNET_OBJECT_DIR)/time_value.c \
|
$(BACNET_OBJECT_DIR)/time_value.c \
|
||||||
|
$(BACNET_OBJECT_DIR)/timer.c \
|
||||||
$(BACNET_OBJECT_DIR)/trendlog.c \
|
$(BACNET_OBJECT_DIR)/trendlog.c \
|
||||||
$(BACNET_OBJECT_DIR)/schedule.c \
|
$(BACNET_OBJECT_DIR)/schedule.c \
|
||||||
$(BACNET_OBJECT_DIR)/structured_view.c \
|
$(BACNET_OBJECT_DIR)/structured_view.c \
|
||||||
|
|||||||
@@ -958,6 +958,13 @@
|
|||||||
<td bgcolor="#FFFFDD" width="25%" align="center" valign=
|
<td bgcolor="#FFFFDD" width="25%" align="center" valign=
|
||||||
"top">Yes</td>
|
"top">Yes</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td bgcolor="#FFFFDD" width="75%" valign="top"><a href=
|
||||||
|
"https://sourceforge.net/p/bacnet/src/ci/master/tree/src/bacnet/basic/object/timer.c">
|
||||||
|
Timer</a></td>
|
||||||
|
<td bgcolor="#FFFFDD" width="25%" align="center" valign=
|
||||||
|
"top">Yes</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td bgcolor="#FFFFDD" width="75%" valign="top"><a href=
|
<td bgcolor="#FFFFDD" width="75%" valign="top"><a href=
|
||||||
"https://sourceforge.net/p/bacnet/src/ci/master/tree/src/bacnet/basic/object/iv.c">
|
"https://sourceforge.net/p/bacnet/src/ci/master/tree/src/bacnet/basic/object/iv.c">
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ set(BACNET_PROJECT_SOURCE
|
|||||||
${LIBRARY_BACNET_CORE}/reject.c
|
${LIBRARY_BACNET_CORE}/reject.c
|
||||||
${LIBRARY_BACNET_CORE}/rp.c
|
${LIBRARY_BACNET_CORE}/rp.c
|
||||||
${LIBRARY_BACNET_CORE}/rpm.c
|
${LIBRARY_BACNET_CORE}/rpm.c
|
||||||
|
${LIBRARY_BACNET_CORE}/timer_value.c
|
||||||
${LIBRARY_BACNET_CORE}/timestamp.c
|
${LIBRARY_BACNET_CORE}/timestamp.c
|
||||||
${LIBRARY_BACNET_CORE}/weeklyschedule.c
|
${LIBRARY_BACNET_CORE}/weeklyschedule.c
|
||||||
${LIBRARY_BACNET_CORE}/dailyschedule.c
|
${LIBRARY_BACNET_CORE}/dailyschedule.c
|
||||||
|
|||||||
@@ -130,6 +130,7 @@ CORESRC = $(BACNET_CORE)/abort.c \
|
|||||||
$(BACNET_CORE)/reject.c \
|
$(BACNET_CORE)/reject.c \
|
||||||
$(BACNET_CORE)/rp.c \
|
$(BACNET_CORE)/rp.c \
|
||||||
$(BACNET_CORE)/rpm.c \
|
$(BACNET_CORE)/rpm.c \
|
||||||
|
$(BACNET_CORE)/timer_value.c \
|
||||||
$(BACNET_CORE)/timestamp.c \
|
$(BACNET_CORE)/timestamp.c \
|
||||||
$(BACNET_CORE)/weeklyschedule.c \
|
$(BACNET_CORE)/weeklyschedule.c \
|
||||||
$(BACNET_CORE)/dailyschedule.c \
|
$(BACNET_CORE)/dailyschedule.c \
|
||||||
|
|||||||
@@ -1188,6 +1188,9 @@
|
|||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\..\src\bacnet\rpm.c</name>
|
<name>$PROJ_DIR$\..\..\src\bacnet\rpm.c</name>
|
||||||
</file>
|
</file>
|
||||||
|
<file>
|
||||||
|
<name>$PROJ_DIR$\..\..\src\bacnet\timer_value.c</name>
|
||||||
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\..\src\bacnet\timestamp.c</name>
|
<name>$PROJ_DIR$\..\..\src\bacnet\timestamp.c</name>
|
||||||
</file>
|
</file>
|
||||||
|
|||||||
@@ -194,6 +194,7 @@ set(BACNET_PROJECT_SOURCE
|
|||||||
${LIBRARY_BACNET_CORE}/reject.c
|
${LIBRARY_BACNET_CORE}/reject.c
|
||||||
${LIBRARY_BACNET_CORE}/rp.c
|
${LIBRARY_BACNET_CORE}/rp.c
|
||||||
${LIBRARY_BACNET_CORE}/rpm.c
|
${LIBRARY_BACNET_CORE}/rpm.c
|
||||||
|
${LIBRARY_BACNET_CORE}/timer_value.c
|
||||||
${LIBRARY_BACNET_CORE}/timestamp.c
|
${LIBRARY_BACNET_CORE}/timestamp.c
|
||||||
${LIBRARY_BACNET_CORE}/weeklyschedule.c
|
${LIBRARY_BACNET_CORE}/weeklyschedule.c
|
||||||
${LIBRARY_BACNET_CORE}/dailyschedule.c
|
${LIBRARY_BACNET_CORE}/dailyschedule.c
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ BACNET_SRC = \
|
|||||||
$(BACNET_CORE)/rp.c \
|
$(BACNET_CORE)/rp.c \
|
||||||
$(BACNET_CORE)/rpm.c \
|
$(BACNET_CORE)/rpm.c \
|
||||||
$(BACNET_CORE)/special_event.c \
|
$(BACNET_CORE)/special_event.c \
|
||||||
|
$(BACNET_CORE)/timer_value.c \
|
||||||
$(BACNET_CORE)/timestamp.c \
|
$(BACNET_CORE)/timestamp.c \
|
||||||
$(BACNET_CORE)/weeklyschedule.c \
|
$(BACNET_CORE)/weeklyschedule.c \
|
||||||
$(BACNET_CORE)/whohas.c \
|
$(BACNET_CORE)/whohas.c \
|
||||||
|
|||||||
@@ -1118,6 +1118,9 @@
|
|||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\..\src\bacnet\rpm.c</name>
|
<name>$PROJ_DIR$\..\..\src\bacnet\rpm.c</name>
|
||||||
</file>
|
</file>
|
||||||
|
<file>
|
||||||
|
<name>$PROJ_DIR$\..\..\src\bacnet\timer_value.c</name>
|
||||||
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\..\src\bacnet\timestamp.c</name>
|
<name>$PROJ_DIR$\..\..\src\bacnet\timestamp.c</name>
|
||||||
</file>
|
</file>
|
||||||
|
|||||||
@@ -227,6 +227,7 @@ set(BACNET_PROJECT_SOURCE
|
|||||||
${LIBRARY_BACNET_CORE}/reject.c
|
${LIBRARY_BACNET_CORE}/reject.c
|
||||||
${LIBRARY_BACNET_CORE}/rp.c
|
${LIBRARY_BACNET_CORE}/rp.c
|
||||||
${LIBRARY_BACNET_CORE}/rpm.c
|
${LIBRARY_BACNET_CORE}/rpm.c
|
||||||
|
${LIBRARY_BACNET_CORE}/timer_value.c
|
||||||
${LIBRARY_BACNET_CORE}/timestamp.c
|
${LIBRARY_BACNET_CORE}/timestamp.c
|
||||||
${LIBRARY_BACNET_CORE}/timesync.c
|
${LIBRARY_BACNET_CORE}/timesync.c
|
||||||
${LIBRARY_BACNET_CORE}/weeklyschedule.c
|
${LIBRARY_BACNET_CORE}/weeklyschedule.c
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ BACNET_SRC = \
|
|||||||
$(BACNET_CORE)/rp.c \
|
$(BACNET_CORE)/rp.c \
|
||||||
$(BACNET_CORE)/rpm.c \
|
$(BACNET_CORE)/rpm.c \
|
||||||
$(BACNET_CORE)/special_event.c \
|
$(BACNET_CORE)/special_event.c \
|
||||||
|
$(BACNET_CORE)/timer_value.c \
|
||||||
$(BACNET_CORE)/timestamp.c \
|
$(BACNET_CORE)/timestamp.c \
|
||||||
$(BACNET_CORE)/timesync.c \
|
$(BACNET_CORE)/timesync.c \
|
||||||
$(BACNET_CORE)/weeklyschedule.c \
|
$(BACNET_CORE)/weeklyschedule.c \
|
||||||
|
|||||||
@@ -1127,6 +1127,9 @@
|
|||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\..\src\bacnet\rpm.c</name>
|
<name>$PROJ_DIR$\..\..\src\bacnet\rpm.c</name>
|
||||||
</file>
|
</file>
|
||||||
|
<file>
|
||||||
|
<name>$PROJ_DIR$\..\..\src\bacnet\timer_value.c</name>
|
||||||
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\..\..\src\bacnet\timestamp.c</name>
|
<name>$PROJ_DIR$\..\..\src\bacnet\timestamp.c</name>
|
||||||
</file>
|
</file>
|
||||||
|
|||||||
+1
@@ -202,6 +202,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\schedule.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\schedule.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\structured_view.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\structured_view.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\timer.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\trendlog.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\trendlog.c" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
+3
@@ -75,6 +75,9 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\timer.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\trendlog.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\trendlog.c">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|||||||
+1
@@ -215,6 +215,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\rp.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\rp.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\sys\sbuf.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\sys\sbuf.c" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\timer_value.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\timesync.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\timesync.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\tsm\tsm.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\tsm\tsm.c" />
|
||||||
|
|||||||
+3
@@ -129,6 +129,9 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\timer_value.c">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c">
|
||||||
<Filter>Source Files</Filter>
|
<Filter>Source Files</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
|||||||
@@ -89,6 +89,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\sc_netport.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\sc_netport.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\structured_view.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\structured_view.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\timer.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\trendlog.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\trendlog.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\service\h_alarm_ack.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\service\h_alarm_ack.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\service\h_apdu.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\service\h_apdu.c" />
|
||||||
@@ -208,6 +209,7 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\rp.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\rp.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\secure_connect.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\secure_connect.c" />
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\timer_value.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\timesync.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\timesync.c" />
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\weeklyschedule.c" />
|
<ClCompile Include="..\..\..\..\src\bacnet\weeklyschedule.c" />
|
||||||
@@ -301,6 +303,7 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\sc_netport.h" />
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\sc_netport.h" />
|
||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\structured_view.h" />
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\structured_view.h" />
|
||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\time_value.h" />
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\time_value.h" />
|
||||||
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\timer.h" />
|
||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\trendlog.h" />
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\trendlog.h" />
|
||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\services.h" />
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\services.h" />
|
||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\service\h_alarm_ack.h" />
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\service\h_alarm_ack.h" />
|
||||||
|
|||||||
@@ -201,6 +201,9 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\rpm.c">
|
||||||
<Filter>Source Files\src\bacnet</Filter>
|
<Filter>Source Files\src\bacnet</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\timer_value.c">
|
||||||
|
<Filter>Source Files\src\bacnet</Filter>
|
||||||
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\timestamp.c">
|
||||||
<Filter>Source Files\src\bacnet</Filter>
|
<Filter>Source Files\src\bacnet</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@@ -627,6 +630,9 @@
|
|||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\time_value.c">
|
||||||
<Filter>Source Files\src\bacnet\basic\object</Filter>
|
<Filter>Source Files\src\bacnet\basic\object</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\object\timer.c">
|
||||||
|
<Filter>Source Files\src\bacnet\basic\object</Filter>
|
||||||
|
</ClCompile>
|
||||||
<ClCompile Include="..\..\..\..\src\bacnet\basic\service\h_whoami.c">
|
<ClCompile Include="..\..\..\..\src\bacnet\basic\service\h_whoami.c">
|
||||||
<Filter>Source Files\src\bacnet\basic\service</Filter>
|
<Filter>Source Files\src\bacnet\basic\service</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@@ -1271,6 +1277,9 @@
|
|||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\time_value.h">
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\time_value.h">
|
||||||
<Filter>Source Files\src\bacnet\basic\object</Filter>
|
<Filter>Source Files\src\bacnet\basic\object</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\object\timer.h">
|
||||||
|
<Filter>Source Files\src\bacnet\basic\object</Filter>
|
||||||
|
</ClInclude>
|
||||||
<ClInclude Include="..\..\..\..\src\bacnet\basic\service\h_whoami.h">
|
<ClInclude Include="..\..\..\..\src\bacnet\basic\service\h_whoami.h">
|
||||||
<Filter>Source Files\src\bacnet\basic\service</Filter>
|
<Filter>Source Files\src\bacnet\basic\service</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
|||||||
+77
-3
@@ -37,6 +37,7 @@
|
|||||||
#include "bacnet/calendar_entry.h"
|
#include "bacnet/calendar_entry.h"
|
||||||
#include "bacnet/special_event.h"
|
#include "bacnet/special_event.h"
|
||||||
#include "bacnet/channel_value.h"
|
#include "bacnet/channel_value.h"
|
||||||
|
#include "bacnet/timer_value.h"
|
||||||
#include "bacnet/basic/sys/platform.h"
|
#include "bacnet/basic/sys/platform.h"
|
||||||
|
|
||||||
#if defined(BACAPP_SCALE)
|
#if defined(BACAPP_SCALE)
|
||||||
@@ -528,6 +529,18 @@ int bacapp_encode_application_data(
|
|||||||
apdu, &value->type.Channel_Value);
|
apdu, &value->type.Channel_Value);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(BACAPP_TIMER_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_TIMER_VALUE:
|
||||||
|
/* BACnetTimerStateChangeValue */
|
||||||
|
apdu_len = bacnet_timer_value_type_encode(
|
||||||
|
apdu, &value->type.Timer_Value);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACAPP_NO_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_NO_VALUE:
|
||||||
|
apdu_len = bacnet_timer_value_no_value_encode(apdu);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
#if defined(BACAPP_LOG_RECORD)
|
#if defined(BACAPP_LOG_RECORD)
|
||||||
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
||||||
/* BACnetLogRecord */
|
/* BACnetLogRecord */
|
||||||
@@ -1347,7 +1360,8 @@ int bacapp_known_property_tag(
|
|||||||
case PROP_SC_PRIMARY_HUB_CONNECTION_STATUS:
|
case PROP_SC_PRIMARY_HUB_CONNECTION_STATUS:
|
||||||
case PROP_SC_FAILOVER_HUB_CONNECTION_STATUS:
|
case PROP_SC_FAILOVER_HUB_CONNECTION_STATUS:
|
||||||
return BACNET_APPLICATION_TAG_SC_HUB_CONNECTION_STATUS;
|
return BACNET_APPLICATION_TAG_SC_HUB_CONNECTION_STATUS;
|
||||||
|
case PROP_STATE_CHANGE_VALUES:
|
||||||
|
return BACNET_APPLICATION_TAG_TIMER_VALUE;
|
||||||
default:
|
default:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@@ -1660,6 +1674,13 @@ int bacapp_decode_application_tag_value(
|
|||||||
apdu, apdu_size, &value->type.Channel_Value);
|
apdu, apdu_size, &value->type.Channel_Value);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(BACAPP_TIMER_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_TIMER_VALUE:
|
||||||
|
/* BACnetTimerStateChangeValue */
|
||||||
|
apdu_len = bacnet_timer_value_decode(
|
||||||
|
apdu, apdu_size, &value->type.Timer_Value);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
#if defined(BACAPP_LOG_RECORD)
|
#if defined(BACAPP_LOG_RECORD)
|
||||||
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
||||||
/* BACnetLogRecord */
|
/* BACnetLogRecord */
|
||||||
@@ -2440,6 +2461,22 @@ static int bacapp_snprintf_enumerated(
|
|||||||
ret_val = bacapp_snprintf(
|
ret_val = bacapp_snprintf(
|
||||||
str, str_len, "%s", bactext_protocol_level_name(value));
|
str, str_len, "%s", bactext_protocol_level_name(value));
|
||||||
break;
|
break;
|
||||||
|
case PROP_EVENT_TYPE:
|
||||||
|
ret_val = bacapp_snprintf(
|
||||||
|
str, str_len, "%s", bactext_event_type_name(value));
|
||||||
|
break;
|
||||||
|
case PROP_NOTIFY_TYPE:
|
||||||
|
ret_val = bacapp_snprintf(
|
||||||
|
str, str_len, "%s", bactext_notify_type_name(value));
|
||||||
|
break;
|
||||||
|
case PROP_TIMER_STATE:
|
||||||
|
ret_val = bacapp_snprintf(
|
||||||
|
str, str_len, "%s", bactext_timer_state_name(value));
|
||||||
|
break;
|
||||||
|
case PROP_LAST_STATE_CHANGE:
|
||||||
|
ret_val = bacapp_snprintf(
|
||||||
|
str, str_len, "%s", bactext_timer_transition_name(value));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
ret_val =
|
ret_val =
|
||||||
bacapp_snprintf(str, str_len, "%lu", (unsigned long)value);
|
bacapp_snprintf(str, str_len, "%lu", (unsigned long)value);
|
||||||
@@ -3981,6 +4018,17 @@ int bacapp_snprintf_value(
|
|||||||
str, str_len, &value->type.Channel_Value);
|
str, str_len, &value->type.Channel_Value);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(BACAPP_TIMER_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_TIMER_VALUE:
|
||||||
|
ret_val = bacnet_timer_value_to_ascii(
|
||||||
|
&value->type.Timer_Value, str, str_len);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACAPP_NO_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_NO_VALUE:
|
||||||
|
ret_val = bacnet_timer_value_no_value_to_ascii(str, str_len);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
#if defined(BACAPP_LOG_RECORD)
|
#if defined(BACAPP_LOG_RECORD)
|
||||||
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
||||||
ret_val = bacapp_snprintf_log_record(
|
ret_val = bacapp_snprintf_log_record(
|
||||||
@@ -4762,15 +4810,28 @@ bool bacapp_parse_application_data(
|
|||||||
#endif
|
#endif
|
||||||
#if defined(BACAPP_ACCESS_RULE)
|
#if defined(BACAPP_ACCESS_RULE)
|
||||||
case BACNET_APPLICATION_TAG_ACCESS_RULE:
|
case BACNET_APPLICATION_TAG_ACCESS_RULE:
|
||||||
bacnet_access_rule_from_ascii(&value->type.Access_Rule, argv);
|
status = bacnet_access_rule_from_ascii(
|
||||||
|
&value->type.Access_Rule, argv);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#if defined(BACAPP_CHANNEL_VALUE)
|
#if defined(BACAPP_CHANNEL_VALUE)
|
||||||
case BACNET_APPLICATION_TAG_CHANNEL_VALUE:
|
case BACNET_APPLICATION_TAG_CHANNEL_VALUE:
|
||||||
bacnet_channel_value_from_ascii(
|
status = bacnet_channel_value_from_ascii(
|
||||||
&value->type.Channel_Value, argv);
|
&value->type.Channel_Value, argv);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(BACAPP_TIMER_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_TIMER_VALUE:
|
||||||
|
status = bacnet_timer_value_from_ascii(
|
||||||
|
&value->type.Timer_Value, argv);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACAPP_NO_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_NO_VALUE:
|
||||||
|
status =
|
||||||
|
bacnet_timer_value_no_value_from_ascii(&value->tag, argv);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
#if defined(BACAPP_LOG_RECORD)
|
#if defined(BACAPP_LOG_RECORD)
|
||||||
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
||||||
status = bacnet_log_record_datum_from_ascii(
|
status = bacnet_log_record_datum_from_ascii(
|
||||||
@@ -5484,6 +5545,19 @@ bool bacapp_same_value(
|
|||||||
&test_value->type.Channel_Value);
|
&test_value->type.Channel_Value);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(BACAPP_TIMER_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_TIMER_VALUE:
|
||||||
|
status = bacnet_timer_value_same(
|
||||||
|
&value->type.Timer_Value, &test_value->type.Timer_Value);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACAPP_NO_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_NO_VALUE:
|
||||||
|
if (value->tag == test_value->tag) {
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
#if defined(BACAPP_LOG_RECORD)
|
#if defined(BACAPP_LOG_RECORD)
|
||||||
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
case BACNET_APPLICATION_TAG_LOG_RECORD:
|
||||||
status = bacnet_log_record_same(
|
status = bacnet_log_record_same(
|
||||||
|
|||||||
+10
-1
@@ -30,6 +30,7 @@
|
|||||||
#include "bacnet/calendar_entry.h"
|
#include "bacnet/calendar_entry.h"
|
||||||
#include "bacnet/special_event.h"
|
#include "bacnet/special_event.h"
|
||||||
#include "bacnet/channel_value.h"
|
#include "bacnet/channel_value.h"
|
||||||
|
#include "bacnet/timer_value.h"
|
||||||
#include "bacnet/secure_connect.h"
|
#include "bacnet/secure_connect.h"
|
||||||
|
|
||||||
#ifndef BACAPP_PRINT_ENABLED
|
#ifndef BACAPP_PRINT_ENABLED
|
||||||
@@ -67,7 +68,12 @@ typedef struct BACnet_Application_Data_Value {
|
|||||||
uint8_t context_tag; /* only used for context specific data */
|
uint8_t context_tag; /* only used for context specific data */
|
||||||
uint8_t tag; /* application tag data type */
|
uint8_t tag; /* application tag data type */
|
||||||
union {
|
union {
|
||||||
/* NULL - not needed as it is encoded in the tag alone */
|
#if defined(BACAPP_NULL)
|
||||||
|
/* no value needed because it is encoded in the tag alone */
|
||||||
|
#endif
|
||||||
|
#if defined(BACAPP_NO_VALUE)
|
||||||
|
/* no value needed because it is encoded in the tag alone */
|
||||||
|
#endif
|
||||||
#if defined(BACAPP_BOOLEAN)
|
#if defined(BACAPP_BOOLEAN)
|
||||||
bool Boolean;
|
bool Boolean;
|
||||||
#endif
|
#endif
|
||||||
@@ -170,6 +176,9 @@ typedef struct BACnet_Application_Data_Value {
|
|||||||
#if defined(BACAPP_CHANNEL_VALUE)
|
#if defined(BACAPP_CHANNEL_VALUE)
|
||||||
BACNET_CHANNEL_VALUE Channel_Value;
|
BACNET_CHANNEL_VALUE Channel_Value;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(BACAPP_TIMER_VALUE)
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE Timer_Value;
|
||||||
|
#endif
|
||||||
#if defined(BACAPP_LOG_RECORD)
|
#if defined(BACAPP_LOG_RECORD)
|
||||||
BACNET_LOG_RECORD Log_Record;
|
BACNET_LOG_RECORD Log_Record;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+268
-1
@@ -1426,6 +1426,44 @@ int bacnet_null_application_decode(const uint8_t *apdu, uint32_t apdu_size)
|
|||||||
return apdu_len;
|
return apdu_len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Decode the Null Value when context encoded
|
||||||
|
* From clause 20.2.2 Encoding of a Null Value
|
||||||
|
* and 20.2.1 General Rules for Encoding BACnet Tags
|
||||||
|
*
|
||||||
|
* @param apdu - buffer to hold the bytes
|
||||||
|
* @param apdu_size - number of bytes in the buffer to decode
|
||||||
|
* @param tag_value - context tag number expected
|
||||||
|
*
|
||||||
|
* @return number of bytes decoded, zero if tag mismatch,
|
||||||
|
* or #BACNET_STATUS_ERROR (-1) if malformed
|
||||||
|
*/
|
||||||
|
int bacnet_null_context_decode(
|
||||||
|
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value)
|
||||||
|
{
|
||||||
|
int apdu_len = BACNET_STATUS_ERROR;
|
||||||
|
int len = 0;
|
||||||
|
BACNET_TAG tag = { 0 };
|
||||||
|
|
||||||
|
if (apdu_size == 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
len = bacnet_tag_decode(apdu, apdu_size, &tag);
|
||||||
|
if (len > 0) {
|
||||||
|
if (tag.context && (tag.number == tag_value)) {
|
||||||
|
if (tag.len_value_type == 0) {
|
||||||
|
apdu_len = len;
|
||||||
|
} else {
|
||||||
|
apdu_len = BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
apdu_len = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Reverse the bits of the given byte.
|
* @brief Reverse the bits of the given byte.
|
||||||
*
|
*
|
||||||
@@ -4819,6 +4857,157 @@ int decode_context_date(
|
|||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Encode a context tagged BACnetTimerStateChangeValue
|
||||||
|
* with a constructed value type
|
||||||
|
* @param apdu buffer to be encoded, or NULL for length
|
||||||
|
* @param tag_value - context tag number to encapsulate the value
|
||||||
|
* @param value The value to be encoded.
|
||||||
|
* @return the number of apdu bytes encoded
|
||||||
|
*/
|
||||||
|
int bacnet_constructed_value_context_encode(
|
||||||
|
uint8_t *apdu,
|
||||||
|
uint8_t tag_value,
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *value)
|
||||||
|
{
|
||||||
|
int len = 0;
|
||||||
|
int apdu_len = 0;
|
||||||
|
|
||||||
|
if (value) {
|
||||||
|
len = encode_opening_tag(apdu, tag_value);
|
||||||
|
apdu_len += len;
|
||||||
|
if (apdu) {
|
||||||
|
apdu += len;
|
||||||
|
}
|
||||||
|
len = value->data_len;
|
||||||
|
if (apdu) {
|
||||||
|
memcpy(apdu, value->data, len);
|
||||||
|
}
|
||||||
|
apdu_len += len;
|
||||||
|
if (apdu) {
|
||||||
|
apdu += len;
|
||||||
|
}
|
||||||
|
len = encode_closing_tag(apdu, tag_value);
|
||||||
|
apdu_len += len;
|
||||||
|
}
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Decodes a constructed value type of a given length
|
||||||
|
* @param apdu - the APDU buffer to decode
|
||||||
|
* @param apdu_size - number of bytes in the buffer to decode
|
||||||
|
* @param len_value - number of bytes in the constructed value data
|
||||||
|
* @param value - the value where the decoded data is copied into,
|
||||||
|
* or NULL for getting the length
|
||||||
|
* @return number of bytes decoded (0..N), or BACNET_STATUS_ERROR on error
|
||||||
|
*/
|
||||||
|
int bacnet_constructed_value_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
uint32_t apdu_size,
|
||||||
|
uint32_t len_value,
|
||||||
|
BACNET_CONSTRUCTED_VALUE_TYPE *value)
|
||||||
|
{
|
||||||
|
if (len_value <= apdu_size) {
|
||||||
|
if (value) {
|
||||||
|
value->data_len = len_value;
|
||||||
|
memcpy(value->data, apdu, len_value);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int)len_value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Decodes a context tagged constructed value type
|
||||||
|
* @param apdu - the APDU buffer
|
||||||
|
* @param apdu_size - the APDU buffer size
|
||||||
|
* @param tag_value - context tag number expected
|
||||||
|
* @param value - the value where the decoded data is copied into
|
||||||
|
* @return length of the APDU buffer decoded, or BACNET_STATUS_ERROR
|
||||||
|
*/
|
||||||
|
int bacnet_constructed_value_context_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
uint32_t apdu_size,
|
||||||
|
uint8_t tag_number,
|
||||||
|
BACNET_CONSTRUCTED_VALUE_TYPE *value)
|
||||||
|
{
|
||||||
|
int apdu_len = 0;
|
||||||
|
int len, len_value;
|
||||||
|
|
||||||
|
if (!bacnet_is_opening_tag_number(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, tag_number, &len)) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
/* find the matching closing tag to learn the length*/
|
||||||
|
len_value =
|
||||||
|
bacnet_enclosed_data_length(&apdu[apdu_len], apdu_size - apdu_len);
|
||||||
|
/* now update apdu_len with the opening tag length */
|
||||||
|
apdu_len += len;
|
||||||
|
/* constructed value */
|
||||||
|
len = bacnet_constructed_value_decode(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, len_value, NULL);
|
||||||
|
if (len < 0) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
if (value) {
|
||||||
|
if (len <= sizeof(value->data)) {
|
||||||
|
len = bacnet_constructed_value_decode(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, len_value, value);
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
apdu_len += len;
|
||||||
|
if (!bacnet_is_closing_tag_number(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, tag_number, &len)) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
apdu_len += len;
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Compare two constructed values
|
||||||
|
* @param value1 - the first value to compare
|
||||||
|
* @param value2 - the second value to compare
|
||||||
|
* @return true if value1 is the same as value2 up to the length of the data
|
||||||
|
*/
|
||||||
|
bool bacnet_constructed_value_same(
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *value1,
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *value2)
|
||||||
|
{
|
||||||
|
if (value1->data_len != value2->data_len) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (value1->data_len > sizeof(value1->data)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (memcmp(value1->data, value2->data, value1->data_len) == 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Copy one constructed value to another
|
||||||
|
* @param dest - the destination value
|
||||||
|
* @param src - the source value to copy to the destination
|
||||||
|
* @return true if the value is copied from src to dst
|
||||||
|
*/
|
||||||
|
bool bacnet_constructed_value_copy(
|
||||||
|
BACNET_CONSTRUCTED_VALUE_TYPE *dest,
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *src)
|
||||||
|
{
|
||||||
|
memcpy(dest, src, sizeof(BACNET_CONSTRUCTED_VALUE_TYPE));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encode a simple ACK and returns the number of apdu bytes consumed.
|
* Encode a simple ACK and returns the number of apdu bytes consumed.
|
||||||
*
|
*
|
||||||
@@ -4917,7 +5106,7 @@ int bacnet_array_encode(
|
|||||||
* @param array_index [in] array index to be decoded
|
* @param array_index [in] array index to be decoded
|
||||||
* 0 for the array size
|
* 0 for the array size
|
||||||
* 1 to n for individual array members
|
* 1 to n for individual array members
|
||||||
* BACNET_ARRAY_ALL for the full array to be read.
|
* BACNET_ARRAY_ALL for the full array to be written.
|
||||||
* @param decode_function [in] function to decode one property array element and
|
* @param decode_function [in] function to decode one property array element and
|
||||||
* determine the length
|
* determine the length
|
||||||
* @param write_function [in] function to write one property array element with
|
* @param write_function [in] function to write one property array element with
|
||||||
@@ -4992,3 +5181,81 @@ BACNET_ERROR_CODE bacnet_array_write(
|
|||||||
|
|
||||||
return error_code;
|
return error_code;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Decode a BACnetList property value and call a function for each
|
||||||
|
* element
|
||||||
|
* @param object_instance [in] BACnet network port object instance number
|
||||||
|
* @param array_index [in] array index to be decoded
|
||||||
|
* 0 for the list size - not permitted for a list
|
||||||
|
* 1 to n for individual array members - not permitted for a list
|
||||||
|
* BACNET_ARRAY_ALL for the full list to be written
|
||||||
|
* @param decode_function [in] function to decode one property list element and
|
||||||
|
* determine the length
|
||||||
|
* @param add_function [in] function to add one property list element with
|
||||||
|
* the encoded value
|
||||||
|
* @param max_elements [in] number of elements in the list
|
||||||
|
* @param apdu [out] Buffer in which the APDU contents are built.
|
||||||
|
* @param max_apdu [in] Max length of the APDU buffer.
|
||||||
|
* @return BACNET_ERROR_CODE value
|
||||||
|
*/
|
||||||
|
BACNET_ERROR_CODE bacnet_list_write(
|
||||||
|
uint32_t object_instance,
|
||||||
|
BACNET_ARRAY_INDEX array_index,
|
||||||
|
bacnet_array_property_element_decode_function decode_function,
|
||||||
|
bacnet_list_property_element_add_function add_function,
|
||||||
|
BACNET_UNSIGNED_INTEGER array_size,
|
||||||
|
uint8_t *apdu,
|
||||||
|
size_t apdu_size)
|
||||||
|
{
|
||||||
|
int len = 0;
|
||||||
|
BACNET_ERROR_CODE error_code = ERROR_CODE_SUCCESS;
|
||||||
|
size_t apdu_len;
|
||||||
|
BACNET_ARRAY_INDEX count = 0;
|
||||||
|
|
||||||
|
if (array_index == BACNET_ARRAY_ALL) {
|
||||||
|
/* verify all elements will fit in the BACnetLIST */
|
||||||
|
apdu_len = 0;
|
||||||
|
while (apdu_len < apdu_size) {
|
||||||
|
len = decode_function(
|
||||||
|
object_instance, &apdu[apdu_len], apdu_size - apdu_len);
|
||||||
|
if (len > 0) {
|
||||||
|
apdu_len += len;
|
||||||
|
count++;
|
||||||
|
} else if (len == 0) {
|
||||||
|
/* end of list - it fits! */
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
/* bad decode */
|
||||||
|
error_code = ERROR_CODE_ABORT_OTHER;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (error_code == ERROR_CODE_SUCCESS) {
|
||||||
|
if (count > array_size) {
|
||||||
|
/* maybe? what about duplicates? */
|
||||||
|
error_code = ERROR_CODE_NO_SPACE_TO_WRITE_PROPERTY;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (error_code == ERROR_CODE_SUCCESS) {
|
||||||
|
/* empty the list */
|
||||||
|
(void)add_function(object_instance, NULL, 0);
|
||||||
|
/* add each unique element */
|
||||||
|
apdu_len = 0;
|
||||||
|
while (apdu_len < apdu_size) {
|
||||||
|
len = decode_function(
|
||||||
|
object_instance, &apdu[apdu_len], apdu_size - apdu_len);
|
||||||
|
error_code =
|
||||||
|
add_function(object_instance, &apdu[apdu_len], len);
|
||||||
|
if (error_code != ERROR_CODE_SUCCESS) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
apdu_len += len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* array-index was specified */
|
||||||
|
error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||||
|
}
|
||||||
|
|
||||||
|
return error_code;
|
||||||
|
}
|
||||||
|
|||||||
@@ -57,6 +57,26 @@ typedef BACNET_ERROR_CODE (*bacnet_array_property_element_write_function)(
|
|||||||
uint8_t *application_data,
|
uint8_t *application_data,
|
||||||
size_t application_data_len);
|
size_t application_data_len);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Add a unique element to a BACnetLIST property
|
||||||
|
* @param object_instance [in] BACnet network port object instance number
|
||||||
|
* @param application_data [in] encoded element value
|
||||||
|
* @param application_data_len [in] The size of the encoded element value
|
||||||
|
* @return BACNET_ERROR_CODE value
|
||||||
|
*/
|
||||||
|
typedef BACNET_ERROR_CODE (*bacnet_list_property_element_add_function)(
|
||||||
|
uint32_t object_instance,
|
||||||
|
uint8_t *application_data,
|
||||||
|
size_t application_data_len);
|
||||||
|
|
||||||
|
#ifndef BACNET_CONSTRUCTED_VALUE_SIZE
|
||||||
|
#define BACNET_CONSTRUCTED_VALUE_SIZE MAX_APDU
|
||||||
|
#endif
|
||||||
|
typedef struct BACnet_Constructed_Value_Type {
|
||||||
|
uint8_t data[BACNET_CONSTRUCTED_VALUE_SIZE];
|
||||||
|
uint16_t data_len;
|
||||||
|
} BACNET_CONSTRUCTED_VALUE_TYPE;
|
||||||
|
|
||||||
typedef struct BACnetTag {
|
typedef struct BACnetTag {
|
||||||
uint8_t number;
|
uint8_t number;
|
||||||
bool application : 1;
|
bool application : 1;
|
||||||
@@ -164,6 +184,9 @@ BACNET_STACK_EXPORT
|
|||||||
int encode_context_null(uint8_t *apdu, uint8_t tag_number);
|
int encode_context_null(uint8_t *apdu, uint8_t tag_number);
|
||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
int bacnet_null_application_decode(const uint8_t *apdu, uint32_t apdu_size);
|
int bacnet_null_application_decode(const uint8_t *apdu, uint32_t apdu_size);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_null_context_decode(
|
||||||
|
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value);
|
||||||
|
|
||||||
/* from clause 20.2.3 Encoding of a Boolean Value */
|
/* from clause 20.2.3 Encoding of a Boolean Value */
|
||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
@@ -618,6 +641,32 @@ int bacnet_date_context_decode(
|
|||||||
uint8_t tag_value,
|
uint8_t tag_value,
|
||||||
BACNET_DATE *value);
|
BACNET_DATE *value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_constructed_value_context_encode(
|
||||||
|
uint8_t *apdu,
|
||||||
|
uint8_t tag_value,
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *value);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_constructed_value_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
uint32_t apdu_size,
|
||||||
|
uint32_t len_value,
|
||||||
|
BACNET_CONSTRUCTED_VALUE_TYPE *value);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_constructed_value_context_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
uint32_t apdu_size,
|
||||||
|
uint8_t tag_value,
|
||||||
|
BACNET_CONSTRUCTED_VALUE_TYPE *value);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool bacnet_constructed_value_same(
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *value1,
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *value2);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool bacnet_constructed_value_copy(
|
||||||
|
BACNET_CONSTRUCTED_VALUE_TYPE *dest,
|
||||||
|
const BACNET_CONSTRUCTED_VALUE_TYPE *src);
|
||||||
|
|
||||||
/* from clause 20.1.2.4 max-segments-accepted */
|
/* from clause 20.1.2.4 max-segments-accepted */
|
||||||
/* and clause 20.1.2.5 max-APDU-length-accepted */
|
/* and clause 20.1.2.5 max-APDU-length-accepted */
|
||||||
/* returns the encoded octet */
|
/* returns the encoded octet */
|
||||||
@@ -651,6 +700,16 @@ BACNET_ERROR_CODE bacnet_array_write(
|
|||||||
uint8_t *apdu,
|
uint8_t *apdu,
|
||||||
size_t apdu_size);
|
size_t apdu_size);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
BACNET_ERROR_CODE bacnet_list_write(
|
||||||
|
uint32_t object_instance,
|
||||||
|
BACNET_ARRAY_INDEX array_index,
|
||||||
|
bacnet_array_property_element_decode_function decode_function,
|
||||||
|
bacnet_list_property_element_add_function add_function,
|
||||||
|
BACNET_UNSIGNED_INTEGER max_elements,
|
||||||
|
uint8_t *apdu,
|
||||||
|
size_t apdu_size);
|
||||||
|
|
||||||
/* from clause 20.2.1.2 Tag Number */
|
/* from clause 20.2.1.2 Tag Number */
|
||||||
/* true if extended tag numbering is used */
|
/* true if extended tag numbering is used */
|
||||||
#define IS_EXTENDED_TAG_NUMBER(x) (((x) & 0xF0) == 0xF0)
|
#define IS_EXTENDED_TAG_NUMBER(x) (((x) & 0xF0) == 0xF0)
|
||||||
|
|||||||
@@ -1683,7 +1683,13 @@ typedef enum {
|
|||||||
/* BACnetChannelValue */
|
/* BACnetChannelValue */
|
||||||
BACNET_APPLICATION_TAG_CHANNEL_VALUE,
|
BACNET_APPLICATION_TAG_CHANNEL_VALUE,
|
||||||
/* BACnetLogRecord */
|
/* BACnetLogRecord */
|
||||||
BACNET_APPLICATION_TAG_LOG_RECORD
|
BACNET_APPLICATION_TAG_LOG_RECORD,
|
||||||
|
/* BACnetTimerStateChangeValue */
|
||||||
|
BACNET_APPLICATION_TAG_TIMER_VALUE,
|
||||||
|
/* no-value - context tagged null */
|
||||||
|
BACNET_APPLICATION_TAG_NO_VALUE,
|
||||||
|
/* ABSTRACT-SYNTAX - constructed value */
|
||||||
|
BACNET_APPLICATION_TAG_ABSTRACT_SYNTAX
|
||||||
} BACNET_APPLICATION_TAG;
|
} BACNET_APPLICATION_TAG;
|
||||||
|
|
||||||
/* note: these are not the real values, */
|
/* note: these are not the real values, */
|
||||||
@@ -2966,7 +2972,8 @@ typedef enum BACnetTimerTransition {
|
|||||||
TIMER_TRANSITION_RUNNING_TO_EXPIRED = 4,
|
TIMER_TRANSITION_RUNNING_TO_EXPIRED = 4,
|
||||||
TIMER_TRANSITION_FORCED_TO_EXPIRED = 5,
|
TIMER_TRANSITION_FORCED_TO_EXPIRED = 5,
|
||||||
TIMER_TRANSITION_EXPIRED_TO_IDLE = 6,
|
TIMER_TRANSITION_EXPIRED_TO_IDLE = 6,
|
||||||
TIMER_TRANSITION_EXPIRED_TO_RUNNING = 7
|
TIMER_TRANSITION_EXPIRED_TO_RUNNING = 7,
|
||||||
|
TIMER_TRANSITION_MAX = 8
|
||||||
} BACNET_TIMER_TRANSITION;
|
} BACNET_TIMER_TRANSITION;
|
||||||
|
|
||||||
typedef enum BACnetEscalatorFault {
|
typedef enum BACnetEscalatorFault {
|
||||||
|
|||||||
+48
-2
@@ -177,6 +177,9 @@ INDTEXT_DATA bacnet_application_tag_names[] = {
|
|||||||
{ BACNET_APPLICATION_TAG_SHED_LEVEL, "BACnetShedLevel" },
|
{ BACNET_APPLICATION_TAG_SHED_LEVEL, "BACnetShedLevel" },
|
||||||
{ BACNET_APPLICATION_TAG_ACCESS_RULE, "BACnetAccessRule" },
|
{ BACNET_APPLICATION_TAG_ACCESS_RULE, "BACnetAccessRule" },
|
||||||
{ BACNET_APPLICATION_TAG_CHANNEL_VALUE, "BACnetChannelValue" },
|
{ BACNET_APPLICATION_TAG_CHANNEL_VALUE, "BACnetChannelValue" },
|
||||||
|
{ BACNET_APPLICATION_TAG_LOG_RECORD, "BACnetLogRecord" },
|
||||||
|
{ BACNET_APPLICATION_TAG_NO_VALUE, "BACnetNoValue" },
|
||||||
|
{ BACNET_APPLICATION_TAG_ABSTRACT_SYNTAX, "ABSTRACT-SYNTAX" },
|
||||||
{ 0, NULL }
|
{ 0, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -225,7 +228,7 @@ INDTEXT_DATA bacnet_object_type_names[] = {
|
|||||||
{ OBJECT_LOAD_CONTROL, "load-control" },
|
{ OBJECT_LOAD_CONTROL, "load-control" },
|
||||||
{ OBJECT_STRUCTURED_VIEW, "structured-view" },
|
{ OBJECT_STRUCTURED_VIEW, "structured-view" },
|
||||||
{ OBJECT_ACCESS_DOOR, "access-door" },
|
{ OBJECT_ACCESS_DOOR, "access-door" },
|
||||||
{ OBJECT_LIGHTING_OUTPUT, "lighting-output" },
|
{ OBJECT_TIMER, "timer" },
|
||||||
{ OBJECT_ACCESS_CREDENTIAL, "access-credential" },
|
{ OBJECT_ACCESS_CREDENTIAL, "access-credential" },
|
||||||
{ OBJECT_ACCESS_POINT, "access-point" },
|
{ OBJECT_ACCESS_POINT, "access-point" },
|
||||||
{ OBJECT_ACCESS_RIGHTS, "access-rights" },
|
{ OBJECT_ACCESS_RIGHTS, "access-rights" },
|
||||||
@@ -297,7 +300,7 @@ INDTEXT_DATA bacnet_object_type_names_capitalized[] = {
|
|||||||
{ OBJECT_LOAD_CONTROL, "Load Control" },
|
{ OBJECT_LOAD_CONTROL, "Load Control" },
|
||||||
{ OBJECT_STRUCTURED_VIEW, "Structured View" },
|
{ OBJECT_STRUCTURED_VIEW, "Structured View" },
|
||||||
{ OBJECT_ACCESS_DOOR, "Access Door" },
|
{ OBJECT_ACCESS_DOOR, "Access Door" },
|
||||||
{ OBJECT_LIGHTING_OUTPUT, "Lighting Output" },
|
{ OBJECT_TIMER, "Timer" },
|
||||||
{ OBJECT_ACCESS_CREDENTIAL, "Access Credential" },
|
{ OBJECT_ACCESS_CREDENTIAL, "Access Credential" },
|
||||||
{ OBJECT_ACCESS_POINT, "Access Point" },
|
{ OBJECT_ACCESS_POINT, "Access Point" },
|
||||||
{ OBJECT_ACCESS_RIGHTS, "Access Rights" },
|
{ OBJECT_ACCESS_RIGHTS, "Access Rights" },
|
||||||
@@ -2686,6 +2689,7 @@ const char *bactext_program_request_name(unsigned index)
|
|||||||
}
|
}
|
||||||
|
|
||||||
INDTEXT_DATA bactext_program_state_names[] = {
|
INDTEXT_DATA bactext_program_state_names[] = {
|
||||||
|
/* BACnetProgramState enumerations */
|
||||||
{ PROGRAM_STATE_IDLE, "idle" },
|
{ PROGRAM_STATE_IDLE, "idle" },
|
||||||
{ PROGRAM_STATE_LOADING, "loading" },
|
{ PROGRAM_STATE_LOADING, "loading" },
|
||||||
{ PROGRAM_STATE_RUNNING, "running" },
|
{ PROGRAM_STATE_RUNNING, "running" },
|
||||||
@@ -2702,6 +2706,7 @@ const char *bactext_program_state_name(unsigned index)
|
|||||||
}
|
}
|
||||||
|
|
||||||
INDTEXT_DATA bactext_program_error_names[] = {
|
INDTEXT_DATA bactext_program_error_names[] = {
|
||||||
|
/* BACnetProgramError enumerations */
|
||||||
{ PROGRAM_ERROR_NORMAL, "normal" },
|
{ PROGRAM_ERROR_NORMAL, "normal" },
|
||||||
{ PROGRAM_ERROR_LOAD_FAILED, "load-failed" },
|
{ PROGRAM_ERROR_LOAD_FAILED, "load-failed" },
|
||||||
{ PROGRAM_ERROR_INTERNAL, "internal" },
|
{ PROGRAM_ERROR_INTERNAL, "internal" },
|
||||||
@@ -2722,6 +2727,39 @@ const char *bactext_program_error_name(unsigned index)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INDTEXT_DATA bactext_timer_state_names[] = {
|
||||||
|
/* BACnetTimerState enumerations */
|
||||||
|
{ TIMER_STATE_IDLE, "idle" },
|
||||||
|
{ TIMER_STATE_RUNNING, "running" },
|
||||||
|
{ TIMER_STATE_EXPIRED, "expired" },
|
||||||
|
{ 0, NULL }
|
||||||
|
};
|
||||||
|
|
||||||
|
const char *bactext_timer_state_name(unsigned index)
|
||||||
|
{
|
||||||
|
return indtext_by_index_default(
|
||||||
|
bactext_timer_state_names, index, ASHRAE_Reserved_String);
|
||||||
|
}
|
||||||
|
|
||||||
|
INDTEXT_DATA bactext_timer_transition_names[] = {
|
||||||
|
/* BACnetTimerTransition enumerations */
|
||||||
|
{ TIMER_TRANSITION_NONE, "none" },
|
||||||
|
{ TIMER_TRANSITION_IDLE_TO_RUNNING, "idle-to-running" },
|
||||||
|
{ TIMER_TRANSITION_RUNNING_TO_IDLE, "running-to-idle" },
|
||||||
|
{ TIMER_TRANSITION_RUNNING_TO_RUNNING, "running-to-running" },
|
||||||
|
{ TIMER_TRANSITION_RUNNING_TO_EXPIRED, "running-to-expired" },
|
||||||
|
{ TIMER_TRANSITION_FORCED_TO_EXPIRED, "forced-to-expired" },
|
||||||
|
{ TIMER_TRANSITION_EXPIRED_TO_IDLE, "expired-to-idle" },
|
||||||
|
{ TIMER_TRANSITION_EXPIRED_TO_RUNNING, "expired-to-running" },
|
||||||
|
{ 0, NULL }
|
||||||
|
};
|
||||||
|
|
||||||
|
const char *bactext_timer_transition_name(unsigned index)
|
||||||
|
{
|
||||||
|
return indtext_by_index_default(
|
||||||
|
bactext_timer_transition_names, index, ASHRAE_Reserved_String);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief For a given enumerated object property string,
|
* @brief For a given enumerated object property string,
|
||||||
* find the enumeration value
|
* find the enumeration value
|
||||||
@@ -2861,6 +2899,14 @@ bool bactext_object_property_strtoul(
|
|||||||
status = bactext_strtoul_index(
|
status = bactext_strtoul_index(
|
||||||
bacnet_notify_type_names, search_name, found_index);
|
bacnet_notify_type_names, search_name, found_index);
|
||||||
break;
|
break;
|
||||||
|
case PROP_TIMER_STATE:
|
||||||
|
status = bactext_strtoul_index(
|
||||||
|
bactext_timer_state_names, search_name, found_index);
|
||||||
|
break;
|
||||||
|
case PROP_LAST_STATE_CHANGE:
|
||||||
|
status = bactext_strtoul_index(
|
||||||
|
bactext_timer_transition_names, search_name, found_index);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
status = bactext_strtoul(search_name, found_index);
|
status = bactext_strtoul(search_name, found_index);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -200,6 +200,11 @@ const char *bactext_program_state_name(unsigned index);
|
|||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
const char *bactext_program_error_name(unsigned index);
|
const char *bactext_program_error_name(unsigned index);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
const char *bactext_timer_transition_name(unsigned index);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
const char *bactext_timer_state_name(unsigned index);
|
||||||
|
|
||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
bool bactext_strtoul(const char *search_name, unsigned *found_index);
|
bool bactext_strtoul(const char *search_name, unsigned *found_index);
|
||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
|
|||||||
@@ -1032,7 +1032,7 @@ int Binary_Output_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
|
|||||||
uint8_t *apdu = NULL;
|
uint8_t *apdu = NULL;
|
||||||
int apdu_size = 0;
|
int apdu_size = 0;
|
||||||
|
|
||||||
if ((rpdata->application_data == NULL) ||
|
if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
|
||||||
(rpdata->application_data_len == 0)) {
|
(rpdata->application_data_len == 0)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1216,6 +1216,9 @@ int Device_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
|
|||||||
struct special_property_list_t property_list;
|
struct special_property_list_t property_list;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (!rpdata) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
/* initialize the default return values */
|
/* initialize the default return values */
|
||||||
rpdata->error_class = ERROR_CLASS_OBJECT;
|
rpdata->error_class = ERROR_CLASS_OBJECT;
|
||||||
rpdata->error_code = ERROR_CODE_UNKNOWN_OBJECT;
|
rpdata->error_code = ERROR_CODE_UNKNOWN_OBJECT;
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
#include "bacnet/basic/object/osv.h"
|
#include "bacnet/basic/object/osv.h"
|
||||||
#include "bacnet/basic/object/piv.h"
|
#include "bacnet/basic/object/piv.h"
|
||||||
#include "bacnet/basic/object/time_value.h"
|
#include "bacnet/basic/object/time_value.h"
|
||||||
|
#include "bacnet/basic/object/timer.h"
|
||||||
#include "bacnet/basic/object/channel.h"
|
#include "bacnet/basic/object/channel.h"
|
||||||
#include "bacnet/basic/object/lo.h"
|
#include "bacnet/basic/object/lo.h"
|
||||||
#include "bacnet/basic/object/blo.h"
|
#include "bacnet/basic/object/blo.h"
|
||||||
@@ -207,6 +208,14 @@ static object_functions_t My_Object_Table[] = {
|
|||||||
NULL /* COV */, NULL /* COV Clear */, NULL /* Intrinsic Reporting */,
|
NULL /* COV */, NULL /* COV Clear */, NULL /* Intrinsic Reporting */,
|
||||||
NULL /* Add_List_Element */, NULL /* Remove_List_Element */,
|
NULL /* Add_List_Element */, NULL /* Remove_List_Element */,
|
||||||
NULL /* Create */, NULL /* Delete */, NULL /* Timer */ },
|
NULL /* Create */, NULL /* Delete */, NULL /* Timer */ },
|
||||||
|
{ OBJECT_TIMER, Timer_Init, Timer_Count,
|
||||||
|
Timer_Index_To_Instance, Timer_Valid_Instance,
|
||||||
|
Timer_Object_Name, Timer_Read_Property,
|
||||||
|
Timer_Write_Property, Timer_Property_Lists,
|
||||||
|
NULL /* ReadRangeInfo */, NULL /* Iterator */, NULL /* Value_Lists */,
|
||||||
|
NULL /* COV */, NULL /* COV Clear */, NULL /* Intrinsic Reporting */,
|
||||||
|
Timer_Add_List_Element, Timer_Remove_List_Element,
|
||||||
|
Timer_Create, Timer_Delete, Timer_Task },
|
||||||
{ OBJECT_INTEGER_VALUE, Integer_Value_Init, Integer_Value_Count,
|
{ OBJECT_INTEGER_VALUE, Integer_Value_Init, Integer_Value_Count,
|
||||||
Integer_Value_Index_To_Instance, Integer_Value_Valid_Instance,
|
Integer_Value_Index_To_Instance, Integer_Value_Valid_Instance,
|
||||||
Integer_Value_Object_Name, Integer_Value_Read_Property,
|
Integer_Value_Object_Name, Integer_Value_Read_Property,
|
||||||
|
|||||||
@@ -803,11 +803,15 @@ int Notification_Class_Add_List_Element(BACNET_LIST_ELEMENT_DATA *list_element)
|
|||||||
return BACNET_STATUS_ABORT;
|
return BACNET_STATUS_ABORT;
|
||||||
}
|
}
|
||||||
if (list_element->object_property != PROP_RECIPIENT_LIST) {
|
if (list_element->object_property != PROP_RECIPIENT_LIST) {
|
||||||
list_element->error_class = ERROR_CLASS_SERVICES;
|
/* The specified property is currently not modifiable
|
||||||
list_element->error_code = ERROR_CODE_PROPERTY_IS_NOT_A_LIST;
|
by the requester.*/
|
||||||
|
list_element->error_class = ERROR_CLASS_PROPERTY;
|
||||||
|
list_element->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
|
||||||
return BACNET_STATUS_ERROR;
|
return BACNET_STATUS_ERROR;
|
||||||
}
|
}
|
||||||
if (list_element->array_index != BACNET_ARRAY_ALL) {
|
if (list_element->array_index != BACNET_ARRAY_ALL) {
|
||||||
|
/* An array index is provided but the property is
|
||||||
|
not a BACnetARRAY of BACnetLIST.*/
|
||||||
list_element->error_class = ERROR_CLASS_PROPERTY;
|
list_element->error_class = ERROR_CLASS_PROPERTY;
|
||||||
list_element->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
list_element->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||||
return BACNET_STATUS_ERROR;
|
return BACNET_STATUS_ERROR;
|
||||||
@@ -963,11 +967,15 @@ int Notification_Class_Remove_List_Element(
|
|||||||
return BACNET_STATUS_ABORT;
|
return BACNET_STATUS_ABORT;
|
||||||
}
|
}
|
||||||
if (list_element->object_property != PROP_RECIPIENT_LIST) {
|
if (list_element->object_property != PROP_RECIPIENT_LIST) {
|
||||||
list_element->error_class = ERROR_CLASS_SERVICES;
|
/* The specified property is currently not modifiable
|
||||||
list_element->error_code = ERROR_CODE_PROPERTY_IS_NOT_A_LIST;
|
by the requester.*/
|
||||||
|
list_element->error_class = ERROR_CLASS_PROPERTY;
|
||||||
|
list_element->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
|
||||||
return BACNET_STATUS_ERROR;
|
return BACNET_STATUS_ERROR;
|
||||||
}
|
}
|
||||||
if (list_element->array_index != BACNET_ARRAY_ALL) {
|
if (list_element->array_index != BACNET_ARRAY_ALL) {
|
||||||
|
/* An array index is provided but the property is
|
||||||
|
not a BACnetARRAY of BACnetLIST.*/
|
||||||
list_element->error_class = ERROR_CLASS_PROPERTY;
|
list_element->error_class = ERROR_CLASS_PROPERTY;
|
||||||
list_element->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
list_element->error_code = ERROR_CODE_PROPERTY_IS_NOT_AN_ARRAY;
|
||||||
return BACNET_STATUS_ERROR;
|
return BACNET_STATUS_ERROR;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,189 @@
|
|||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* @brief API for Timer object type
|
||||||
|
* @author Steve Karg <skarg@users.sourceforge.net>
|
||||||
|
* @date October 2025
|
||||||
|
* @copyright SPDX-License-Identifier: MIT
|
||||||
|
*/
|
||||||
|
#ifndef BACNET_BASIC_OBJECT_TIMER_H
|
||||||
|
#define BACNET_BASIC_OBJECT_TIMER_H
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
/* BACnet Stack defines - first */
|
||||||
|
#include "bacnet/bacdef.h"
|
||||||
|
/* BACnet Stack API */
|
||||||
|
#include "bacnet/bacerror.h"
|
||||||
|
#include "bacnet/timer_value.h"
|
||||||
|
#include "bacnet/wp.h"
|
||||||
|
#include "bacnet/rp.h"
|
||||||
|
#include "bacnet/list_element.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void Timer_Property_Lists(
|
||||||
|
const int **pRequired, const int **pOptional, const int **pProprietary);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Valid_Instance(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
unsigned Timer_Count(void);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Index_To_Instance(unsigned index);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
unsigned Timer_Instance_To_Index(uint32_t object_instance);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Object_Name(
|
||||||
|
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Name_Set(uint32_t object_instance, const char *new_name);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
const char *Timer_Name_ASCII(uint32_t object_instance);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int Timer_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Description(
|
||||||
|
uint32_t object_instance, BACNET_CHARACTER_STRING *description);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Description_Set(uint32_t instance, const char *new_name);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
const char *Timer_Description_ANSI(uint32_t object_instance);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Out_Of_Service(uint32_t instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void Timer_Out_Of_Service_Set(uint32_t instance, bool oos_flag);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
BACNET_RELIABILITY Timer_Reliability(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Reliability_Set(uint32_t object_instance, BACNET_RELIABILITY value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Present_Value(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Present_Value_Set(uint32_t object_instance, uint32_t value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
BACNET_TIMER_STATE Timer_State(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_State_Set(uint32_t object_instance, BACNET_TIMER_STATE value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
BACNET_TIMER_TRANSITION Timer_Last_State_Change(uint32_t object_instance);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Running(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Running_Set(uint32_t object_instance, bool running);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Update_Time(uint32_t object_instance, BACNET_DATE_TIME *bdatetime);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Update_Time_Set(
|
||||||
|
uint32_t object_instance, BACNET_DATE_TIME *bdatetime);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Expiration_Time(
|
||||||
|
uint32_t object_instance, BACNET_DATE_TIME *bdatetime);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Initial_Timeout(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Initial_Timeout_Set(uint32_t object_instance, uint32_t value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Default_Timeout(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Default_Timeout_Set(uint32_t object_instance, uint32_t value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Min_Pres_Value(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Min_Pres_Value_Set(uint32_t object_instance, uint32_t value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Max_Pres_Value(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Max_Pres_Value_Set(uint32_t object_instance, uint32_t value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Resolution(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Resolution_Set(uint32_t object_instance, uint32_t value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint8_t Timer_Priority_For_Writing(uint8_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Priority_For_Writing_Set(uint32_t object_instance, uint8_t value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
unsigned Timer_Reference_List_Member_Capacity(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *Timer_Reference_List_Member_Element(
|
||||||
|
uint32_t object_instance, unsigned list_index);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Reference_List_Member_Element_Set(
|
||||||
|
uint32_t object_instance,
|
||||||
|
unsigned index,
|
||||||
|
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMember);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Reference_List_Member_Element_Add(
|
||||||
|
uint32_t object_instance,
|
||||||
|
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pNewMember);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Reference_List_Member_Element_Remove(
|
||||||
|
uint32_t object_instance,
|
||||||
|
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pRemoveMember);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
unsigned Timer_Reference_List_Member_Element_Count(uint32_t object_instance);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *Timer_State_Change_Value(
|
||||||
|
uint32_t object_instance, BACNET_TIMER_TRANSITION transition);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_State_Change_Value_Set(
|
||||||
|
uint32_t object_instance,
|
||||||
|
BACNET_TIMER_TRANSITION transition,
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void Timer_Task(uint32_t object_instance, uint16_t milliseconds);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void Timer_Write_Property_Internal_Callback_Set(write_property_function cb);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int Timer_Add_List_Element(BACNET_LIST_ELEMENT_DATA *list_element);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int Timer_Remove_List_Element(BACNET_LIST_ELEMENT_DATA *list_element);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
uint32_t Timer_Create(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool Timer_Delete(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void Timer_Cleanup(void);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void Timer_Init(void);
|
||||||
|
|
||||||
|
/* API for the program requests
|
||||||
|
note: return value is 0 for success, non-zero for failure
|
||||||
|
*/
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void *Timer_Context_Get(uint32_t object_instance);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void Timer_Context_Set(uint32_t object_instance, void *context);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
#endif
|
||||||
@@ -53,6 +53,7 @@
|
|||||||
#include "bacnet/basic/object/csv.h"
|
#include "bacnet/basic/object/csv.h"
|
||||||
#include "bacnet/basic/object/iv.h"
|
#include "bacnet/basic/object/iv.h"
|
||||||
#include "bacnet/basic/object/time_value.h"
|
#include "bacnet/basic/object/time_value.h"
|
||||||
|
#include "bacnet/basic/object/timer.h"
|
||||||
#include "bacnet/basic/object/channel.h"
|
#include "bacnet/basic/object/channel.h"
|
||||||
#include "bacnet/basic/object/program.h"
|
#include "bacnet/basic/object/program.h"
|
||||||
#include "bacnet/basic/object/lo.h"
|
#include "bacnet/basic/object/lo.h"
|
||||||
@@ -129,6 +130,7 @@
|
|||||||
defined(CONFIG_BACNET_BASIC_OBJECT_FILE) || \
|
defined(CONFIG_BACNET_BASIC_OBJECT_FILE) || \
|
||||||
defined(CONFIG_BACNET_BASIC_OBJECT_STRUCTURED_VIEW) || \
|
defined(CONFIG_BACNET_BASIC_OBJECT_STRUCTURED_VIEW) || \
|
||||||
defined(CONFIG_BACNET_BASIC_OBJECT_BITSTRING_VALUE) || \
|
defined(CONFIG_BACNET_BASIC_OBJECT_BITSTRING_VALUE) || \
|
||||||
|
defined(CONFIG_BACNET_BASIC_OBJECT_TIMER) || \
|
||||||
defined(CONFIG_BACNET_BASIC_OBJECT_PROGRAM) || \
|
defined(CONFIG_BACNET_BASIC_OBJECT_PROGRAM) || \
|
||||||
defined(CONFIG_BACNET_BASIC_OBJECT_CHARACTERSTRING_VALUE))
|
defined(CONFIG_BACNET_BASIC_OBJECT_CHARACTERSTRING_VALUE))
|
||||||
#define CONFIG_BACNET_BASIC_OBJECT_ALL
|
#define CONFIG_BACNET_BASIC_OBJECT_ALL
|
||||||
@@ -158,6 +160,7 @@
|
|||||||
#define CONFIG_BACNET_BASIC_OBJECT_FILE
|
#define CONFIG_BACNET_BASIC_OBJECT_FILE
|
||||||
#define CONFIG_BACNET_BASIC_OBJECT_STRUCTURED_VIEW
|
#define CONFIG_BACNET_BASIC_OBJECT_STRUCTURED_VIEW
|
||||||
#define CONFIG_BACNET_BASIC_OBJECT_BITSTRING_VALUE
|
#define CONFIG_BACNET_BASIC_OBJECT_BITSTRING_VALUE
|
||||||
|
#define CONFIG_BACNET_BASIC_OBJECT_TIMER
|
||||||
#define CONFIG_BACNET_BASIC_OBJECT_PROGRAM
|
#define CONFIG_BACNET_BASIC_OBJECT_PROGRAM
|
||||||
#define CONFIG_BACNET_BASIC_OBJECT_CHARACTERSTRING_VALUE
|
#define CONFIG_BACNET_BASIC_OBJECT_CHARACTERSTRING_VALUE
|
||||||
#endif
|
#endif
|
||||||
@@ -185,6 +188,10 @@
|
|||||||
#undef CONFIG_BACNET_BASIC_OBJECT_NETWORK_PORT
|
#undef CONFIG_BACNET_BASIC_OBJECT_NETWORK_PORT
|
||||||
#warning "Network Port is configured, but BACnet Protocol Revision < 17"
|
#warning "Network Port is configured, but BACnet Protocol Revision < 17"
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef CONFIG_BACNET_BASIC_OBJECT_TIMER
|
||||||
|
#undef CONFIG_BACNET_BASIC_OBJECT_TIMER
|
||||||
|
#warning "Timer is configured, but BACnet Protocol Revision < 17"
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (BACNET_PROTOCOL_REVISION < 24)
|
#if (BACNET_PROTOCOL_REVISION < 24)
|
||||||
@@ -750,6 +757,28 @@ static object_functions_t My_Object_Table[] = {
|
|||||||
CharacterString_Value_Delete,
|
CharacterString_Value_Delete,
|
||||||
NULL /* Timer */ },
|
NULL /* Timer */ },
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(CONFIG_BACNET_BASIC_OBJECT_TIMER)
|
||||||
|
{ OBJECT_TIMER,
|
||||||
|
Timer_Init,
|
||||||
|
Timer_Count,
|
||||||
|
Timer_Index_To_Instance,
|
||||||
|
Timer_Valid_Instance,
|
||||||
|
Timer_Object_Name,
|
||||||
|
Timer_Read_Property,
|
||||||
|
Timer_Write_Property,
|
||||||
|
Timer_Property_Lists,
|
||||||
|
NULL /* ReadRangeInfo */,
|
||||||
|
NULL /* Iterator */,
|
||||||
|
NULL /* Value_Lists */,
|
||||||
|
NULL /* COV */,
|
||||||
|
NULL /* COV Clear */,
|
||||||
|
NULL /* Intrinsic Reporting */,
|
||||||
|
Timer_Add_List_Element,
|
||||||
|
Timer_Remove_List_Element,
|
||||||
|
Timer_Create,
|
||||||
|
Timer_Delete,
|
||||||
|
Timer_Task },
|
||||||
|
#endif
|
||||||
#if defined(CONFIG_BACNET_BASIC_OBJECT_PROGRAM)
|
#if defined(CONFIG_BACNET_BASIC_OBJECT_PROGRAM)
|
||||||
{ OBJECT_BITSTRING_VALUE,
|
{ OBJECT_BITSTRING_VALUE,
|
||||||
Program_Init,
|
Program_Init,
|
||||||
@@ -1783,8 +1812,16 @@ uint32_t Device_Interval_Offset(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* return the length of the apdu encoded or BACNET_STATUS_ERROR for error or
|
/**
|
||||||
BACNET_STATUS_ABORT for abort message */
|
* ReadProperty handler for this object. For the given ReadProperty
|
||||||
|
* data, the application_data is loaded or the error flags are set.
|
||||||
|
*
|
||||||
|
* @param rpdata - BACNET_READ_PROPERTY_DATA data, including
|
||||||
|
* requested data and space for the reply, or error response.
|
||||||
|
*
|
||||||
|
* @return number of APDU bytes in the response, zero if no data, or
|
||||||
|
* BACNET_STATUS_ERROR on error.
|
||||||
|
*/
|
||||||
int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA *rpdata)
|
int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA *rpdata)
|
||||||
{
|
{
|
||||||
int apdu_len = 0; /* return value */
|
int apdu_len = 0; /* return value */
|
||||||
@@ -2007,7 +2044,8 @@ int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA *rpdata)
|
|||||||
* @param pObject - object table
|
* @param pObject - object table
|
||||||
* @param rpdata [in,out] Structure with the requested Object & Property info
|
* @param rpdata [in,out] Structure with the requested Object & Property info
|
||||||
* on entry, and APDU message on return.
|
* on entry, and APDU message on return.
|
||||||
* @return The length of the APDU on success, else BACNET_STATUS_ERROR
|
* @return number of APDU bytes in the response, zero if no data, or
|
||||||
|
* BACNET_STATUS_ERROR on error.
|
||||||
*/
|
*/
|
||||||
static int Read_Property_Common(
|
static int Read_Property_Common(
|
||||||
const struct object_functions *pObject, BACNET_READ_PROPERTY_DATA *rpdata)
|
const struct object_functions *pObject, BACNET_READ_PROPERTY_DATA *rpdata)
|
||||||
@@ -2019,7 +2057,7 @@ static int Read_Property_Common(
|
|||||||
struct special_property_list_t property_list;
|
struct special_property_list_t property_list;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((rpdata->application_data == NULL) ||
|
if ((rpdata == NULL) || (rpdata->application_data == NULL) ||
|
||||||
(rpdata->application_data_len == 0)) {
|
(rpdata->application_data_len == 0)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -2061,6 +2099,9 @@ int Device_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
|
|||||||
int apdu_len = BACNET_STATUS_ERROR;
|
int apdu_len = BACNET_STATUS_ERROR;
|
||||||
struct object_functions *pObject = NULL;
|
struct object_functions *pObject = NULL;
|
||||||
|
|
||||||
|
if (!rpdata) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
/* initialize the default return values */
|
/* initialize the default return values */
|
||||||
rpdata->error_class = ERROR_CLASS_OBJECT;
|
rpdata->error_class = ERROR_CLASS_OBJECT;
|
||||||
rpdata->error_code = ERROR_CODE_UNKNOWN_OBJECT;
|
rpdata->error_code = ERROR_CODE_UNKNOWN_OBJECT;
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ void handler_add_list_element(
|
|||||||
BACNET_LIST_ELEMENT_DATA list_element = { 0 };
|
BACNET_LIST_ELEMENT_DATA list_element = { 0 };
|
||||||
BACNET_NPDU_DATA npdu_data;
|
BACNET_NPDU_DATA npdu_data;
|
||||||
BACNET_ADDRESS my_address;
|
BACNET_ADDRESS my_address;
|
||||||
int len = 0;
|
int len = 0, err = 0;
|
||||||
bool status = true;
|
bool status = true;
|
||||||
int pdu_len = 0;
|
int pdu_len = 0;
|
||||||
int bytes_sent = 0;
|
int bytes_sent = 0;
|
||||||
@@ -102,7 +102,15 @@ void handler_add_list_element(
|
|||||||
status = false;
|
status = false;
|
||||||
}
|
}
|
||||||
if (status) {
|
if (status) {
|
||||||
if (Device_Add_List_Element(&list_element) >= 0) {
|
if (!property_list_bacnet_list_member(
|
||||||
|
list_element.object_type, list_element.object_property)) {
|
||||||
|
list_element.error_class = ERROR_CLASS_SERVICES;
|
||||||
|
list_element.error_code = ERROR_CODE_PROPERTY_IS_NOT_A_LIST;
|
||||||
|
err = BACNET_STATUS_ERROR;
|
||||||
|
} else {
|
||||||
|
err = Device_Add_List_Element(&list_element);
|
||||||
|
}
|
||||||
|
if (err == BACNET_STATUS_OK) {
|
||||||
len = encode_simple_ack(
|
len = encode_simple_ack(
|
||||||
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
||||||
SERVICE_CONFIRMED_ADD_LIST_ELEMENT);
|
SERVICE_CONFIRMED_ADD_LIST_ELEMENT);
|
||||||
@@ -153,7 +161,7 @@ void handler_remove_list_element(
|
|||||||
BACNET_LIST_ELEMENT_DATA list_element = { 0 };
|
BACNET_LIST_ELEMENT_DATA list_element = { 0 };
|
||||||
BACNET_NPDU_DATA npdu_data;
|
BACNET_NPDU_DATA npdu_data;
|
||||||
BACNET_ADDRESS my_address;
|
BACNET_ADDRESS my_address;
|
||||||
int len = 0;
|
int len = 0, err = BACNET_STATUS_OK;
|
||||||
bool status = true;
|
bool status = true;
|
||||||
int pdu_len = 0;
|
int pdu_len = 0;
|
||||||
int bytes_sent = 0;
|
int bytes_sent = 0;
|
||||||
@@ -192,28 +200,35 @@ void handler_remove_list_element(
|
|||||||
(long)list_element.array_index);
|
(long)list_element.array_index);
|
||||||
} else {
|
} else {
|
||||||
debug_print("RemoveListElement: Unable to decode request!\n");
|
debug_print("RemoveListElement: Unable to decode request!\n");
|
||||||
|
/* bad decoding or something we didn't understand - send an abort */
|
||||||
|
err = BACNET_STATUS_ABORT;
|
||||||
}
|
}
|
||||||
/* bad decoding or something we didn't understand - send an abort */
|
if (len > 0) {
|
||||||
if (len <= 0) {
|
if (!property_list_bacnet_list_member(
|
||||||
|
list_element.object_type, list_element.object_property)) {
|
||||||
|
list_element.error_class = ERROR_CLASS_SERVICES;
|
||||||
|
list_element.error_code = ERROR_CODE_PROPERTY_IS_NOT_A_LIST;
|
||||||
|
err = BACNET_STATUS_ERROR;
|
||||||
|
} else {
|
||||||
|
err = Device_Remove_List_Element(&list_element);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (err == BACNET_STATUS_OK) {
|
||||||
|
len = encode_simple_ack(
|
||||||
|
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
||||||
|
SERVICE_CONFIRMED_REMOVE_LIST_ELEMENT);
|
||||||
|
debug_print("RemoveListElement: Sending Simple Ack!\n");
|
||||||
|
} else if (err == BACNET_STATUS_ABORT) {
|
||||||
len = abort_encode_apdu(
|
len = abort_encode_apdu(
|
||||||
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
||||||
ABORT_REASON_OTHER, true);
|
ABORT_REASON_OTHER, true);
|
||||||
debug_print("RemoveListElement: Bad Encoding. Sending Abort!\n");
|
debug_print("RemoveListElement: Bad Encoding. Sending Abort!\n");
|
||||||
status = false;
|
} else {
|
||||||
}
|
len = bacerror_encode_apdu(
|
||||||
if (status) {
|
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
||||||
if (Device_Remove_List_Element(&list_element) >= 0) {
|
SERVICE_CONFIRMED_REMOVE_LIST_ELEMENT, list_element.error_class,
|
||||||
len = encode_simple_ack(
|
list_element.error_code);
|
||||||
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
debug_print("RemoveListElement: Sending Error!\n");
|
||||||
SERVICE_CONFIRMED_REMOVE_LIST_ELEMENT);
|
|
||||||
debug_print("RemoveListElement: Sending Simple Ack!\n");
|
|
||||||
} else {
|
|
||||||
len = bacerror_encode_apdu(
|
|
||||||
&Handler_Transmit_Buffer[pdu_len], service_data->invoke_id,
|
|
||||||
SERVICE_CONFIRMED_REMOVE_LIST_ELEMENT,
|
|
||||||
list_element.error_class, list_element.error_code);
|
|
||||||
debug_print("RemoveListElement: Sending Error!\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Send PDU */
|
/* Send PDU */
|
||||||
|
|||||||
@@ -244,6 +244,8 @@
|
|||||||
defined(BACAPP_SHED_LEVEL) || \
|
defined(BACAPP_SHED_LEVEL) || \
|
||||||
defined(BACAPP_ACCESS_RULE) || \
|
defined(BACAPP_ACCESS_RULE) || \
|
||||||
defined(BACAPP_CHANNEL_VALUE) || \
|
defined(BACAPP_CHANNEL_VALUE) || \
|
||||||
|
defined(BACAPP_TIMER_VALUE) || \
|
||||||
|
defined(BACAPP_NO_VALUE) || \
|
||||||
defined(BACAPP_LOG_RECORD) || \
|
defined(BACAPP_LOG_RECORD) || \
|
||||||
defined(BACAPP_SECURE_CONNECT) || \
|
defined(BACAPP_SECURE_CONNECT) || \
|
||||||
defined(BACAPP_TYPES_EXTRA))
|
defined(BACAPP_TYPES_EXTRA))
|
||||||
@@ -294,6 +296,8 @@
|
|||||||
#define BACAPP_SHED_LEVEL
|
#define BACAPP_SHED_LEVEL
|
||||||
#define BACAPP_ACCESS_RULE
|
#define BACAPP_ACCESS_RULE
|
||||||
#define BACAPP_CHANNEL_VALUE
|
#define BACAPP_CHANNEL_VALUE
|
||||||
|
#define BACAPP_TIMER_VALUE
|
||||||
|
#define BACAPP_NO_VALUE
|
||||||
#define BACAPP_LOG_RECORD
|
#define BACAPP_LOG_RECORD
|
||||||
#define BACAPP_SECURE_CONNECT
|
#define BACAPP_SECURE_CONNECT
|
||||||
#endif
|
#endif
|
||||||
@@ -321,6 +325,8 @@
|
|||||||
defined(BACAPP_SHED_LEVEL) || \
|
defined(BACAPP_SHED_LEVEL) || \
|
||||||
defined(BACAPP_ACCESS_RULE) || \
|
defined(BACAPP_ACCESS_RULE) || \
|
||||||
defined(BACAPP_CHANNEL_VALUE) || \
|
defined(BACAPP_CHANNEL_VALUE) || \
|
||||||
|
defined(BACAPP_TIMER_VALUE) || \
|
||||||
|
defined(BACAPP_NO_VALUE) || \
|
||||||
defined(BACAPP_LOG_RECORD)
|
defined(BACAPP_LOG_RECORD)
|
||||||
#define BACAPP_COMPLEX_TYPES
|
#define BACAPP_COMPLEX_TYPES
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+75
-4
@@ -613,13 +613,12 @@ void datetime_add_minutes(BACNET_DATE_TIME *bdatetime, int32_t minutes)
|
|||||||
uint32_t bdatetime_days = 0;
|
uint32_t bdatetime_days = 0;
|
||||||
int32_t days = 0;
|
int32_t days = 0;
|
||||||
|
|
||||||
/* convert bdatetime to seconds and days */
|
/* convert bdatetime to minutes and days */
|
||||||
bdatetime_minutes =
|
bdatetime_minutes =
|
||||||
datetime_hms_to_seconds_since_midnight(
|
datetime_hms_to_seconds_since_midnight(
|
||||||
bdatetime->time.hour, bdatetime->time.min, bdatetime->time.sec) /
|
bdatetime->time.hour, bdatetime->time.min, bdatetime->time.sec) /
|
||||||
60;
|
60;
|
||||||
bdatetime_days = datetime_days_since_epoch(&bdatetime->date);
|
bdatetime_days = datetime_days_since_epoch(&bdatetime->date);
|
||||||
|
|
||||||
/* more minutes than in a day? */
|
/* more minutes than in a day? */
|
||||||
days = minutes / (24 * 60);
|
days = minutes / (24 * 60);
|
||||||
bdatetime_days += days;
|
bdatetime_days += days;
|
||||||
@@ -645,14 +644,86 @@ void datetime_add_minutes(BACNET_DATE_TIME *bdatetime, int32_t minutes)
|
|||||||
bdatetime_days += days;
|
bdatetime_days += days;
|
||||||
bdatetime_minutes -= (days * 24 * 60);
|
bdatetime_minutes -= (days * 24 * 60);
|
||||||
}
|
}
|
||||||
|
/* convert bdatetime from minutes and days */
|
||||||
/* convert bdatetime from seconds and days */
|
|
||||||
datetime_hms_from_seconds_since_midnight(
|
datetime_hms_from_seconds_since_midnight(
|
||||||
bdatetime_minutes * 60, &bdatetime->time.hour, &bdatetime->time.min,
|
bdatetime_minutes * 60, &bdatetime->time.hour, &bdatetime->time.min,
|
||||||
NULL);
|
NULL);
|
||||||
datetime_days_since_epoch_into_date(bdatetime_days, &bdatetime->date);
|
datetime_days_since_epoch_into_date(bdatetime_days, &bdatetime->date);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Add or subtract seconds to a BACnet DateTime structure
|
||||||
|
* @param bdatetime [in] the starting date and time
|
||||||
|
* @param seconds [in] number of seconds to add or subtract from the time
|
||||||
|
*/
|
||||||
|
void datetime_add_seconds(BACNET_DATE_TIME *bdatetime, int32_t seconds)
|
||||||
|
{
|
||||||
|
uint32_t bdatetime_seconds = 0;
|
||||||
|
uint32_t bdatetime_days = 0;
|
||||||
|
int32_t days = 0;
|
||||||
|
|
||||||
|
/* convert bdatetime to seconds and days */
|
||||||
|
bdatetime_seconds = datetime_hms_to_seconds_since_midnight(
|
||||||
|
bdatetime->time.hour, bdatetime->time.min, bdatetime->time.sec);
|
||||||
|
bdatetime_days = datetime_days_since_epoch(&bdatetime->date);
|
||||||
|
/* more minutes than in a day? */
|
||||||
|
days = seconds / (24 * 60 * 60);
|
||||||
|
bdatetime_days += days;
|
||||||
|
seconds -= (days * 24 * 60 * 60);
|
||||||
|
/* less seconds - previous day? */
|
||||||
|
if (seconds < 0) {
|
||||||
|
/* convert to positive for easier math */
|
||||||
|
seconds *= -1;
|
||||||
|
if ((uint32_t)seconds > bdatetime_seconds) {
|
||||||
|
/* previous day */
|
||||||
|
bdatetime_days -= 1;
|
||||||
|
bdatetime_seconds += ((24 * 60 * 60) - seconds);
|
||||||
|
} else {
|
||||||
|
bdatetime_seconds -= seconds;
|
||||||
|
days = bdatetime_seconds / (24 * 60 * 60);
|
||||||
|
bdatetime_days += days;
|
||||||
|
bdatetime_seconds -= (days * 24 * 60 * 60);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* more days than current datetime? */
|
||||||
|
bdatetime_seconds += seconds;
|
||||||
|
days = bdatetime_seconds / (24 * 60 * 60);
|
||||||
|
bdatetime_days += days;
|
||||||
|
bdatetime_seconds -= (days * 24 * 60 * 60);
|
||||||
|
}
|
||||||
|
/* convert bdatetime from seconds and days */
|
||||||
|
datetime_hms_from_seconds_since_midnight(
|
||||||
|
bdatetime_seconds, &bdatetime->time.hour, &bdatetime->time.min,
|
||||||
|
&bdatetime->time.sec);
|
||||||
|
datetime_days_since_epoch_into_date(bdatetime_days, &bdatetime->date);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Add milliseconds to a BACnet DateTime structure
|
||||||
|
* @param bdatetime [in] the starting date and time
|
||||||
|
* @param milliseconds [in] number of milliseconds to add to the date and time
|
||||||
|
*/
|
||||||
|
void datetime_add_milliseconds(
|
||||||
|
BACNET_DATE_TIME *bdatetime, int32_t milliseconds)
|
||||||
|
{
|
||||||
|
uint32_t bdatetime_hundredths = 0;
|
||||||
|
int32_t hundredths = 0;
|
||||||
|
int32_t seconds = 0;
|
||||||
|
|
||||||
|
/* convert to seconds */
|
||||||
|
seconds = milliseconds / 1000;
|
||||||
|
hundredths = (milliseconds - (seconds * 1000)) / 10;
|
||||||
|
bdatetime_hundredths = bdatetime->time.hundredths;
|
||||||
|
bdatetime_hundredths += hundredths;
|
||||||
|
if (bdatetime_hundredths >= 100) {
|
||||||
|
/* adjust the seconds if hundredths overflow */
|
||||||
|
seconds++;
|
||||||
|
bdatetime_hundredths -= 100;
|
||||||
|
}
|
||||||
|
datetime_add_seconds(bdatetime, seconds);
|
||||||
|
bdatetime->time.hundredths = bdatetime_hundredths;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Calculates the number of seconds since epoch from datetime
|
* @brief Calculates the number of seconds since epoch from datetime
|
||||||
* @param bdatetime [in] the starting date and time
|
* @param bdatetime [in] the starting date and time
|
||||||
|
|||||||
@@ -185,9 +185,14 @@ void datetime_copy_time(BACNET_TIME *dest, const BACNET_TIME *src);
|
|||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
void datetime_copy(BACNET_DATE_TIME *dest, const BACNET_DATE_TIME *src);
|
void datetime_copy(BACNET_DATE_TIME *dest, const BACNET_DATE_TIME *src);
|
||||||
|
|
||||||
/* utility add or subtract minutes function */
|
/* utility add or subtract time function */
|
||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
void datetime_add_minutes(BACNET_DATE_TIME *bdatetime, int32_t minutes);
|
void datetime_add_minutes(BACNET_DATE_TIME *bdatetime, int32_t minutes);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void datetime_add_seconds(BACNET_DATE_TIME *bdatetime, int32_t seconds);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void datetime_add_milliseconds(
|
||||||
|
BACNET_DATE_TIME *bdatetime, int32_t milliseconds);
|
||||||
|
|
||||||
BACNET_STACK_EXPORT
|
BACNET_STACK_EXPORT
|
||||||
bacnet_time_t datetime_seconds_since_epoch(const BACNET_DATE_TIME *bdatetime);
|
bacnet_time_t datetime_seconds_since_epoch(const BACNET_DATE_TIME *bdatetime);
|
||||||
|
|||||||
@@ -408,7 +408,8 @@ const int *property_list_bacnet_array(void)
|
|||||||
bool property_list_bacnet_array_member(
|
bool property_list_bacnet_array_member(
|
||||||
BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property)
|
BACNET_OBJECT_TYPE object_type, BACNET_PROPERTY_ID object_property)
|
||||||
{
|
{
|
||||||
/* exceptions where property is an BACnetARRAY only in specific objects */
|
/* exceptions where a property is an BACnetARRAY or a BACnetLIST
|
||||||
|
only in specific object types */
|
||||||
switch (object_type) {
|
switch (object_type) {
|
||||||
case OBJECT_GLOBAL_GROUP:
|
case OBJECT_GLOBAL_GROUP:
|
||||||
switch (object_property) {
|
switch (object_property) {
|
||||||
@@ -459,6 +460,7 @@ static const int Properties_BACnetLIST[] = {
|
|||||||
PROP_UTC_TIME_SYNCHRONIZATION_RECIPIENTS,
|
PROP_UTC_TIME_SYNCHRONIZATION_RECIPIENTS,
|
||||||
PROP_ACTIVE_COV_MULTIPLE_SUBSCRIPTIONS,
|
PROP_ACTIVE_COV_MULTIPLE_SUBSCRIPTIONS,
|
||||||
PROP_LIST_OF_GROUP_MEMBERS,
|
PROP_LIST_OF_GROUP_MEMBERS,
|
||||||
|
PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES,
|
||||||
PROP_ACCEPTED_MODES,
|
PROP_ACCEPTED_MODES,
|
||||||
PROP_LIFE_SAFETY_ALARM_VALUES,
|
PROP_LIFE_SAFETY_ALARM_VALUES,
|
||||||
PROP_ALARM_VALUES,
|
PROP_ALARM_VALUES,
|
||||||
@@ -524,11 +526,10 @@ bool property_list_bacnet_list_member(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case OBJECT_SCHEDULE:
|
case OBJECT_CHANNEL:
|
||||||
case OBJECT_TIMER:
|
|
||||||
switch (object_property) {
|
switch (object_property) {
|
||||||
case PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES:
|
case PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES:
|
||||||
return true;
|
return false;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,904 @@
|
|||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* @brief BACnetTimerStateChangeValue data type encoding and decoding
|
||||||
|
* @author Steve Karg <skarg@users.sourceforge.net>
|
||||||
|
* @date October 2025
|
||||||
|
* @copyright SPDX-License-Identifier: GPL-2.0-or-later WITH GCC-exception-2.0
|
||||||
|
*/
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include <float.h>
|
||||||
|
/* BACnet Stack defines - first */
|
||||||
|
#include "bacnet/bacdef.h"
|
||||||
|
/* BACnet Stack API */
|
||||||
|
#include "bacnet/bacdcode.h"
|
||||||
|
#include "bacnet/bacstr.h"
|
||||||
|
#include "bacnet/bacint.h"
|
||||||
|
#include "bacnet/bacreal.h"
|
||||||
|
#include "bacnet/timer_value.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Encode a context tagged BACnetTimerStateChangeValue with no-value type
|
||||||
|
* @param apdu buffer to be encoded, or NULL for length
|
||||||
|
* @param tag_number - context tag number to be encoded
|
||||||
|
* @param value The value to be encoded.
|
||||||
|
* @return the number of apdu bytes encoded
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_no_value_encode(uint8_t *apdu)
|
||||||
|
{
|
||||||
|
int len = 0;
|
||||||
|
int apdu_len = 0;
|
||||||
|
const uint8_t tag_number = 0;
|
||||||
|
|
||||||
|
/* no-value[0] Null */
|
||||||
|
len = encode_opening_tag(apdu, tag_number);
|
||||||
|
apdu_len += len;
|
||||||
|
if (apdu) {
|
||||||
|
apdu += len;
|
||||||
|
}
|
||||||
|
len = encode_application_null(apdu);
|
||||||
|
apdu_len += len;
|
||||||
|
if (apdu) {
|
||||||
|
apdu += len;
|
||||||
|
}
|
||||||
|
len = encode_closing_tag(apdu, tag_number);
|
||||||
|
apdu_len += len;
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Decodes a context tagged BACnetTimerStateChangeValue with
|
||||||
|
* no-value type
|
||||||
|
* @param apdu - the APDU buffer
|
||||||
|
* @param apdu_size - the APDU buffer size
|
||||||
|
* @return length of the APDU buffer decoded, or BACNET_STATUS_ERROR
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_no_value_decode(const uint8_t *apdu, uint32_t apdu_size)
|
||||||
|
{
|
||||||
|
int apdu_len = 0;
|
||||||
|
int len;
|
||||||
|
const uint8_t tag_number = 0;
|
||||||
|
|
||||||
|
/* no-value[0] Null */
|
||||||
|
if (!bacnet_is_opening_tag_number(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, tag_number, &len)) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
apdu_len += len;
|
||||||
|
len = bacnet_null_application_decode(&apdu[apdu_len], apdu_size - apdu_len);
|
||||||
|
if (len < 0) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
apdu_len += len;
|
||||||
|
if (!bacnet_is_closing_tag_number(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, tag_number, &len)) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
apdu_len += len;
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Print a no-value to a string for EPICS
|
||||||
|
* @param str - destination string, or NULL for length only
|
||||||
|
* @param str_len - length of the destination string, or 0 for length only
|
||||||
|
* @return number of characters written
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_no_value_to_ascii(char *str, size_t str_len)
|
||||||
|
{
|
||||||
|
return snprintf(str, str_len, "no-value");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Parse a string into a application tag value
|
||||||
|
* @param tag [out] The application tag value if found
|
||||||
|
* @param argv [in] The string to parse
|
||||||
|
* @return true on success, else false
|
||||||
|
*/
|
||||||
|
bool bacnet_timer_value_no_value_from_ascii(uint8_t *tag, const char *argv)
|
||||||
|
{
|
||||||
|
bool status = false;
|
||||||
|
|
||||||
|
if (bacnet_stricmp(argv, "no-value") == 0) {
|
||||||
|
if (tag) {
|
||||||
|
*tag = BACNET_APPLICATION_TAG_NO_VALUE;
|
||||||
|
}
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Encode a given BACnetTimerStateChangeValue
|
||||||
|
* @param apdu - APDU buffer for storing the encoded data, or NULL for length
|
||||||
|
* @param value - BACNET_TIMER_STATE_CHANGE_VALUE value
|
||||||
|
* @return number of bytes in the APDU
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_type_encode(
|
||||||
|
uint8_t *apdu, const BACNET_TIMER_STATE_CHANGE_VALUE *value)
|
||||||
|
{
|
||||||
|
int apdu_len = 0;
|
||||||
|
|
||||||
|
if (!value) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
switch (value->tag) {
|
||||||
|
case BACNET_APPLICATION_TAG_NULL:
|
||||||
|
apdu_len = encode_application_null(apdu);
|
||||||
|
break;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
case BACNET_APPLICATION_TAG_BOOLEAN:
|
||||||
|
apdu_len = encode_application_boolean(apdu, value->type.Boolean);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_UNSIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
|
||||||
|
apdu_len =
|
||||||
|
encode_application_unsigned(apdu, value->type.Unsigned_Int);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_SIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||||
|
apdu_len = encode_application_signed(apdu, value->type.Signed_Int);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
case BACNET_APPLICATION_TAG_REAL:
|
||||||
|
apdu_len = encode_application_real(apdu, value->type.Real);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
case BACNET_APPLICATION_TAG_DOUBLE:
|
||||||
|
apdu_len = encode_application_double(apdu, value->type.Double);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OCTET_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_OCTET_STRING:
|
||||||
|
apdu_len = encode_application_octet_string(
|
||||||
|
apdu, &value->type.Octet_String);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CHARACTER_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_CHARACTER_STRING:
|
||||||
|
apdu_len = encode_application_character_string(
|
||||||
|
apdu, &value->type.Character_String);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BIT_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_BIT_STRING:
|
||||||
|
apdu_len =
|
||||||
|
encode_application_bitstring(apdu, &value->type.Bit_String);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_ENUMERATED)
|
||||||
|
case BACNET_APPLICATION_TAG_ENUMERATED:
|
||||||
|
apdu_len =
|
||||||
|
encode_application_enumerated(apdu, value->type.Enumerated);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATE)
|
||||||
|
case BACNET_APPLICATION_TAG_DATE:
|
||||||
|
apdu_len = encode_application_date(apdu, &value->type.Date);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_TIME)
|
||||||
|
case BACNET_APPLICATION_TAG_TIME:
|
||||||
|
apdu_len = encode_application_time(apdu, &value->type.Time);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OBJECT_ID)
|
||||||
|
case BACNET_APPLICATION_TAG_OBJECT_ID:
|
||||||
|
apdu_len = encode_application_object_id(
|
||||||
|
apdu, (int)value->type.Object_Id.type,
|
||||||
|
value->type.Object_Id.instance);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_NO_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_NO_VALUE:
|
||||||
|
/* no-value[0] Null */
|
||||||
|
apdu_len = bacnet_timer_value_no_value_encode(apdu);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CONSTRUCTED_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_ABSTRACT_SYNTAX:
|
||||||
|
/* constructed-value[1] ABSTRACT-SYNTAX.&Type */
|
||||||
|
apdu_len = bacnet_constructed_value_context_encode(
|
||||||
|
apdu, 1, &value->type.Constructed_Value);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATETIME)
|
||||||
|
case BACNET_APPLICATION_TAG_DATETIME:
|
||||||
|
/* datetime[2] BACnetDateTime */
|
||||||
|
apdu_len =
|
||||||
|
bacapp_encode_context_datetime(apdu, 2, &value->type.Date_Time);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND)
|
||||||
|
case BACNET_APPLICATION_TAG_LIGHTING_COMMAND:
|
||||||
|
apdu_len = lighting_command_encode_context(
|
||||||
|
apdu, 3, &value->type.Lighting_Command);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Decode a BACnetTimerStateChangeValue
|
||||||
|
* @param apdu - the APDU buffer
|
||||||
|
* @param apdu_size - the APDU buffer size
|
||||||
|
* @param tag_data_type - application tag type expected
|
||||||
|
* @param len_value_type - the length or value type of the tag value content.
|
||||||
|
* @param value - the value where the decoded data is copied into
|
||||||
|
* @return length of the APDU buffer decoded, or BACNET_STATUS_ERROR
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_type_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
size_t apdu_size,
|
||||||
|
uint8_t tag_data_type,
|
||||||
|
uint32_t len_value_type,
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value)
|
||||||
|
{
|
||||||
|
int len = 0;
|
||||||
|
|
||||||
|
if (!apdu) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
if (!value) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
switch (tag_data_type) {
|
||||||
|
case BACNET_APPLICATION_TAG_NULL:
|
||||||
|
/* nothing else to do */
|
||||||
|
break;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
case BACNET_APPLICATION_TAG_BOOLEAN:
|
||||||
|
value->type.Boolean = decode_boolean(len_value_type);
|
||||||
|
len = 0;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_UNSIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
|
||||||
|
len = bacnet_unsigned_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Unsigned_Int);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_SIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||||
|
len = bacnet_signed_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Signed_Int);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
case BACNET_APPLICATION_TAG_REAL:
|
||||||
|
len = bacnet_real_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &(value->type.Real));
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
case BACNET_APPLICATION_TAG_DOUBLE:
|
||||||
|
len = bacnet_double_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &(value->type.Double));
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OCTET_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_OCTET_STRING:
|
||||||
|
len = bacnet_octet_string_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Octet_String);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CHARACTER_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_CHARACTER_STRING:
|
||||||
|
len = bacnet_character_string_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Character_String);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BIT_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_BIT_STRING:
|
||||||
|
len = bacnet_bitstring_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Bit_String);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_ENUMERATED)
|
||||||
|
case BACNET_APPLICATION_TAG_ENUMERATED:
|
||||||
|
len = bacnet_enumerated_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Enumerated);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATE)
|
||||||
|
case BACNET_APPLICATION_TAG_DATE:
|
||||||
|
len = bacnet_date_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Date);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_TIME)
|
||||||
|
case BACNET_APPLICATION_TAG_TIME:
|
||||||
|
len = bacnet_time_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Time);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OBJECT_ID)
|
||||||
|
case BACNET_APPLICATION_TAG_OBJECT_ID:
|
||||||
|
len = bacnet_object_id_decode(
|
||||||
|
apdu, apdu_size, len_value_type, &value->type.Object_Id.type,
|
||||||
|
&value->type.Object_Id.instance);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
len = BACNET_STATUS_ERROR;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if ((len == 0) && (tag_data_type != BACNET_APPLICATION_TAG_NULL) &&
|
||||||
|
(tag_data_type != BACNET_APPLICATION_TAG_BOOLEAN) &&
|
||||||
|
(tag_data_type != BACNET_APPLICATION_TAG_OCTET_STRING)) {
|
||||||
|
/* indicate that we were not able to decode the value */
|
||||||
|
len = BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
if (len != BACNET_STATUS_ERROR) {
|
||||||
|
value->tag = tag_data_type;
|
||||||
|
}
|
||||||
|
|
||||||
|
return len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Encode a given BACnetTimerStateChangeValue
|
||||||
|
* @param apdu - APDU buffer for storing the encoded data, or NULL for length
|
||||||
|
* @param apdu_size - size of the APDU buffer
|
||||||
|
* @param value - BACNET_TIMER_STATE_CHANGE_VALUE value
|
||||||
|
* @return number of bytes in the APDU, or BACNET_STATUS_ERROR
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_encode(
|
||||||
|
uint8_t *apdu,
|
||||||
|
size_t apdu_size,
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value)
|
||||||
|
{
|
||||||
|
size_t apdu_len = 0; /* total length of the apdu, return value */
|
||||||
|
|
||||||
|
apdu_len = bacnet_timer_value_type_encode(NULL, value);
|
||||||
|
if (apdu_len > apdu_size) {
|
||||||
|
apdu_len = 0;
|
||||||
|
} else {
|
||||||
|
apdu_len = bacnet_timer_value_type_encode(apdu, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Decode a given BACnetTimerStateChangeValue
|
||||||
|
* @param apdu - APDU buffer for decoding
|
||||||
|
* @param apdu_size - Count of valid bytes in the buffer
|
||||||
|
* @param value - BACNET_TIMER_STATE_CHANGE_VALUE value to store the decoded
|
||||||
|
* data
|
||||||
|
* @return number of bytes decoded or BACNET_STATUS_ERROR on error
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
size_t apdu_size,
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value)
|
||||||
|
{
|
||||||
|
int len = 0, tag_len = 0;
|
||||||
|
int apdu_len = 0;
|
||||||
|
BACNET_TAG tag = { 0 };
|
||||||
|
|
||||||
|
if (!apdu) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
if (!value) {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
tag_len = bacnet_tag_decode(&apdu[apdu_len], apdu_size - apdu_len, &tag);
|
||||||
|
if (tag_len > 0) {
|
||||||
|
apdu_len += tag_len;
|
||||||
|
if (tag.application) {
|
||||||
|
len = bacnet_timer_value_type_decode(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, tag.number,
|
||||||
|
tag.len_value_type, value);
|
||||||
|
if (len >= 0) {
|
||||||
|
apdu_len += len;
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
} else if (tag.opening) {
|
||||||
|
switch (tag.number) {
|
||||||
|
case 0:
|
||||||
|
/* no-value[0] Null */
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_NO_VALUE;
|
||||||
|
if (tag.len_value_type == 0) {
|
||||||
|
len = tag_len;
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
/* constructed-value[1] ABSTRACT-SYNTAX.&Type */
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_ABSTRACT_SYNTAX;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CONSTRUCTED_VALUE)
|
||||||
|
len = bacnet_enclosed_data_length(apdu, apdu_size);
|
||||||
|
len = bacnet_constructed_value_decode(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, len,
|
||||||
|
&value->type.Constructed_Value);
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
/* datetime[2] BACnetDateTime */
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_DATETIME;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATETIME)
|
||||||
|
len = bacnet_datetime_decode(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len,
|
||||||
|
&value->type.Date_Time);
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
/* lighting-command[3] BACnetLightingCommand */
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_LIGHTING_COMMAND;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND)
|
||||||
|
len = lighting_command_decode(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len,
|
||||||
|
&value->type.Lighting_Command);
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
if (len > 0) {
|
||||||
|
apdu_len += len;
|
||||||
|
if (bacnet_is_closing_tag_number(
|
||||||
|
&apdu[apdu_len], apdu_size - apdu_len, tag.number,
|
||||||
|
&len)) {
|
||||||
|
apdu_len += len;
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return BACNET_STATUS_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
return apdu_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Compare two BACnetTimerStateChangeValue values
|
||||||
|
* @param value1 [in] The first BACnetTimerStateChangeValue value
|
||||||
|
* @param value2 [in] The second BACnetTimerStateChangeValue value
|
||||||
|
* @return True if the values are the same, else False
|
||||||
|
*/
|
||||||
|
bool bacnet_timer_value_same(
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value1,
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value2)
|
||||||
|
{
|
||||||
|
if (value1->tag != value2->tag) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
switch (value1->tag) {
|
||||||
|
case BACNET_APPLICATION_TAG_NULL:
|
||||||
|
return true;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
case BACNET_APPLICATION_TAG_BOOLEAN:
|
||||||
|
return value1->type.Boolean == value2->type.Boolean;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_UNSIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
|
||||||
|
return value1->type.Unsigned_Int == value2->type.Unsigned_Int;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_SIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||||
|
return value1->type.Signed_Int == value2->type.Signed_Int;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
case BACNET_APPLICATION_TAG_REAL:
|
||||||
|
return !islessgreater(value1->type.Real, value2->type.Real);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
case BACNET_APPLICATION_TAG_DOUBLE:
|
||||||
|
return !islessgreater(value1->type.Double, value2->type.Double);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OCTET_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_OCTET_STRING:
|
||||||
|
return octetstring_value_same(
|
||||||
|
&value1->type.Octet_String, &value2->type.Octet_String);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CHARACTER_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_CHARACTER_STRING:
|
||||||
|
return characterstring_same(
|
||||||
|
&value1->type.Character_String, &value2->type.Character_String);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BIT_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_BIT_STRING:
|
||||||
|
return bitstring_same(
|
||||||
|
&value1->type.Bit_String, &value2->type.Bit_String);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_ENUMERATED)
|
||||||
|
case BACNET_APPLICATION_TAG_ENUMERATED:
|
||||||
|
return value1->type.Enumerated == value2->type.Enumerated;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATE)
|
||||||
|
case BACNET_APPLICATION_TAG_DATE:
|
||||||
|
if (datetime_compare_date(&value1->type.Date, &value2->type.Date) ==
|
||||||
|
0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_TIME)
|
||||||
|
case BACNET_APPLICATION_TAG_TIME:
|
||||||
|
if (datetime_compare_time(&value1->type.Time, &value2->type.Time) ==
|
||||||
|
0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OBJECT_ID)
|
||||||
|
case BACNET_APPLICATION_TAG_OBJECT_ID:
|
||||||
|
return bacnet_object_id_same(
|
||||||
|
value1->type.Object_Id.type, value1->type.Object_Id.instance,
|
||||||
|
value2->type.Object_Id.type, value2->type.Object_Id.instance);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATETIME)
|
||||||
|
case BACNET_APPLICATION_TAG_DATETIME:
|
||||||
|
return (
|
||||||
|
datetime_compare(
|
||||||
|
&value1->type.Date_Time, &value2->type.Date_Time) == 0);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CONSTRUCTED_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_ABSTRACT_SYNTAX:
|
||||||
|
return bacnet_constructed_value_same(
|
||||||
|
&value1->type.Constructed_Value,
|
||||||
|
&value2->type.Constructed_Value);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND)
|
||||||
|
case BACNET_APPLICATION_TAG_LIGHTING_COMMAND:
|
||||||
|
return lighting_command_same(
|
||||||
|
&value1->type.Lighting_Command, &value2->type.Lighting_Command);
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Copy a BACnetTimerStateChangeValue to another
|
||||||
|
* @param value1 [in] The first BACnetTimerStateChangeValue value
|
||||||
|
* @param value2 [in] The second BACnetTimerStateChangeValue value
|
||||||
|
* @return true if the value was copied, else false
|
||||||
|
*/
|
||||||
|
bool bacnet_timer_value_copy(
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *dest,
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *src)
|
||||||
|
{
|
||||||
|
if (!dest || !src) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
dest->tag = src->tag;
|
||||||
|
switch (src->tag) {
|
||||||
|
case BACNET_APPLICATION_TAG_NULL:
|
||||||
|
case BACNET_APPLICATION_TAG_NO_VALUE:
|
||||||
|
return true;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
case BACNET_APPLICATION_TAG_BOOLEAN:
|
||||||
|
dest->type.Boolean = src->type.Boolean;
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_UNSIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
|
||||||
|
dest->type.Unsigned_Int = src->type.Unsigned_Int;
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_SIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||||
|
dest->type.Signed_Int = src->type.Signed_Int;
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
case BACNET_APPLICATION_TAG_REAL:
|
||||||
|
dest->type.Real = src->type.Real;
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
case BACNET_APPLICATION_TAG_DOUBLE:
|
||||||
|
dest->type.Double = src->type.Double;
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OCTET_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_OCTET_STRING:
|
||||||
|
return octetstring_copy(
|
||||||
|
&dest->type.Octet_String, &src->type.Octet_String);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CHARACTER_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_CHARACTER_STRING:
|
||||||
|
return characterstring_copy(
|
||||||
|
&dest->type.Character_String, &src->type.Character_String);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BIT_STRING)
|
||||||
|
case BACNET_APPLICATION_TAG_BIT_STRING:
|
||||||
|
return bitstring_copy(
|
||||||
|
&dest->type.Bit_String, &src->type.Bit_String);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_ENUMERATED)
|
||||||
|
case BACNET_APPLICATION_TAG_ENUMERATED:
|
||||||
|
dest->type.Enumerated = src->type.Enumerated;
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATE)
|
||||||
|
case BACNET_APPLICATION_TAG_DATE:
|
||||||
|
datetime_copy_date(&dest->type.Date, &src->type.Date);
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_TIME)
|
||||||
|
case BACNET_APPLICATION_TAG_TIME:
|
||||||
|
datetime_copy_time(&dest->type.Time, &src->type.Time);
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OBJECT_ID)
|
||||||
|
case BACNET_APPLICATION_TAG_OBJECT_ID:
|
||||||
|
dest->type.Object_Id.type = src->type.Object_Id.type;
|
||||||
|
dest->type.Object_Id.instance = src->type.Object_Id.instance;
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATETIME)
|
||||||
|
case BACNET_APPLICATION_TAG_DATETIME:
|
||||||
|
datetime_copy(&dest->type.Date_Time, &src->type.Date_Time);
|
||||||
|
return true;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CONSTRUCTED_VALUE)
|
||||||
|
case BACNET_APPLICATION_TAG_ABSTRACT_SYNTAX:
|
||||||
|
return bacnet_constructed_value_copy(
|
||||||
|
&dest->type.Constructed_Value, &src->type.Constructed_Value);
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND)
|
||||||
|
case BACNET_APPLICATION_TAG_LIGHTING_COMMAND:
|
||||||
|
return lighting_command_copy(
|
||||||
|
&dest->type.Lighting_Command, &src->type.Lighting_Command);
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Parse a string into a BACnetTimerStateChangeValue structure
|
||||||
|
* @param value [out] The BACnetTimerStateChangeValue value
|
||||||
|
* @param argv [in] The string to parse
|
||||||
|
* @return true on success, else false
|
||||||
|
*/
|
||||||
|
bool bacnet_timer_value_from_ascii(
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value, const char *argv)
|
||||||
|
{
|
||||||
|
bool status = false;
|
||||||
|
int count;
|
||||||
|
unsigned long unsigned_value;
|
||||||
|
long signed_value;
|
||||||
|
float single_value;
|
||||||
|
double double_value;
|
||||||
|
const char *negative;
|
||||||
|
const char *decimal_point;
|
||||||
|
const char *lighting_command;
|
||||||
|
const char *real_string;
|
||||||
|
const char *double_string;
|
||||||
|
|
||||||
|
if (!value || !argv) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
if (bacnet_stricmp(argv, "null") == 0) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_NULL;
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
status = bacnet_timer_value_no_value_from_ascii(&value->tag, argv);
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
if (bacnet_stricmp(argv, "true") == 0) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_BOOLEAN;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
value->type.Boolean = true;
|
||||||
|
#endif
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
if (bacnet_stricmp(argv, "false") == 0) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_BOOLEAN;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
value->type.Boolean = false;
|
||||||
|
#endif
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
lighting_command = strchr(argv, 'L');
|
||||||
|
if (!lighting_command) {
|
||||||
|
lighting_command = strchr(argv, 'l');
|
||||||
|
}
|
||||||
|
if (lighting_command) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_LIGHTING_COMMAND;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND)
|
||||||
|
status = lighting_command_from_ascii(
|
||||||
|
&value->type.Lighting_Command, argv + 1);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
real_string = strchr(argv, 'F');
|
||||||
|
if (!real_string) {
|
||||||
|
real_string = strchr(argv, 'f');
|
||||||
|
}
|
||||||
|
if (real_string) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_REAL;
|
||||||
|
count = sscanf(argv + 1, "%f", &single_value);
|
||||||
|
if (count == 1) {
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
value->type.Real = single_value;
|
||||||
|
#endif
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
double_string = strchr(argv, 'D');
|
||||||
|
if (!double_string) {
|
||||||
|
double_string = strchr(argv, 'd');
|
||||||
|
}
|
||||||
|
if (double_string) {
|
||||||
|
count = sscanf(argv + 1, "%lf", &double_value);
|
||||||
|
if (count == 1) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_DOUBLE;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
value->type.Double = double_value;
|
||||||
|
#endif
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
decimal_point = strchr(argv, '.');
|
||||||
|
if (decimal_point) {
|
||||||
|
count = sscanf(argv, "%lf", &double_value);
|
||||||
|
if (count == 1) {
|
||||||
|
if (isgreaterequal(double_value, -FLT_MAX) &&
|
||||||
|
islessequal(double_value, FLT_MAX)) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_REAL;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
value->type.Real = (float)double_value;
|
||||||
|
#endif
|
||||||
|
} else {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_DOUBLE;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
value->type.Double = double_value;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
negative = strchr(argv, '-');
|
||||||
|
if (negative) {
|
||||||
|
count = sscanf(argv, "%ld", &signed_value);
|
||||||
|
if (count == 1) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_SIGNED_INT;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_SIGNED)
|
||||||
|
value->type.Signed_Int = signed_value;
|
||||||
|
#endif
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!status) {
|
||||||
|
count = sscanf(argv, "%lu", &unsigned_value);
|
||||||
|
if (count == 1) {
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_UNSIGNED)
|
||||||
|
value->type.Unsigned_Int = unsigned_value;
|
||||||
|
#endif
|
||||||
|
status = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Produce a string from a BACnetTimerStateChangeValue structure
|
||||||
|
* @param value [in] The BACnetTimerStateChangeValue value
|
||||||
|
* @param str [out] The string to produce, NULL to get length only
|
||||||
|
* @param str_size [in] The size of the string buffer
|
||||||
|
* @return length of the produced string
|
||||||
|
*/
|
||||||
|
int bacnet_timer_value_to_ascii(
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value, char *str, size_t str_size)
|
||||||
|
{
|
||||||
|
int str_len = 0;
|
||||||
|
|
||||||
|
if (!value) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
switch (value->tag) {
|
||||||
|
case BACNET_APPLICATION_TAG_NULL:
|
||||||
|
str_len = snprintf(str, str_size, "null");
|
||||||
|
break;
|
||||||
|
case BACNET_APPLICATION_TAG_NO_VALUE:
|
||||||
|
str_len = bacnet_timer_value_no_value_to_ascii(str, str_size);
|
||||||
|
break;
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
case BACNET_APPLICATION_TAG_BOOLEAN:
|
||||||
|
if (value->type.Boolean) {
|
||||||
|
str_len = snprintf(str, str_size, "true");
|
||||||
|
} else {
|
||||||
|
str_len = snprintf(str, str_size, "false");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_UNSIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_UNSIGNED_INT:
|
||||||
|
str_len = snprintf(
|
||||||
|
str, str_size, "%lu", (unsigned long)value->type.Unsigned_Int);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_SIGNED)
|
||||||
|
case BACNET_APPLICATION_TAG_SIGNED_INT:
|
||||||
|
str_len =
|
||||||
|
snprintf(str, str_size, "%ld", (long)value->type.Signed_Int);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
case BACNET_APPLICATION_TAG_REAL:
|
||||||
|
str_len = snprintf(str, str_size, "%f", (double)value->type.Real);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
case BACNET_APPLICATION_TAG_DOUBLE:
|
||||||
|
str_len = snprintf(str, str_size, "%f", value->type.Double);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND)
|
||||||
|
case BACNET_APPLICATION_TAG_LIGHTING_COMMAND:
|
||||||
|
str_len = lighting_command_to_ascii(
|
||||||
|
&value->type.Lighting_Command, str, str_size);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return str_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Convert an array of BACnetTimerStateChangeValue to linked list
|
||||||
|
* @param array pointer to element zero of the array
|
||||||
|
* @param size number of elements in the array
|
||||||
|
*/
|
||||||
|
void bacnet_timer_value_link_array(
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *array, size_t size)
|
||||||
|
{
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
|
for (i = 0; i < size; i++) {
|
||||||
|
if (i > 0) {
|
||||||
|
array[i - 1].next = &array[i];
|
||||||
|
}
|
||||||
|
array[i].next = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* @brief BACnetTimerStateChangeValue data type encoding and decoding API
|
||||||
|
* @author Steve Karg <skarg@users.sourceforge.net>
|
||||||
|
* @date October 2025
|
||||||
|
* @copyright SPDX-License-Identifier: MIT
|
||||||
|
*/
|
||||||
|
#ifndef BACNET_TIMER_VALUE_H
|
||||||
|
#define BACNET_TIMER_VALUE_H
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
/* BACnet Stack defines - first */
|
||||||
|
#include "bacnet/bacdef.h"
|
||||||
|
#include "bacnet/bacstr.h"
|
||||||
|
#include "bacnet/bacdcode.h"
|
||||||
|
#include "bacnet/bacint.h"
|
||||||
|
#include "bacnet/datetime.h"
|
||||||
|
#include "bacnet/lighting.h"
|
||||||
|
|
||||||
|
/* BACNET_TIMER_STATE_CHANGE_VALUE decodes WriteProperty service requests
|
||||||
|
Define the datatypes that your application supports */
|
||||||
|
#if !(/* check for any defines, and if none, use NUMERIC */ \
|
||||||
|
defined(BACNET_TIMER_VALUE_NUMERIC) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_ALL) || defined(BACNET_TIMER_VALUE_NULL) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_BOOLEAN) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_UNSIGNED) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_SIGNED) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_REAL) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_DOUBLE) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_OCTET_STRING) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_CHARACTER_STRING) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_BIT_STRING) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_ENUMERATED) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_DATE) || defined(BACNET_TIMER_VALUE_TIME) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_OBJECT_ID) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_NO_VALUE) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_CONSTRUCTED_VALUE) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_DATETIME) || \
|
||||||
|
defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND))
|
||||||
|
#define BACNET_TIMER_VALUE_NUMERIC
|
||||||
|
#elif defined(BACNET_TIMER_VALUE_ALL)
|
||||||
|
#define BACNET_TIMER_VALUE_NUMERIC
|
||||||
|
#define BACNET_TIMER_VALUE_OCTET_STRING
|
||||||
|
#define BACNET_TIMER_VALUE_CHARACTER_STRING
|
||||||
|
#define BACNET_TIMER_VALUE_BIT_STRING
|
||||||
|
#define BACNET_TIMER_VALUE_DATE
|
||||||
|
#define BACNET_TIMER_VALUE_TIME
|
||||||
|
#define BACNET_TIMER_VALUE_OBJECT_ID
|
||||||
|
#define BACNET_TIMER_VALUE_DATETIME
|
||||||
|
#define BACNET_TIMER_VALUE_CONSTRUCTED_VALUE
|
||||||
|
#define BACNET_TIMER_VALUE_LIGHTING_COMMAND
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(BACNET_TIMER_VALUE_NUMERIC)
|
||||||
|
#define BACNET_TIMER_VALUE_NULL
|
||||||
|
#define BACNET_TIMER_VALUE_BOOLEAN
|
||||||
|
#define BACNET_TIMER_VALUE_UNSIGNED
|
||||||
|
#define BACNET_TIMER_VALUE_SIGNED
|
||||||
|
#define BACNET_TIMER_VALUE_REAL
|
||||||
|
#define BACNET_TIMER_VALUE_DOUBLE
|
||||||
|
#define BACNET_TIMER_VALUE_ENUMERATED
|
||||||
|
#define BACNET_TIMER_VALUE_NO_VALUE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct BACnet_Timer_State_Change_Value_T {
|
||||||
|
uint8_t tag;
|
||||||
|
union {
|
||||||
|
/* null - no type value needed. It is encoded in the tag alone. */
|
||||||
|
/* no-value - no type value needed. It is encoded in the tag alone. */
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BOOLEAN)
|
||||||
|
bool Boolean;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_UNSIGNED)
|
||||||
|
BACNET_UNSIGNED_INTEGER Unsigned_Int;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_SIGNED)
|
||||||
|
int32_t Signed_Int;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_REAL)
|
||||||
|
float Real;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DOUBLE)
|
||||||
|
double Double;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OCTET_STRING)
|
||||||
|
BACNET_OCTET_STRING Octet_String;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CHARACTER_STRING)
|
||||||
|
BACNET_CHARACTER_STRING Character_String;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_BIT_STRING)
|
||||||
|
BACNET_BIT_STRING Bit_String;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_ENUMERATED)
|
||||||
|
uint32_t Enumerated;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATE)
|
||||||
|
BACNET_DATE Date;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_TIME)
|
||||||
|
BACNET_TIME Time;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_OBJECT_ID)
|
||||||
|
BACNET_OBJECT_ID Object_Id;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_DATETIME)
|
||||||
|
BACNET_DATE_TIME Date_Time;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_CONSTRUCTED_VALUE)
|
||||||
|
BACNET_CONSTRUCTED_VALUE_TYPE Constructed_Value;
|
||||||
|
#endif
|
||||||
|
#if defined(BACNET_TIMER_VALUE_LIGHTING_COMMAND)
|
||||||
|
BACNET_LIGHTING_COMMAND Lighting_Command;
|
||||||
|
#endif
|
||||||
|
} type;
|
||||||
|
/* simple linked list if needed */
|
||||||
|
struct BACnet_Timer_State_Change_Value_T *next;
|
||||||
|
} BACNET_TIMER_STATE_CHANGE_VALUE;
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_no_value_encode(uint8_t *apdu);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_no_value_decode(const uint8_t *apdu, uint32_t apdu_size);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_no_value_to_ascii(char *str, size_t str_len);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool bacnet_timer_value_no_value_from_ascii(uint8_t *tag, const char *argv);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_type_encode(
|
||||||
|
uint8_t *apdu, const BACNET_TIMER_STATE_CHANGE_VALUE *value);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_type_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
size_t apdu_size,
|
||||||
|
uint8_t tag_data_type,
|
||||||
|
uint32_t len_value_type,
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_decode(
|
||||||
|
const uint8_t *apdu,
|
||||||
|
size_t apdu_len,
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_encode(
|
||||||
|
uint8_t *apdu,
|
||||||
|
size_t apdu_size,
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool bacnet_timer_value_from_ascii(
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value, const char *argv);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
int bacnet_timer_value_to_ascii(
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value, char *str, size_t str_len);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool bacnet_timer_value_copy(
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *dest,
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *src);
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
bool bacnet_timer_value_same(
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value1,
|
||||||
|
const BACNET_TIMER_STATE_CHANGE_VALUE *value2);
|
||||||
|
|
||||||
|
BACNET_STACK_EXPORT
|
||||||
|
void bacnet_timer_value_link_array(
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *array, size_t size);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
#endif
|
||||||
@@ -13,8 +13,6 @@
|
|||||||
#include "bacnet/datetime.h"
|
#include "bacnet/datetime.h"
|
||||||
#include "bacnet/timestamp.h"
|
#include "bacnet/timestamp.h"
|
||||||
|
|
||||||
/** @file timestamp.c Encode/Decode BACnet Timestamps */
|
|
||||||
|
|
||||||
/** Set the sequence number in a timestamp structure.
|
/** Set the sequence number in a timestamp structure.
|
||||||
*
|
*
|
||||||
* @param dest Pointer to the destination time stamp structure.
|
* @param dest Pointer to the destination time stamp structure.
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ list(APPEND testdirs
|
|||||||
bacnet/rpm
|
bacnet/rpm
|
||||||
bacnet/secure_connect
|
bacnet/secure_connect
|
||||||
bacnet/specialevent
|
bacnet/specialevent
|
||||||
|
bacnet/timer_value
|
||||||
bacnet/timestamp
|
bacnet/timestamp
|
||||||
bacnet/timesync
|
bacnet/timesync
|
||||||
bacnet/weeklyschedule
|
bacnet/weeklyschedule
|
||||||
@@ -177,6 +178,7 @@ list(APPEND testdirs
|
|||||||
bacnet/basic/object/schedule
|
bacnet/basic/object/schedule
|
||||||
bacnet/basic/object/structured_view
|
bacnet/basic/object/structured_view
|
||||||
bacnet/basic/object/time_value
|
bacnet/basic/object/time_value
|
||||||
|
bacnet/basic/object/timer
|
||||||
bacnet/basic/object/trendlog
|
bacnet/basic/object/trendlog
|
||||||
# basic/program
|
# basic/program
|
||||||
bacnet/basic/program/ubasic
|
bacnet/basic/program/ubasic
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
${SRC_DIR}/bacnet/bactimevalue.c
|
${SRC_DIR}/bacnet/bactimevalue.c
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/basic/sys/days.c
|
${SRC_DIR}/bacnet/basic/sys/days.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/datalink/bvlc.c
|
${SRC_DIR}/bacnet/datalink/bvlc.c
|
||||||
|
|||||||
@@ -72,7 +72,15 @@ static const BACNET_APPLICATION_TAG tag_list[] = {
|
|||||||
/* BACnetShedLevel */
|
/* BACnetShedLevel */
|
||||||
BACNET_APPLICATION_TAG_SHED_LEVEL,
|
BACNET_APPLICATION_TAG_SHED_LEVEL,
|
||||||
/* BACnetAccessRule */
|
/* BACnetAccessRule */
|
||||||
BACNET_APPLICATION_TAG_ACCESS_RULE
|
BACNET_APPLICATION_TAG_ACCESS_RULE,
|
||||||
|
/* BACnetChannelValue */
|
||||||
|
BACNET_APPLICATION_TAG_CHANNEL_VALUE,
|
||||||
|
/* BACnetLogRecord */
|
||||||
|
BACNET_APPLICATION_TAG_LOG_RECORD,
|
||||||
|
/* BACnetTimerChangeValue */
|
||||||
|
BACNET_APPLICATION_TAG_TIMER_VALUE,
|
||||||
|
/* no-value - context tagged null */
|
||||||
|
BACNET_APPLICATION_TAG_NO_VALUE
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/timesync.c
|
${SRC_DIR}/bacnet/timesync.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/timesync.c
|
${SRC_DIR}/bacnet/timesync.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
${SRC_DIR}/bacnet/bactimevalue.c
|
${SRC_DIR}/bacnet/bactimevalue.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/timesync.c
|
${SRC_DIR}/bacnet/timesync.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
${SRC_DIR}/bacnet/dailyschedule.c
|
${SRC_DIR}/bacnet/dailyschedule.c
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
${SRC_DIR}/bacnet/bactimevalue.c
|
${SRC_DIR}/bacnet/bactimevalue.c
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/basic/sys/days.c
|
${SRC_DIR}/bacnet/basic/sys/days.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
${SRC_DIR}/bacnet/bactimevalue.c
|
${SRC_DIR}/bacnet/bactimevalue.c
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/property.c
|
${SRC_DIR}/bacnet/property.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/indtext.c
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/property.c
|
${SRC_DIR}/bacnet/property.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/property.c
|
${SRC_DIR}/bacnet/property.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/basic/object/schedule.c
|
${SRC_DIR}/bacnet/basic/object/schedule.c
|
||||||
${SRC_DIR}/bacnet/basic/object/structured_view.c
|
${SRC_DIR}/bacnet/basic/object/structured_view.c
|
||||||
${SRC_DIR}/bacnet/basic/object/time_value.c
|
${SRC_DIR}/bacnet/basic/object/time_value.c
|
||||||
|
${SRC_DIR}/bacnet/basic/object/timer.c
|
||||||
${SRC_DIR}/bacnet/basic/object/trendlog.c
|
${SRC_DIR}/bacnet/basic/object/trendlog.c
|
||||||
${SRC_DIR}/bacnet/basic/sys/bigend.c
|
${SRC_DIR}/bacnet/basic/sys/bigend.c
|
||||||
${SRC_DIR}/bacnet/basic/sys/days.c
|
${SRC_DIR}/bacnet/basic/sys/days.c
|
||||||
@@ -100,6 +101,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/property.c
|
${SRC_DIR}/bacnet/property.c
|
||||||
${SRC_DIR}/bacnet/reject.c
|
${SRC_DIR}/bacnet/reject.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/rp.c
|
${SRC_DIR}/bacnet/rp.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/list_element.c
|
${SRC_DIR}/bacnet/list_element.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -285,9 +285,9 @@ static void test_Notification_Class_Recipient_List(void)
|
|||||||
list_element.first_failed_element_number = 0;
|
list_element.first_failed_element_number = 0;
|
||||||
err = Notification_Class_Add_List_Element(&list_element);
|
err = Notification_Class_Add_List_Element(&list_element);
|
||||||
zassert_equal(err, BACNET_STATUS_ERROR, NULL);
|
zassert_equal(err, BACNET_STATUS_ERROR, NULL);
|
||||||
zassert_equal(list_element.error_class, ERROR_CLASS_SERVICES, NULL);
|
zassert_equal(list_element.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
zassert_equal(
|
zassert_equal(
|
||||||
list_element.error_code, ERROR_CODE_PROPERTY_IS_NOT_A_LIST, NULL);
|
list_element.error_code, ERROR_CODE_WRITE_ACCESS_DENIED, NULL);
|
||||||
/* valid element, valid property, array element (object is not an array) */
|
/* valid element, valid property, array element (object is not an array) */
|
||||||
list_element.object_property = PROP_RECIPIENT_LIST;
|
list_element.object_property = PROP_RECIPIENT_LIST;
|
||||||
list_element.array_index = 0;
|
list_element.array_index = 0;
|
||||||
@@ -346,9 +346,9 @@ static void test_Notification_Class_Recipient_List(void)
|
|||||||
list_element.object_property = PROP_ALL;
|
list_element.object_property = PROP_ALL;
|
||||||
err = Notification_Class_Remove_List_Element(&list_element);
|
err = Notification_Class_Remove_List_Element(&list_element);
|
||||||
zassert_equal(err, BACNET_STATUS_ERROR, NULL);
|
zassert_equal(err, BACNET_STATUS_ERROR, NULL);
|
||||||
zassert_equal(list_element.error_class, ERROR_CLASS_SERVICES, NULL);
|
zassert_equal(list_element.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
zassert_equal(
|
zassert_equal(
|
||||||
list_element.error_code, ERROR_CODE_PROPERTY_IS_NOT_A_LIST, NULL);
|
list_element.error_code, ERROR_CODE_WRITE_ACCESS_DENIED, NULL);
|
||||||
/* invalid array */
|
/* invalid array */
|
||||||
list_element.object_property = PROP_RECIPIENT_LIST;
|
list_element.object_property = PROP_RECIPIENT_LIST;
|
||||||
list_element.array_index = 0;
|
list_element.array_index = 0;
|
||||||
|
|||||||
@@ -70,6 +70,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/property.c
|
${SRC_DIR}/bacnet/property.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
${SRC_DIR}/bacnet/property.c
|
${SRC_DIR}/bacnet/property.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
@@ -227,7 +227,9 @@ int bacnet_object_property_read_test(
|
|||||||
apdu_len = read_len;
|
apdu_len = read_len;
|
||||||
len =
|
len =
|
||||||
bacnet_unsigned_application_decode(apdu, apdu_len, &array_size);
|
bacnet_unsigned_application_decode(apdu, apdu_len, &array_size);
|
||||||
zassert_true(len > 0, NULL);
|
zassert_true(
|
||||||
|
len > 0, "property '%s' array_index=0\n",
|
||||||
|
bactext_property_name(rpdata->object_property));
|
||||||
zassert_true(
|
zassert_true(
|
||||||
len == read_len, "property '%s' array_index=0.\n",
|
len == read_len, "property '%s' array_index=0.\n",
|
||||||
bactext_property_name(rpdata->object_property));
|
bactext_property_name(rpdata->object_property));
|
||||||
@@ -243,6 +245,19 @@ int bacnet_object_property_read_test(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* test an array index that is likely out of range */
|
||||||
|
rpdata->array_index = BACNET_ARRAY_ALL - 1;
|
||||||
|
read_len = read_property(rpdata);
|
||||||
|
zassert_equal(
|
||||||
|
read_len, BACNET_STATUS_ERROR,
|
||||||
|
"property '%s' array_index=%u: error code is %s.\n",
|
||||||
|
bactext_property_name(rpdata->object_property), rpdata->array_index,
|
||||||
|
bactext_error_code_name(rpdata->error_code));
|
||||||
|
zassert_equal(
|
||||||
|
rpdata->error_code, ERROR_CODE_INVALID_ARRAY_INDEX,
|
||||||
|
"property '%s' array_index=%u: error code is %s.\n",
|
||||||
|
bactext_property_name(rpdata->object_property), rpdata->array_index,
|
||||||
|
bactext_error_code_name(rpdata->error_code));
|
||||||
}
|
}
|
||||||
|
|
||||||
return len;
|
return len;
|
||||||
@@ -278,6 +293,9 @@ void bacnet_object_properties_read_write_test(
|
|||||||
bool commandable = false;
|
bool commandable = false;
|
||||||
bool status = false;
|
bool status = false;
|
||||||
|
|
||||||
|
/* negative test */
|
||||||
|
len = read_property(NULL);
|
||||||
|
zassert_equal(len, 0, NULL);
|
||||||
/* ReadProperty parameters */
|
/* ReadProperty parameters */
|
||||||
rpdata.application_data = &apdu[0];
|
rpdata.application_data = &apdu[0];
|
||||||
rpdata.application_data_len = sizeof(apdu);
|
rpdata.application_data_len = sizeof(apdu);
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/memcopy.c
|
${SRC_DIR}/bacnet/memcopy.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
|
||||||
|
|
||||||
|
get_filename_component(basename ${CMAKE_CURRENT_SOURCE_DIR} NAME)
|
||||||
|
project(test_${basename}
|
||||||
|
VERSION 1.0.0
|
||||||
|
LANGUAGES C)
|
||||||
|
|
||||||
|
|
||||||
|
string(REGEX REPLACE
|
||||||
|
"/test/bacnet/[a-zA-Z_/-]*$"
|
||||||
|
"/src"
|
||||||
|
SRC_DIR
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
string(REGEX REPLACE
|
||||||
|
"/test/bacnet/[a-zA-Z_/-]*$"
|
||||||
|
"/test"
|
||||||
|
TST_DIR
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
set(ZTST_DIR "${TST_DIR}/ztest/src")
|
||||||
|
|
||||||
|
add_compile_definitions(
|
||||||
|
BIG_ENDIAN=0
|
||||||
|
CONFIG_ZTEST=1
|
||||||
|
)
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
${SRC_DIR}
|
||||||
|
${TST_DIR}/bacnet/basic/object/test
|
||||||
|
${TST_DIR}/ztest/include
|
||||||
|
)
|
||||||
|
|
||||||
|
add_executable(${PROJECT_NAME}
|
||||||
|
# File(s) under test
|
||||||
|
${SRC_DIR}/bacnet/basic/object/timer.c
|
||||||
|
# Support files and stubs (pathname alphabetical)
|
||||||
|
${SRC_DIR}/bacnet/access_rule.c
|
||||||
|
${SRC_DIR}/bacnet/bacaction.c
|
||||||
|
${SRC_DIR}/bacnet/bacaddr.c
|
||||||
|
${SRC_DIR}/bacnet/bacapp.c
|
||||||
|
${SRC_DIR}/bacnet/bacdcode.c
|
||||||
|
${SRC_DIR}/bacnet/bacdest.c
|
||||||
|
${SRC_DIR}/bacnet/bacdevobjpropref.c
|
||||||
|
${SRC_DIR}/bacnet/bacint.c
|
||||||
|
${SRC_DIR}/bacnet/baclog.c
|
||||||
|
${SRC_DIR}/bacnet/bacreal.c
|
||||||
|
${SRC_DIR}/bacnet/bacstr.c
|
||||||
|
${SRC_DIR}/bacnet/bactext.c
|
||||||
|
${SRC_DIR}/bacnet/bactimevalue.c
|
||||||
|
${SRC_DIR}/bacnet/basic/sys/bigend.c
|
||||||
|
${SRC_DIR}/bacnet/basic/sys/days.c
|
||||||
|
${SRC_DIR}/bacnet/basic/sys/debug.c
|
||||||
|
${SRC_DIR}/bacnet/basic/sys/keylist.c
|
||||||
|
${SRC_DIR}/bacnet/datetime.c
|
||||||
|
${SRC_DIR}/bacnet/indtext.c
|
||||||
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
|
${SRC_DIR}/bacnet/property.c
|
||||||
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
|
${SRC_DIR}/bacnet/wp.c
|
||||||
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
${SRC_DIR}/bacnet/dailyschedule.c
|
||||||
|
${SRC_DIR}/bacnet/calendar_entry.c
|
||||||
|
${SRC_DIR}/bacnet/special_event.c
|
||||||
|
${SRC_DIR}/bacnet/channel_value.c
|
||||||
|
${SRC_DIR}/bacnet/secure_connect.c
|
||||||
|
# Test and test library files
|
||||||
|
./src/main.c
|
||||||
|
${TST_DIR}/bacnet/basic/object/test/datetime_local.c
|
||||||
|
${TST_DIR}/bacnet/basic/object/test/device_mock.c
|
||||||
|
${TST_DIR}/bacnet/basic/object/test/property_test.c
|
||||||
|
${ZTST_DIR}/ztest_mock.c
|
||||||
|
${ZTST_DIR}/ztest.c
|
||||||
|
)
|
||||||
@@ -0,0 +1,722 @@
|
|||||||
|
/**
|
||||||
|
* @file
|
||||||
|
* @brief Unit test for Timer object
|
||||||
|
* @author Steve Karg <skarg@users.sourceforge.net>
|
||||||
|
* @date October 2025
|
||||||
|
* @copyright SPDX-License-Identifier: MIT
|
||||||
|
*/
|
||||||
|
#include <zephyr/ztest.h>
|
||||||
|
#include <bacnet/basic/object/timer.h>
|
||||||
|
#include <bacnet/timer_value.h>
|
||||||
|
#include <bacnet/bactext.h>
|
||||||
|
#include <bacnet/list_element.h>
|
||||||
|
#include <property_test.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @addtogroup bacnet_tests
|
||||||
|
* @{
|
||||||
|
*/
|
||||||
|
static BACNET_WRITE_PROPERTY_DATA Write_Property_Internal_Data;
|
||||||
|
static bool Write_Property_Internal(BACNET_WRITE_PROPERTY_DATA *wp_data)
|
||||||
|
{
|
||||||
|
memcpy(
|
||||||
|
&Write_Property_Internal_Data, wp_data,
|
||||||
|
sizeof(BACNET_WRITE_PROPERTY_DATA));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Test
|
||||||
|
*/
|
||||||
|
static void test_Timer_Read_Write(void)
|
||||||
|
{
|
||||||
|
const uint32_t instance = 123;
|
||||||
|
unsigned count = 0, test_count = 0;
|
||||||
|
unsigned index = 0;
|
||||||
|
const char *sample_name = "Timer:0";
|
||||||
|
char *sample_context = "context";
|
||||||
|
const char *sample_description = "Timer Description";
|
||||||
|
const char *test_name = NULL;
|
||||||
|
uint32_t test_instance = 0;
|
||||||
|
bool status = false;
|
||||||
|
const int skip_fail_property_list[] = { -1 };
|
||||||
|
BACNET_WRITE_PROPERTY_DATA wp_data = { 0 };
|
||||||
|
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE member = { 0 }, *test_member = NULL;
|
||||||
|
BACNET_APPLICATION_DATA_VALUE value = { 0 };
|
||||||
|
BACNET_CHARACTER_STRING cstring = { 0 };
|
||||||
|
uint8_t apdu[MAX_APDU] = { 0 };
|
||||||
|
BACNET_LIST_ELEMENT_DATA list_element = {
|
||||||
|
.application_data = apdu,
|
||||||
|
.application_data_len = sizeof(apdu),
|
||||||
|
.array_index = BACNET_ARRAY_ALL,
|
||||||
|
.error_class = ERROR_CLASS_PROPERTY,
|
||||||
|
.error_code = ERROR_CODE_SUCCESS,
|
||||||
|
.first_failed_element_number = 0,
|
||||||
|
.object_instance = instance,
|
||||||
|
.object_type = OBJECT_TIMER,
|
||||||
|
.object_property = PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES
|
||||||
|
};
|
||||||
|
int err = 0;
|
||||||
|
|
||||||
|
Timer_Init();
|
||||||
|
Timer_Create(instance);
|
||||||
|
status = Timer_Valid_Instance(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Valid_Instance(instance - 1);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
index = Timer_Instance_To_Index(instance);
|
||||||
|
zassert_equal(index, 0, NULL);
|
||||||
|
test_instance = Timer_Index_To_Instance(index);
|
||||||
|
zassert_equal(instance, test_instance, NULL);
|
||||||
|
count = Timer_Count();
|
||||||
|
zassert_true(count > 0, NULL);
|
||||||
|
/* configure the instance property values and test API for lists */
|
||||||
|
member.deviceIdentifier.type = OBJECT_DEVICE;
|
||||||
|
member.deviceIdentifier.instance = 0;
|
||||||
|
member.objectIdentifier.type = OBJECT_ANALOG_OUTPUT;
|
||||||
|
member.objectIdentifier.instance = 1;
|
||||||
|
member.propertyIdentifier = PROP_PRESENT_VALUE;
|
||||||
|
member.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
status = Timer_Reference_List_Member_Element_Set(instance, index, &member);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
count = Timer_Reference_List_Member_Element_Count(instance);
|
||||||
|
zassert_equal(count, 1, NULL);
|
||||||
|
/* add the same element - should be success without actually adding */
|
||||||
|
status = Timer_Reference_List_Member_Element_Add(instance, &member);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
count = Timer_Reference_List_Member_Element_Count(instance);
|
||||||
|
zassert_equal(count, 1, NULL);
|
||||||
|
/* next */
|
||||||
|
member.deviceIdentifier.type = OBJECT_DEVICE;
|
||||||
|
member.deviceIdentifier.instance = 0;
|
||||||
|
member.objectIdentifier.type = OBJECT_BINARY_OUTPUT;
|
||||||
|
member.objectIdentifier.instance = 1;
|
||||||
|
member.propertyIdentifier = PROP_PRESENT_VALUE;
|
||||||
|
member.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
status = Timer_Reference_List_Member_Element_Add(instance, &member);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
member.deviceIdentifier.type = OBJECT_DEVICE;
|
||||||
|
member.deviceIdentifier.instance = 0;
|
||||||
|
member.objectIdentifier.type = OBJECT_MULTI_STATE_OUTPUT;
|
||||||
|
member.objectIdentifier.instance = 1;
|
||||||
|
member.propertyIdentifier = PROP_PRESENT_VALUE;
|
||||||
|
member.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
status = Timer_Reference_List_Member_Element_Add(instance, &member);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
member.deviceIdentifier.type = OBJECT_DEVICE;
|
||||||
|
member.deviceIdentifier.instance = 0;
|
||||||
|
member.objectIdentifier.type = OBJECT_LIGHTING_OUTPUT;
|
||||||
|
member.objectIdentifier.instance = 1;
|
||||||
|
member.propertyIdentifier = PROP_PRESENT_VALUE;
|
||||||
|
member.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
status = Timer_Reference_List_Member_Element_Add(instance, &member);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
member.deviceIdentifier.type = OBJECT_DEVICE;
|
||||||
|
member.deviceIdentifier.instance = 0;
|
||||||
|
member.objectIdentifier.type = OBJECT_COLOR;
|
||||||
|
member.objectIdentifier.instance = 1;
|
||||||
|
member.propertyIdentifier = PROP_PRESENT_VALUE;
|
||||||
|
member.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
status = Timer_Reference_List_Member_Element_Add(instance, &member);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
member.deviceIdentifier.type = OBJECT_DEVICE;
|
||||||
|
member.deviceIdentifier.instance = 0;
|
||||||
|
member.objectIdentifier.type = OBJECT_COLOR_TEMPERATURE;
|
||||||
|
member.objectIdentifier.instance = 1;
|
||||||
|
member.propertyIdentifier = PROP_PRESENT_VALUE;
|
||||||
|
member.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
status = Timer_Reference_List_Member_Element_Add(instance, &member);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
count = Timer_Reference_List_Member_Element_Count(instance);
|
||||||
|
status = Timer_Reference_List_Member_Element_Remove(instance, &member);
|
||||||
|
test_count = Timer_Reference_List_Member_Element_Count(instance);
|
||||||
|
zassert_true(
|
||||||
|
count > test_count, "count=%u test_count=%u", count, test_count);
|
||||||
|
/* reliability and status flags */
|
||||||
|
status = Timer_Reliability_Set(instance, RELIABILITY_PROCESS_ERROR);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* perform a general test for RP/WP */
|
||||||
|
bacnet_object_properties_read_write_test(
|
||||||
|
OBJECT_TIMER, instance, Timer_Property_Lists, Timer_Read_Property,
|
||||||
|
Timer_Write_Property, skip_fail_property_list);
|
||||||
|
/* test the ASCII name get/set */
|
||||||
|
status = Timer_Name_Set(instance, sample_name);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_name = Timer_Name_ASCII(instance);
|
||||||
|
zassert_equal(test_name, sample_name, NULL);
|
||||||
|
status = Timer_Object_Name(instance, &cstring);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = characterstring_ansi_same(&cstring, sample_name);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Name_Set(instance, NULL);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_name = Timer_Name_ASCII(instance);
|
||||||
|
zassert_equal(test_name, NULL, NULL);
|
||||||
|
|
||||||
|
/* test specific WriteProperty values - common configuration */
|
||||||
|
wp_data.object_type = OBJECT_TIMER;
|
||||||
|
wp_data.object_instance = instance;
|
||||||
|
wp_data.array_index = BACNET_ARRAY_ALL;
|
||||||
|
wp_data.priority = BACNET_MAX_PRIORITY;
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* out-of-service */
|
||||||
|
wp_data.object_property = PROP_OUT_OF_SERVICE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_BOOLEAN;
|
||||||
|
value.type.Boolean = true;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
value.type.Boolean = false;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 123;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
/* write present-value */
|
||||||
|
wp_data.object_property = PROP_PRESENT_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 0;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* configure min-pres-value and max-pres-value to max limits */
|
||||||
|
wp_data.object_property = PROP_MIN_PRES_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 1;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
wp_data.object_property = PROP_MAX_PRES_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
wp_data.object_property = PROP_PRESENT_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 1;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
wp_data.object_property = PROP_PRESENT_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* configure min-pres-value and max-pres-value to elicit out-of-range */
|
||||||
|
wp_data.object_property = PROP_MIN_PRES_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 100;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
wp_data.object_property = PROP_MAX_PRES_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX - 100;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
wp_data.object_property = PROP_PRESENT_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 1;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
wp_data.object_property = PROP_PRESENT_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
/* list-of-object-property-references - single element list */
|
||||||
|
wp_data.object_property = PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_DEVICE_OBJECT_PROPERTY_REFERENCE;
|
||||||
|
value.type.Device_Object_Property_Reference.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
value.type.Device_Object_Property_Reference.deviceIdentifier.type =
|
||||||
|
OBJECT_DEVICE;
|
||||||
|
value.type.Device_Object_Property_Reference.deviceIdentifier.instance =
|
||||||
|
12345;
|
||||||
|
value.type.Device_Object_Property_Reference.objectIdentifier.type =
|
||||||
|
OBJECT_ANALOG_OUTPUT;
|
||||||
|
value.type.Device_Object_Property_Reference.objectIdentifier.instance = 1;
|
||||||
|
value.type.Device_Object_Property_Reference.propertyIdentifier =
|
||||||
|
PROP_PRESENT_VALUE;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, "%s", bactext_error_code_name(wp_data.error_code));
|
||||||
|
/* add list element */
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_DEVICE_OBJECT_PROPERTY_REFERENCE;
|
||||||
|
value.type.Device_Object_Property_Reference.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
value.type.Device_Object_Property_Reference.deviceIdentifier.type =
|
||||||
|
OBJECT_DEVICE;
|
||||||
|
value.type.Device_Object_Property_Reference.deviceIdentifier.instance =
|
||||||
|
12345;
|
||||||
|
value.type.Device_Object_Property_Reference.objectIdentifier.type =
|
||||||
|
OBJECT_ANALOG_OUTPUT;
|
||||||
|
value.type.Device_Object_Property_Reference.objectIdentifier.instance = 1;
|
||||||
|
value.type.Device_Object_Property_Reference.propertyIdentifier =
|
||||||
|
PROP_PRESENT_VALUE;
|
||||||
|
list_element.application_data_len =
|
||||||
|
bacapp_encode_application_data(apdu, &value);
|
||||||
|
list_element.object_property = PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES;
|
||||||
|
list_element.array_index = BACNET_ARRAY_ALL;
|
||||||
|
list_element.error_class = ERROR_CLASS_PROPERTY;
|
||||||
|
list_element.error_code = ERROR_CODE_SUCCESS;
|
||||||
|
err = Timer_Add_List_Element(&list_element);
|
||||||
|
zassert_equal(err, BACNET_STATUS_OK, "err=%d", err);
|
||||||
|
zassert_equal(
|
||||||
|
list_element.error_code, ERROR_CODE_SUCCESS, "%s",
|
||||||
|
bactext_error_code_name(list_element.error_code));
|
||||||
|
err = Timer_Remove_List_Element(&list_element);
|
||||||
|
zassert_equal(err, BACNET_STATUS_OK, "err=%d", err);
|
||||||
|
zassert_equal(
|
||||||
|
list_element.error_code, ERROR_CODE_SUCCESS, "%s",
|
||||||
|
bactext_error_code_name(list_element.error_code));
|
||||||
|
/* Add/RemoveListElement negative tests */
|
||||||
|
list_element.object_property = PROP_ALL;
|
||||||
|
err = Timer_Add_List_Element(&list_element);
|
||||||
|
zassert_equal(err, BACNET_STATUS_ERROR, "err=%d", err);
|
||||||
|
zassert_equal(
|
||||||
|
list_element.error_code, ERROR_CODE_WRITE_ACCESS_DENIED, "%s",
|
||||||
|
bactext_error_code_name(list_element.error_code));
|
||||||
|
err = Timer_Remove_List_Element(&list_element);
|
||||||
|
zassert_equal(err, BACNET_STATUS_ERROR, "err=%d", err);
|
||||||
|
zassert_equal(
|
||||||
|
list_element.error_code, ERROR_CODE_WRITE_ACCESS_DENIED, "%s",
|
||||||
|
bactext_error_code_name(list_element.error_code));
|
||||||
|
err = Timer_Add_List_Element(NULL);
|
||||||
|
zassert_equal(err, BACNET_STATUS_ABORT, "err=%d", err);
|
||||||
|
err = Timer_Remove_List_Element(NULL);
|
||||||
|
zassert_equal(err, BACNET_STATUS_ABORT, "err=%d", err);
|
||||||
|
/* default-timeout - out of range error */
|
||||||
|
wp_data.object_property = PROP_DEFAULT_TIMEOUT;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 1000;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX + 1ULL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
/* min-pres-value - out of range error */
|
||||||
|
wp_data.object_property = PROP_MIN_PRES_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 1;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX + 1ULL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
/* max-pres-value - out of range error */
|
||||||
|
wp_data.object_property = PROP_MAX_PRES_VALUE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX + 1ULL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
/* resolution - out of range error */
|
||||||
|
wp_data.object_property = PROP_RESOLUTION;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 1;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
value.type.Unsigned_Int = UINT32_MAX + 1ULL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
/* priority-for-writing - out of range error */
|
||||||
|
wp_data.object_property = PROP_PRIORITY_FOR_WRITING;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = BACNET_MIN_PRIORITY;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
value.type.Unsigned_Int = BACNET_MAX_PRIORITY + 1ULL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
value.type.Unsigned_Int = UINT8_MAX + 1ULL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
/* state-change-values */
|
||||||
|
wp_data.object_property = PROP_STATE_CHANGE_VALUES;
|
||||||
|
wp_data.array_index = 1;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_TIMER_VALUE;
|
||||||
|
value.type.Timer_Value.tag = BACNET_APPLICATION_TAG_REAL;
|
||||||
|
value.type.Timer_Value.type.Real = 1.0f;
|
||||||
|
value.type.Timer_Value.next = NULL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
wp_data.array_index = BACNET_ARRAY_ALL - 1;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_INVALID_ARRAY_INDEX, NULL);
|
||||||
|
/* write to all elements, but only include one element */
|
||||||
|
wp_data.array_index = BACNET_ARRAY_ALL;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
|
||||||
|
/* state-change-values - wrong datatype */
|
||||||
|
wp_data.array_index = 1;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
encode_context_real(wp_data.application_data, 42, 1.0f);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(
|
||||||
|
wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, "%s",
|
||||||
|
bactext_error_code_name(wp_data.error_code));
|
||||||
|
/* write to the size, but the size is read-only */
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
|
||||||
|
value.type.Unsigned_Int = 42;
|
||||||
|
wp_data.array_index = 0;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_WRITE_ACCESS_DENIED, NULL);
|
||||||
|
/* read-only property */
|
||||||
|
wp_data.array_index = BACNET_ARRAY_ALL;
|
||||||
|
wp_data.priority = BACNET_MAX_PRIORITY;
|
||||||
|
wp_data.object_property = PROP_OBJECT_TYPE;
|
||||||
|
value.tag = BACNET_APPLICATION_TAG_ENUMERATED;
|
||||||
|
value.type.Enumerated = OBJECT_ANALOG_INPUT;
|
||||||
|
wp_data.application_data_len =
|
||||||
|
bacapp_encode_application_data(wp_data.application_data, &value);
|
||||||
|
status = Timer_Write_Property(&wp_data);
|
||||||
|
zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
|
||||||
|
zassert_equal(wp_data.error_code, ERROR_CODE_WRITE_ACCESS_DENIED, NULL);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
/* present-value API */
|
||||||
|
status = Timer_Present_Value_Set(instance, 0);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Min_Pres_Value_Set(instance, 100);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Present_Value_Set(instance, 1);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
status = Timer_Max_Pres_Value_Set(instance, 9999);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Present_Value_Set(instance, 10000);
|
||||||
|
zassert_false(status, NULL);
|
||||||
|
status = Timer_Present_Value_Set(instance, Timer_Min_Pres_Value(instance));
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Present_Value_Set(instance, Timer_Max_Pres_Value(instance));
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* negative testing of API */
|
||||||
|
test_member = Timer_Reference_List_Member_Element(instance + 1, 0);
|
||||||
|
zassert_true(test_member == NULL, NULL);
|
||||||
|
/* reliability and status flags */
|
||||||
|
status = Timer_Reliability_Set(instance, RELIABILITY_PROCESS_ERROR);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* context API */
|
||||||
|
Timer_Context_Set(instance, sample_context);
|
||||||
|
zassert_true(sample_context == Timer_Context_Get(instance), NULL);
|
||||||
|
zassert_true(NULL == Timer_Context_Get(instance + 1), NULL);
|
||||||
|
/* description API */
|
||||||
|
status = Timer_Description_Set(instance, sample_description);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
zassert_equal(sample_description, Timer_Description_ANSI(instance), NULL);
|
||||||
|
status = Timer_Description(instance, &cstring);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = characterstring_ansi_same(&cstring, sample_description);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Description_Set(instance, NULL);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = characterstring_init_ansi(&cstring, "");
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status =
|
||||||
|
characterstring_ansi_same(&cstring, Timer_Description_ANSI(instance));
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* cleanup */
|
||||||
|
status = Timer_Delete(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
Timer_Cleanup();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_Timer_Operation_Transition_Default(
|
||||||
|
const uint32_t instance,
|
||||||
|
BACNET_TIMER_STATE test_state,
|
||||||
|
BACNET_TIMER_TRANSITION test_transition)
|
||||||
|
{
|
||||||
|
bool status = false;
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value = NULL;
|
||||||
|
BACNET_TIMER_STATE state = TIMER_STATE_IDLE;
|
||||||
|
BACNET_TIMER_TRANSITION transition = TIMER_TRANSITION_NONE;
|
||||||
|
uint32_t timeout = 0, test_timeout = 0;
|
||||||
|
BACNET_DATE_TIME bdatetime = { 0 }, test_bdatetime = { 0 };
|
||||||
|
BACNET_APPLICATION_DATA_VALUE test_value = { 0 };
|
||||||
|
int diff = 0, len = 0;
|
||||||
|
|
||||||
|
state = Timer_State(instance);
|
||||||
|
zassert_equal(state, test_state, NULL);
|
||||||
|
transition = Timer_Last_State_Change(instance);
|
||||||
|
zassert_equal(transition, test_transition, NULL);
|
||||||
|
if (Timer_Running(instance)) {
|
||||||
|
timeout = Timer_Default_Timeout(instance);
|
||||||
|
test_timeout = Timer_Initial_Timeout(instance);
|
||||||
|
zassert_equal(timeout, test_timeout, NULL);
|
||||||
|
status = Timer_Initial_Timeout_Set(instance, timeout);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_timeout = Timer_Initial_Timeout(instance);
|
||||||
|
zassert_equal(timeout, test_timeout, NULL);
|
||||||
|
test_timeout = Timer_Present_Value(instance);
|
||||||
|
zassert_equal(timeout, test_timeout, NULL);
|
||||||
|
}
|
||||||
|
datetime_local(&bdatetime.date, &bdatetime.time, NULL, NULL);
|
||||||
|
status = Timer_Update_Time(instance, &test_bdatetime);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
diff = datetime_compare(&bdatetime, &test_bdatetime);
|
||||||
|
zassert_equal(diff, 0, "diff=%d", diff);
|
||||||
|
status = Timer_Update_Time_Set(instance, &bdatetime);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Update_Time(instance, &test_bdatetime);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
diff = datetime_compare(&bdatetime, &test_bdatetime);
|
||||||
|
zassert_equal(diff, 0, "diff=%d", diff);
|
||||||
|
status = Timer_Expiration_Time(instance, &test_bdatetime);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
diff = datetime_compare(&bdatetime, &test_bdatetime);
|
||||||
|
zassert_true(diff < 0, "diff=%d", diff);
|
||||||
|
zassert_equal(
|
||||||
|
Write_Property_Internal_Data.object_property, PROP_PRESENT_VALUE, NULL);
|
||||||
|
len = bacapp_decode_application_data(
|
||||||
|
Write_Property_Internal_Data.application_data,
|
||||||
|
Write_Property_Internal_Data.application_data_len, &test_value);
|
||||||
|
zassert_true(len > 0, "len=%d", len);
|
||||||
|
value = Timer_State_Change_Value(instance, test_transition);
|
||||||
|
zassert_equal(test_value.tag, value->tag, NULL);
|
||||||
|
zassert_equal(test_value.type.Enumerated, value->type.Enumerated, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Test
|
||||||
|
*/
|
||||||
|
static void test_Timer_Operation(void)
|
||||||
|
{
|
||||||
|
const uint32_t instance = 123;
|
||||||
|
uint32_t test_instance = 0;
|
||||||
|
bool status = false;
|
||||||
|
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE member = { 0 };
|
||||||
|
BACNET_TIMER_STATE_CHANGE_VALUE *value = NULL;
|
||||||
|
BACNET_TIMER_STATE test_state = TIMER_STATE_IDLE;
|
||||||
|
BACNET_DATE_TIME bdatetime = { 0 };
|
||||||
|
uint32_t elapsed_time = 0;
|
||||||
|
unsigned members = 0, i = 0;
|
||||||
|
|
||||||
|
/* init */
|
||||||
|
Timer_Init();
|
||||||
|
Timer_Create(instance);
|
||||||
|
status = Timer_Valid_Instance(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* set the local time */
|
||||||
|
datetime_set_values(&bdatetime, 2025, 10, 24, 10, 50, 42, 42);
|
||||||
|
datetime_timesync(&bdatetime.date, &bdatetime.time, false);
|
||||||
|
/* configure the reference members and the write property values */
|
||||||
|
Timer_Write_Property_Internal_Callback_Set(Write_Property_Internal);
|
||||||
|
members = Timer_Reference_List_Member_Capacity(instance);
|
||||||
|
for (i = 0; i < members; i++) {
|
||||||
|
member.deviceIdentifier.type = OBJECT_DEVICE;
|
||||||
|
member.deviceIdentifier.instance = 0;
|
||||||
|
member.objectIdentifier.type = OBJECT_BINARY_VALUE;
|
||||||
|
member.objectIdentifier.instance = 1 + i;
|
||||||
|
member.propertyIdentifier = PROP_PRESENT_VALUE;
|
||||||
|
member.arrayIndex = BACNET_ARRAY_ALL;
|
||||||
|
status = Timer_Reference_List_Member_Element_Set(instance, i, &member);
|
||||||
|
}
|
||||||
|
/* check the transitions boundaries */
|
||||||
|
value = Timer_State_Change_Value(instance, TIMER_TRANSITION_NONE);
|
||||||
|
zassert_true(value == NULL, NULL);
|
||||||
|
value = Timer_State_Change_Value(instance, TIMER_TRANSITION_MAX);
|
||||||
|
zassert_true(value == NULL, NULL);
|
||||||
|
/* configure the transitions */
|
||||||
|
value =
|
||||||
|
Timer_State_Change_Value(instance, TIMER_TRANSITION_IDLE_TO_RUNNING);
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_ENUMERATED;
|
||||||
|
value->type.Enumerated = BINARY_ACTIVE;
|
||||||
|
value =
|
||||||
|
Timer_State_Change_Value(instance, TIMER_TRANSITION_RUNNING_TO_IDLE);
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_ENUMERATED;
|
||||||
|
value->type.Enumerated = BINARY_INACTIVE;
|
||||||
|
value =
|
||||||
|
Timer_State_Change_Value(instance, TIMER_TRANSITION_EXPIRED_TO_IDLE);
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_ENUMERATED;
|
||||||
|
value->type.Enumerated = BINARY_INACTIVE;
|
||||||
|
value =
|
||||||
|
Timer_State_Change_Value(instance, TIMER_TRANSITION_RUNNING_TO_EXPIRED);
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_ENUMERATED;
|
||||||
|
value->type.Enumerated = BINARY_INACTIVE;
|
||||||
|
value =
|
||||||
|
Timer_State_Change_Value(instance, TIMER_TRANSITION_FORCED_TO_EXPIRED);
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_ENUMERATED;
|
||||||
|
value->type.Enumerated = BINARY_INACTIVE;
|
||||||
|
value =
|
||||||
|
Timer_State_Change_Value(instance, TIMER_TRANSITION_EXPIRED_TO_RUNNING);
|
||||||
|
value->tag = BACNET_APPLICATION_TAG_ENUMERATED;
|
||||||
|
value->type.Enumerated = BINARY_ACTIVE;
|
||||||
|
/* alternate API */
|
||||||
|
status = Timer_State_Change_Value_Set(
|
||||||
|
instance, TIMER_TRANSITION_EXPIRED_TO_RUNNING, value);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* start timer using a write to timer-running property to use defaults */
|
||||||
|
/* IDLE_TO_RUNNING */
|
||||||
|
status = Timer_State_Set(instance, TIMER_STATE_IDLE);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_IDLE, NULL);
|
||||||
|
status = Timer_Running_Set(instance, true);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Running(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_Timer_Operation_Transition_Default(
|
||||||
|
instance, TIMER_STATE_RUNNING, TIMER_TRANSITION_IDLE_TO_RUNNING);
|
||||||
|
/* RUNNING_TO_RUNNING */
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_RUNNING, NULL);
|
||||||
|
status = Timer_Running_Set(instance, true);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Running(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_Timer_Operation_Transition_Default(
|
||||||
|
instance, TIMER_STATE_RUNNING, TIMER_TRANSITION_RUNNING_TO_RUNNING);
|
||||||
|
/* EXPIRED_TO_RUNNING */
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_RUNNING, NULL);
|
||||||
|
elapsed_time = Timer_Present_Value(instance);
|
||||||
|
Timer_Task(instance, elapsed_time - 1);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_RUNNING, NULL);
|
||||||
|
Timer_Task(instance, elapsed_time);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_EXPIRED, NULL);
|
||||||
|
status = Timer_Running_Set(instance, true);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Running(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_Timer_Operation_Transition_Default(
|
||||||
|
instance, TIMER_STATE_RUNNING, TIMER_TRANSITION_EXPIRED_TO_RUNNING);
|
||||||
|
/* EXPIRED_TO_IDLE */
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_RUNNING, NULL);
|
||||||
|
elapsed_time = Timer_Present_Value(instance);
|
||||||
|
Timer_Task(instance, elapsed_time);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_EXPIRED, NULL);
|
||||||
|
status = Timer_State_Set(instance, TIMER_STATE_IDLE);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_IDLE, NULL);
|
||||||
|
test_Timer_Operation_Transition_Default(
|
||||||
|
instance, TIMER_STATE_IDLE, TIMER_TRANSITION_EXPIRED_TO_IDLE);
|
||||||
|
/* start timer using a write to timer-state property to use defaults */
|
||||||
|
/* RUNNING_TO_IDLE */
|
||||||
|
status = Timer_Running_Set(instance, true);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
status = Timer_Running(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_RUNNING, NULL);
|
||||||
|
status = Timer_State_Set(instance, TIMER_STATE_IDLE);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_IDLE, NULL);
|
||||||
|
test_Timer_Operation_Transition_Default(
|
||||||
|
instance, TIMER_STATE_IDLE, TIMER_TRANSITION_RUNNING_TO_IDLE);
|
||||||
|
Timer_Task(instance, elapsed_time);
|
||||||
|
/* RUNNING_TO_EXPIRED */
|
||||||
|
status = Timer_Running_Set(instance, true);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_RUNNING, NULL);
|
||||||
|
status = Timer_Running_Set(instance, false);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
test_state = Timer_State(instance);
|
||||||
|
zassert_equal(test_state, TIMER_STATE_EXPIRED, NULL);
|
||||||
|
test_Timer_Operation_Transition_Default(
|
||||||
|
instance, TIMER_STATE_EXPIRED, TIMER_TRANSITION_FORCED_TO_EXPIRED);
|
||||||
|
Timer_Task(instance, elapsed_time);
|
||||||
|
/* cleanup instance */
|
||||||
|
status = Timer_Delete(instance);
|
||||||
|
zassert_true(status, NULL);
|
||||||
|
/* test create of next instance */
|
||||||
|
test_instance = Timer_Create(BACNET_MAX_INSTANCE);
|
||||||
|
zassert_not_equal(test_instance, BACNET_MAX_INSTANCE, NULL);
|
||||||
|
test_instance = Timer_Create(test_instance);
|
||||||
|
zassert_not_equal(test_instance, BACNET_MAX_INSTANCE, NULL);
|
||||||
|
test_instance = Timer_Create(BACNET_MAX_INSTANCE + 1);
|
||||||
|
zassert_equal(test_instance, BACNET_MAX_INSTANCE, NULL);
|
||||||
|
/* cleanup all */
|
||||||
|
Timer_Cleanup();
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* @}
|
||||||
|
*/
|
||||||
|
|
||||||
|
void test_main(void)
|
||||||
|
{
|
||||||
|
ztest_test_suite(
|
||||||
|
timer_tests, ztest_unit_test(test_Timer_Read_Write),
|
||||||
|
ztest_unit_test(test_Timer_Operation));
|
||||||
|
|
||||||
|
ztest_run_test_suite(timer_tests);
|
||||||
|
}
|
||||||
@@ -55,6 +55,7 @@ add_executable(${PROJECT_NAME}
|
|||||||
${SRC_DIR}/bacnet/hostnport.c
|
${SRC_DIR}/bacnet/hostnport.c
|
||||||
${SRC_DIR}/bacnet/lighting.c
|
${SRC_DIR}/bacnet/lighting.c
|
||||||
${SRC_DIR}/bacnet/proplist.c
|
${SRC_DIR}/bacnet/proplist.c
|
||||||
|
${SRC_DIR}/bacnet/timer_value.c
|
||||||
${SRC_DIR}/bacnet/timestamp.c
|
${SRC_DIR}/bacnet/timestamp.c
|
||||||
${SRC_DIR}/bacnet/wp.c
|
${SRC_DIR}/bacnet/wp.c
|
||||||
${SRC_DIR}/bacnet/weeklyschedule.c
|
${SRC_DIR}/bacnet/weeklyschedule.c
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user