diff --git a/ports/zephyr/bacnet-config.h b/ports/zephyr/bacnet-config.h new file mode 100644 index 00000000..d8b3b29f --- /dev/null +++ b/ports/zephyr/bacnet-config.h @@ -0,0 +1,35 @@ +/************************************************************************** +* +* Copyright (c) 2024 Legrand North America, LLC. +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files (the +* "Software"), to deal in the Software without restriction, including +* without limitation the rights to use, copy, modify, merge, publish, +* distribute, sublicense, and/or sell copies of the Software, and to +* permit persons to whom the Software is furnished to do so, subject to +* the following conditions: +* +* The above copyright notice and this permission notice shall be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +* +*********************************************************************/ + +#ifndef BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H +#define BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H + +#if ! defined BACNET_CONFIG_H || ! BACNET_CONFIG_H +#error bacnet-config.h included outside of BACNET_CONFIG_H control +#endif + +#include // Provides platform-specific defn of ARRAY_SIZE() + +#endif // BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H diff --git a/src/bacnet/abort.h b/src/bacnet/abort.h index 763a8201..2cc2e3b1 100644 --- a/src/bacnet/abort.h +++ b/src/bacnet/abort.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/access_rule.h b/src/bacnet/access_rule.h index dc3ab49d..068a3abf 100644 --- a/src/bacnet/access_rule.h +++ b/src/bacnet/access_rule.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/alarm_ack.h b/src/bacnet/alarm_ack.h index 61e586eb..1c60f96b 100644 --- a/src/bacnet/alarm_ack.h +++ b/src/bacnet/alarm_ack.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/apdu.h b/src/bacnet/apdu.h index 33853bf9..a4b383a5 100644 --- a/src/bacnet/apdu.h +++ b/src/bacnet/apdu.h @@ -26,7 +26,7 @@ #include #include -#include "bacnet/bacdef.h" +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacenum.h" typedef struct _confirmed_service_data { diff --git a/src/bacnet/arf.h b/src/bacnet/arf.h index 09b4b5b4..49eb2a33 100644 --- a/src/bacnet/arf.h +++ b/src/bacnet/arf.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacdcode.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/assigned_access_rights.h b/src/bacnet/assigned_access_rights.h index 5e0a0e8a..3dbd1d79 100644 --- a/src/bacnet/assigned_access_rights.h +++ b/src/bacnet/assigned_access_rights.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/authentication_factor.h b/src/bacnet/authentication_factor.h index 6c829e1b..39eaa0b6 100644 --- a/src/bacnet/authentication_factor.h +++ b/src/bacnet/authentication_factor.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" typedef struct { diff --git a/src/bacnet/authentication_factor_format.h b/src/bacnet/authentication_factor_format.h index 042c4d61..ce023a05 100644 --- a/src/bacnet/authentication_factor_format.h +++ b/src/bacnet/authentication_factor_format.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" typedef struct { BACNET_AUTHENTICATION_FACTOR_TYPE format_type; diff --git a/src/bacnet/awf.h b/src/bacnet/awf.h index 8ee569ca..cbe0befe 100644 --- a/src/bacnet/awf.h +++ b/src/bacnet/awf.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacdcode.h" diff --git a/src/bacnet/bacaddr.h b/src/bacnet/bacaddr.h index 6203e739..de24b714 100644 --- a/src/bacnet/bacaddr.h +++ b/src/bacnet/bacaddr.h @@ -27,9 +27,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/platform.h" -#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/bacapp.h b/src/bacnet/bacapp.h index 57381740..b332daf8 100644 --- a/src/bacnet/bacapp.h +++ b/src/bacnet/bacapp.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacdest.h" #include "bacnet/bacint.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/bacdcode.h b/src/bacnet/bacdcode.h index 7319476e..746b9353 100644 --- a/src/bacnet/bacdcode.h +++ b/src/bacnet/bacdcode.h @@ -27,9 +27,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/platform.h" -#include "bacnet/bacdef.h" #include "bacnet/datetime.h" #include "bacnet/bacstr.h" #include "bacnet/bacint.h" diff --git a/src/bacnet/bacdef.h b/src/bacnet/bacdef.h index 39559c3f..c69329eb 100644 --- a/src/bacnet/bacdef.h +++ b/src/bacnet/bacdef.h @@ -26,9 +26,8 @@ #include #include -#include "bacnet/bacenum.h" -#include "bacnet/bacint.h" #include "bacnet/config.h" +#include "bacnet/bacenum.h" #if defined(_MSC_VER) /* Silence the warnings about unsafe versions of library functions */ @@ -127,6 +126,15 @@ #error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined! #endif +/* Support 64b integers when available */ +#ifdef UINT64_MAX +typedef uint64_t BACNET_UNSIGNED_INTEGER; +#define BACNET_UNSIGNED_INTEGER_MAX UINT64_MAX +#else +typedef uint32_t BACNET_UNSIGNED_INTEGER; +#define BACNET_UNSIGNED_INTEGER_MAX UINT32_MAX +#endif + /* largest BACnet Instance Number */ /* Also used as a device instance number wildcard address */ #define BACNET_MAX_INSTANCE (0x3FFFFF) diff --git a/src/bacnet/bacdest.h b/src/bacnet/bacdest.h index a195511a..b5ae3fe6 100644 --- a/src/bacnet/bacdest.h +++ b/src/bacnet/bacdest.h @@ -14,6 +14,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/bacdevobjpropref.h b/src/bacnet/bacdevobjpropref.h index a3b19688..7880cd51 100644 --- a/src/bacnet/bacdevobjpropref.h +++ b/src/bacnet/bacdevobjpropref.h @@ -28,8 +28,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacint.h" #include "bacnet/bacenum.h" #include "bacnet/basic/sys/platform.h" diff --git a/src/bacnet/bacerror.h b/src/bacnet/bacerror.h index 1f388b37..99ae6e45 100644 --- a/src/bacnet/bacerror.h +++ b/src/bacnet/bacerror.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/bacint.h b/src/bacnet/bacint.h index 89d9ba66..2eca26b1 100644 --- a/src/bacnet/bacint.h +++ b/src/bacnet/bacint.h @@ -27,16 +27,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#ifdef UINT64_MAX -typedef uint64_t BACNET_UNSIGNED_INTEGER; -#define BACNET_UNSIGNED_INTEGER_MAX UINT64_MAX -#else -typedef uint32_t BACNET_UNSIGNED_INTEGER; -#define BACNET_UNSIGNED_INTEGER_MAX UINT32_MAX -#endif - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/src/bacnet/bacnet_stack_exports.h b/src/bacnet/bacnet_stack_exports.h index d4ce27b3..99e8e18d 100644 --- a/src/bacnet/bacnet_stack_exports.h +++ b/src/bacnet/bacnet_stack_exports.h @@ -24,6 +24,7 @@ #ifndef BACNET_STACK_EXPORTS_H #define BACNET_STACK_EXPORTS_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #ifdef BACNET_STACK_STATIC_DEFINE /* We want a static library */ diff --git a/src/bacnet/bacprop.h b/src/bacnet/bacprop.h index bf6e051c..5167da3c 100644 --- a/src/bacnet/bacprop.h +++ b/src/bacnet/bacprop.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/bacpropstates.h b/src/bacnet/bacpropstates.h index 545eefcf..79486d6f 100644 --- a/src/bacnet/bacpropstates.h +++ b/src/bacnet/bacpropstates.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/bacreal.h b/src/bacnet/bacreal.h index 40414d03..52a14170 100644 --- a/src/bacnet/bacreal.h +++ b/src/bacnet/bacreal.h @@ -27,6 +27,7 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/bacstr.h b/src/bacnet/bacstr.h index 0eef4721..ce046713 100644 --- a/src/bacnet/bacstr.h +++ b/src/bacnet/bacstr.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/config.h" /* bit strings diff --git a/src/bacnet/bactext.h b/src/bacnet/bactext.h index b5a8a8dc..f76e1daf 100644 --- a/src/bacnet/bactext.h +++ b/src/bacnet/bactext.h @@ -31,6 +31,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/indtext.h" diff --git a/src/bacnet/bactimevalue.h b/src/bacnet/bactimevalue.h index d49f87eb..30d1f604 100644 --- a/src/bacnet/bactimevalue.h +++ b/src/bacnet/bactimevalue.h @@ -28,10 +28,11 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/platform.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" +#include "bacnet/bacint.h" #include "bacnet/datetime.h" /** diff --git a/src/bacnet/basic/bbmd/h_bbmd.h b/src/bacnet/basic/bbmd/h_bbmd.h index b0d20362..f6d1a0ff 100644 --- a/src/bacnet/basic/bbmd/h_bbmd.h +++ b/src/bacnet/basic/bbmd/h_bbmd.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/datalink/bvlc.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/bbmd6/h_bbmd6.h b/src/bacnet/basic/bbmd6/h_bbmd6.h index 9a4e3be0..d36806c5 100644 --- a/src/bacnet/basic/bbmd6/h_bbmd6.h +++ b/src/bacnet/basic/bbmd6/h_bbmd6.h @@ -32,7 +32,7 @@ #include #include #include -#include "bacnet/bacdef.h" +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/datalink/bvlc6.h" diff --git a/src/bacnet/basic/bbmd6/vmac.h b/src/bacnet/basic/bbmd6/vmac.h index 11868059..f07f1ebb 100644 --- a/src/bacnet/basic/bbmd6/vmac.h +++ b/src/bacnet/basic/bbmd6/vmac.h @@ -8,6 +8,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" /* define the max MAC as big as IPv6 + port number */ diff --git a/src/bacnet/basic/binding/address.h b/src/bacnet/basic/binding/address.h index d7d009ca..58a897ce 100644 --- a/src/bacnet/basic/binding/address.h +++ b/src/bacnet/basic/binding/address.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacaddr.h" #include "bacnet/readrange.h" diff --git a/src/bacnet/basic/client/bac-data.h b/src/bacnet/basic/client/bac-data.h index 12ff8c60..1c0b35fb 100644 --- a/src/bacnet/basic/client/bac-data.h +++ b/src/bacnet/basic/client/bac-data.h @@ -9,7 +9,7 @@ #define BAC_DATA_H #include -#include "bacnet/bacdef.h" +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/client/bac-discover.h b/src/bacnet/basic/client/bac-discover.h index eddc44f1..2288fdde 100644 --- a/src/bacnet/basic/client/bac-discover.h +++ b/src/bacnet/basic/client/bac-discover.h @@ -10,7 +10,7 @@ #include #include -#include "bacnet/bacdef.h" +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/client/bac-rw.h b/src/bacnet/basic/client/bac-rw.h index 3ec36f4f..5ba1badd 100644 --- a/src/bacnet/basic/client/bac-rw.h +++ b/src/bacnet/basic/client/bac-rw.h @@ -9,7 +9,7 @@ #define BAC_RW_H #include -#include "bacnet/bacdef.h" +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/client/bac-task.h b/src/bacnet/basic/client/bac-task.h index 3821d15b..2fc0ad2e 100644 --- a/src/bacnet/basic/client/bac-task.h +++ b/src/bacnet/basic/client/bac-task.h @@ -10,6 +10,7 @@ #define BACNET_TASK_H #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/npdu/h_npdu.h b/src/bacnet/basic/npdu/h_npdu.h index 26e2270d..c8d848ee 100644 --- a/src/bacnet/basic/npdu/h_npdu.h +++ b/src/bacnet/basic/npdu/h_npdu.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/npdu/h_routed_npdu.h b/src/bacnet/basic/npdu/h_routed_npdu.h index 6aea4d61..3ad62954 100644 --- a/src/bacnet/basic/npdu/h_routed_npdu.h +++ b/src/bacnet/basic/npdu/h_routed_npdu.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/npdu/s_router.h b/src/bacnet/basic/npdu/s_router.h index 762ba657..4e3c9759 100644 --- a/src/bacnet/basic/npdu/s_router.h +++ b/src/bacnet/basic/npdu/s_router.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/object/acc.h b/src/bacnet/basic/object/acc.h index 84edc5d2..633e72f0 100644 --- a/src/bacnet/basic/object/acc.h +++ b/src/bacnet/basic/object/acc.h @@ -3,8 +3,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacint.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/access_credential.h b/src/bacnet/basic/object/access_credential.h index ec72d2f9..328a27aa 100644 --- a/src/bacnet/basic/object/access_credential.h +++ b/src/bacnet/basic/object/access_credential.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/datetime.h" #include "bacnet/timestamp.h" diff --git a/src/bacnet/basic/object/access_door.h b/src/bacnet/basic/object/access_door.h index ed039f91..57d5a231 100644 --- a/src/bacnet/basic/object/access_door.h +++ b/src/bacnet/basic/object/access_door.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/access_point.h b/src/bacnet/basic/object/access_point.h index 38c6a5a8..58f36a91 100644 --- a/src/bacnet/basic/object/access_point.h +++ b/src/bacnet/basic/object/access_point.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/timestamp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/basic/object/access_rights.h b/src/bacnet/basic/object/access_rights.h index d214beca..1ba9412f 100644 --- a/src/bacnet/basic/object/access_rights.h +++ b/src/bacnet/basic/object/access_rights.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/bacdevobjpropref.h" #include "bacnet/access_rule.h" diff --git a/src/bacnet/basic/object/access_user.h b/src/bacnet/basic/object/access_user.h index 7182750f..3e218007 100644 --- a/src/bacnet/basic/object/access_user.h +++ b/src/bacnet/basic/object/access_user.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/bacdevobjpropref.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/access_zone.h b/src/bacnet/basic/object/access_zone.h index ad28f1cc..1cf4327f 100644 --- a/src/bacnet/basic/object/access_zone.h +++ b/src/bacnet/basic/object/access_zone.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/bacdevobjpropref.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/ai.h b/src/bacnet/basic/object/ai.h index 7cb01e39..f45bfd0f 100644 --- a/src/bacnet/basic/object/ai.h +++ b/src/bacnet/basic/object/ai.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/rp.h" #include "bacnet/wp.h" #if defined(INTRINSIC_REPORTING) diff --git a/src/bacnet/basic/object/ao.h b/src/bacnet/basic/object/ao.h index 97c35f10..344c750d 100644 --- a/src/bacnet/basic/object/ao.h +++ b/src/bacnet/basic/object/ao.h @@ -36,9 +36,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/config.h" #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/av.h b/src/bacnet/basic/object/av.h index c4a63823..33ae9a06 100644 --- a/src/bacnet/basic/object/av.h +++ b/src/bacnet/basic/object/av.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/bacfile.h b/src/bacnet/basic/object/bacfile.h index e2150ce5..8f14c9d5 100644 --- a/src/bacnet/basic/object/bacfile.h +++ b/src/bacnet/basic/object/bacfile.h @@ -36,8 +36,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/bacint.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/basic/object/bi.h b/src/bacnet/basic/object/bi.h index 23360766..8ee86006 100644 --- a/src/bacnet/basic/object/bi.h +++ b/src/bacnet/basic/object/bi.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/cov.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/blo.h b/src/bacnet/basic/object/blo.h index a0296844..ea04fb4f 100644 --- a/src/bacnet/basic/object/blo.h +++ b/src/bacnet/basic/object/blo.h @@ -11,8 +11,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/bo.h b/src/bacnet/basic/object/bo.h index 94ae0078..689761a3 100644 --- a/src/bacnet/basic/object/bo.h +++ b/src/bacnet/basic/object/bo.h @@ -35,9 +35,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/config.h" #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/cov.h" diff --git a/src/bacnet/basic/object/bv.h b/src/bacnet/basic/object/bv.h index bf706000..317e1aba 100644 --- a/src/bacnet/basic/object/bv.h +++ b/src/bacnet/basic/object/bv.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/calendar.h b/src/bacnet/basic/object/calendar.h index 225d2d83..077a1814 100644 --- a/src/bacnet/basic/object/calendar.h +++ b/src/bacnet/basic/object/calendar.h @@ -12,9 +12,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/calendar_entry.h" #include "bacnet/bacenum.h" #include "bacnet/bacerror.h" diff --git a/src/bacnet/basic/object/channel.h b/src/bacnet/basic/object/channel.h index c15aa572..b5e772fa 100644 --- a/src/bacnet/basic/object/channel.h +++ b/src/bacnet/basic/object/channel.h @@ -36,8 +36,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/basic/object/lo.h" diff --git a/src/bacnet/basic/object/color_object.h b/src/bacnet/basic/object/color_object.h index 47169865..b6bf1098 100644 --- a/src/bacnet/basic/object/color_object.h +++ b/src/bacnet/basic/object/color_object.h @@ -20,9 +20,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/color_temperature.h b/src/bacnet/basic/object/color_temperature.h index 0ceb6ad6..df2c7f6f 100644 --- a/src/bacnet/basic/object/color_temperature.h +++ b/src/bacnet/basic/object/color_temperature.h @@ -20,9 +20,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/command.h b/src/bacnet/basic/object/command.h index 8e66d286..aa609b89 100644 --- a/src/bacnet/basic/object/command.h +++ b/src/bacnet/basic/object/command.h @@ -44,8 +44,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/credential_data_input.h b/src/bacnet/basic/object/credential_data_input.h index eb178365..e6510161 100644 --- a/src/bacnet/basic/object/credential_data_input.h +++ b/src/bacnet/basic/object/credential_data_input.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/timestamp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/basic/object/csv.h b/src/bacnet/basic/object/csv.h index cf720777..fb30b7e6 100644 --- a/src/bacnet/basic/object/csv.h +++ b/src/bacnet/basic/object/csv.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/device.h b/src/bacnet/basic/object/device.h index 6e07896b..15565a82 100644 --- a/src/bacnet/basic/object/device.h +++ b/src/bacnet/basic/object/device.h @@ -31,8 +31,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/create_object.h" #include "bacnet/delete_object.h" diff --git a/src/bacnet/basic/object/iv.h b/src/bacnet/basic/object/iv.h index 3a454d67..b3e9dcde 100644 --- a/src/bacnet/basic/object/iv.h +++ b/src/bacnet/basic/object/iv.h @@ -35,8 +35,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/lc.h b/src/bacnet/basic/object/lc.h index 270adfa3..5dd3b507 100644 --- a/src/bacnet/basic/object/lc.h +++ b/src/bacnet/basic/object/lc.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/lsp.h b/src/bacnet/basic/object/lsp.h index 2206a8aa..f9c95d7d 100644 --- a/src/bacnet/basic/object/lsp.h +++ b/src/bacnet/basic/object/lsp.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/lsz.h b/src/bacnet/basic/object/lsz.h index a300bad7..58b16946 100644 --- a/src/bacnet/basic/object/lsz.h +++ b/src/bacnet/basic/object/lsz.h @@ -22,8 +22,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/ms-input.h b/src/bacnet/basic/object/ms-input.h index 0316e107..9e74ad97 100644 --- a/src/bacnet/basic/object/ms-input.h +++ b/src/bacnet/basic/object/ms-input.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/mso.h b/src/bacnet/basic/object/mso.h index c9550092..6e28ca7c 100644 --- a/src/bacnet/basic/object/mso.h +++ b/src/bacnet/basic/object/mso.h @@ -35,9 +35,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/config.h" #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/cov.h" diff --git a/src/bacnet/basic/object/msv.h b/src/bacnet/basic/object/msv.h index e35b06da..d5689651 100644 --- a/src/bacnet/basic/object/msv.h +++ b/src/bacnet/basic/object/msv.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/nc.h b/src/bacnet/basic/object/nc.h index fa3cc9aa..e21a74ef 100644 --- a/src/bacnet/basic/object/nc.h +++ b/src/bacnet/basic/object/nc.h @@ -25,6 +25,7 @@ #ifndef NC_H #define NC_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacdest.h" #include "bacnet/event.h" diff --git a/src/bacnet/basic/object/netport.h b/src/bacnet/basic/object/netport.h index ce5dfd68..fbb116ec 100644 --- a/src/bacnet/basic/object/netport.h +++ b/src/bacnet/basic/object/netport.h @@ -36,8 +36,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/objects.h b/src/bacnet/basic/object/objects.h index 0a079399..d78371f0 100644 --- a/src/bacnet/basic/object/objects.h +++ b/src/bacnet/basic/object/objects.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacstr.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/basic/object/osv.h b/src/bacnet/basic/object/osv.h index 7c478783..029819d9 100644 --- a/src/bacnet/basic/object/osv.h +++ b/src/bacnet/basic/object/osv.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/piv.h b/src/bacnet/basic/object/piv.h index 5d647861..82898bfe 100644 --- a/src/bacnet/basic/object/piv.h +++ b/src/bacnet/basic/object/piv.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/schedule.h b/src/bacnet/basic/object/schedule.h index 84b0387e..9cb0ba11 100644 --- a/src/bacnet/basic/object/schedule.h +++ b/src/bacnet/basic/object/schedule.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" #include "bacnet/datetime.h" #include "bacnet/bacerror.h" diff --git a/src/bacnet/basic/object/time_value.h b/src/bacnet/basic/object/time_value.h index ef5eea5d..f28a8589 100644 --- a/src/bacnet/basic/object/time_value.h +++ b/src/bacnet/basic/object/time_value.h @@ -12,9 +12,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/trendlog.h b/src/bacnet/basic/object/trendlog.h index 087ff26e..e4f19eed 100644 --- a/src/bacnet/basic/object/trendlog.h +++ b/src/bacnet/basic/object/trendlog.h @@ -27,8 +27,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/cov.h" #include "bacnet/datetime.h" #include "bacnet/readrange.h" diff --git a/src/bacnet/basic/service/h_alarm_ack.h b/src/bacnet/basic/service/h_alarm_ack.h index 2dd06452..a354e4c3 100644 --- a/src/bacnet/basic/service/h_alarm_ack.h +++ b/src/bacnet/basic/service/h_alarm_ack.h @@ -30,8 +30,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/alarm_ack.h" diff --git a/src/bacnet/basic/service/h_apdu.h b/src/bacnet/basic/service/h_apdu.h index 141f76cc..ef46525b 100644 --- a/src/bacnet/basic/service/h_apdu.h +++ b/src/bacnet/basic/service/h_apdu.h @@ -30,8 +30,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_arf.h b/src/bacnet/basic/service/h_arf.h index 5c12aa7b..e163aa00 100644 --- a/src/bacnet/basic/service/h_arf.h +++ b/src/bacnet/basic/service/h_arf.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_arf_a.h b/src/bacnet/basic/service/h_arf_a.h index 033449ba..c4b4b59d 100644 --- a/src/bacnet/basic/service/h_arf_a.h +++ b/src/bacnet/basic/service/h_arf_a.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_awf.h b/src/bacnet/basic/service/h_awf.h index db139a7d..6e7f6573 100644 --- a/src/bacnet/basic/service/h_awf.h +++ b/src/bacnet/basic/service/h_awf.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_ccov.h b/src/bacnet/basic/service/h_ccov.h index 684f366b..74ba9697 100644 --- a/src/bacnet/basic/service/h_ccov.h +++ b/src/bacnet/basic/service/h_ccov.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/cov.h" diff --git a/src/bacnet/basic/service/h_cov.h b/src/bacnet/basic/service/h_cov.h index c9bd6baf..3e2a1307 100644 --- a/src/bacnet/basic/service/h_cov.h +++ b/src/bacnet/basic/service/h_cov.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_create_object.h b/src/bacnet/basic/service/h_create_object.h index f2889f15..90fee3df 100644 --- a/src/bacnet/basic/service/h_create_object.h +++ b/src/bacnet/basic/service/h_create_object.h @@ -12,9 +12,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" -#include "bacnet/bacdef.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_dcc.h b/src/bacnet/basic/service/h_dcc.h index de4bf565..65f7221c 100644 --- a/src/bacnet/basic/service/h_dcc.h +++ b/src/bacnet/basic/service/h_dcc.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_delete_object.h b/src/bacnet/basic/service/h_delete_object.h index deb24619..e9058ed1 100644 --- a/src/bacnet/basic/service/h_delete_object.h +++ b/src/bacnet/basic/service/h_delete_object.h @@ -12,9 +12,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" -#include "bacnet/bacdef.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_gas_a.h b/src/bacnet/basic/service/h_gas_a.h index 771b71e3..1c584567 100644 --- a/src/bacnet/basic/service/h_gas_a.h +++ b/src/bacnet/basic/service/h_gas_a.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_get_alarm_sum.h b/src/bacnet/basic/service/h_get_alarm_sum.h index d3cc76fe..07c231a2 100644 --- a/src/bacnet/basic/service/h_get_alarm_sum.h +++ b/src/bacnet/basic/service/h_get_alarm_sum.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/get_alarm_sum.h" diff --git a/src/bacnet/basic/service/h_getevent.h b/src/bacnet/basic/service/h_getevent.h index 0145b4f1..4d7da228 100644 --- a/src/bacnet/basic/service/h_getevent.h +++ b/src/bacnet/basic/service/h_getevent.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/event.h" diff --git a/src/bacnet/basic/service/h_getevent_a.h b/src/bacnet/basic/service/h_getevent_a.h index ef462693..c8b60078 100644 --- a/src/bacnet/basic/service/h_getevent_a.h +++ b/src/bacnet/basic/service/h_getevent_a.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_iam.h b/src/bacnet/basic/service/h_iam.h index e4c2ccb6..300f8c60 100644 --- a/src/bacnet/basic/service/h_iam.h +++ b/src/bacnet/basic/service/h_iam.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_ihave.h b/src/bacnet/basic/service/h_ihave.h index 70438c08..20f4e0dd 100644 --- a/src/bacnet/basic/service/h_ihave.h +++ b/src/bacnet/basic/service/h_ihave.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_list_element.h b/src/bacnet/basic/service/h_list_element.h index 10445f56..449c0f07 100644 --- a/src/bacnet/basic/service/h_list_element.h +++ b/src/bacnet/basic/service/h_list_element.h @@ -14,9 +14,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" -#include "bacnet/bacdef.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_lso.h b/src/bacnet/basic/service/h_lso.h index b454707d..d01aa931 100644 --- a/src/bacnet/basic/service/h_lso.h +++ b/src/bacnet/basic/service/h_lso.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_noserv.h b/src/bacnet/basic/service/h_noserv.h index 88b56f45..f19a3971 100644 --- a/src/bacnet/basic/service/h_noserv.h +++ b/src/bacnet/basic/service/h_noserv.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_rd.h b/src/bacnet/basic/service/h_rd.h index 38723bd6..b9261768 100644 --- a/src/bacnet/basic/service/h_rd.h +++ b/src/bacnet/basic/service/h_rd.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_rp.h b/src/bacnet/basic/service/h_rp.h index 1a1e26b1..3f56fa75 100644 --- a/src/bacnet/basic/service/h_rp.h +++ b/src/bacnet/basic/service/h_rp.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_rp_a.h b/src/bacnet/basic/service/h_rp_a.h index 409133c1..fc2c5f2d 100644 --- a/src/bacnet/basic/service/h_rp_a.h +++ b/src/bacnet/basic/service/h_rp_a.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/service/h_rpm.h b/src/bacnet/basic/service/h_rpm.h index 57f25e43..e120c178 100644 --- a/src/bacnet/basic/service/h_rpm.h +++ b/src/bacnet/basic/service/h_rpm.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_rpm_a.h b/src/bacnet/basic/service/h_rpm_a.h index 29fb76e2..96122a0b 100644 --- a/src/bacnet/basic/service/h_rpm_a.h +++ b/src/bacnet/basic/service/h_rpm_a.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/rpm.h" diff --git a/src/bacnet/basic/service/h_rr.h b/src/bacnet/basic/service/h_rr.h index 68f65fa0..ba218ead 100644 --- a/src/bacnet/basic/service/h_rr.h +++ b/src/bacnet/basic/service/h_rr.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_rr_a.h b/src/bacnet/basic/service/h_rr_a.h index 4fe55c5e..34015ae0 100644 --- a/src/bacnet/basic/service/h_rr_a.h +++ b/src/bacnet/basic/service/h_rr_a.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_ts.h b/src/bacnet/basic/service/h_ts.h index dd398f16..6c1b80cf 100644 --- a/src/bacnet/basic/service/h_ts.h +++ b/src/bacnet/basic/service/h_ts.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/basic/service/h_ucov.h b/src/bacnet/basic/service/h_ucov.h index 86d6fba6..764f5056 100644 --- a/src/bacnet/basic/service/h_ucov.h +++ b/src/bacnet/basic/service/h_ucov.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/cov.h" diff --git a/src/bacnet/basic/service/h_upt.h b/src/bacnet/basic/service/h_upt.h index a9ffedcd..96c82bbd 100644 --- a/src/bacnet/basic/service/h_upt.h +++ b/src/bacnet/basic/service/h_upt.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/ptransfer.h" diff --git a/src/bacnet/basic/service/h_whohas.h b/src/bacnet/basic/service/h_whohas.h index 73016cab..730c5085 100644 --- a/src/bacnet/basic/service/h_whohas.h +++ b/src/bacnet/basic/service/h_whohas.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_whois.h b/src/bacnet/basic/service/h_whois.h index 11bb3c84..e619d28f 100644 --- a/src/bacnet/basic/service/h_whois.h +++ b/src/bacnet/basic/service/h_whois.h @@ -32,8 +32,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_wp.h b/src/bacnet/basic/service/h_wp.h index e28977eb..f9b98d9a 100644 --- a/src/bacnet/basic/service/h_wp.h +++ b/src/bacnet/basic/service/h_wp.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_wpm.h b/src/bacnet/basic/service/h_wpm.h index 99f87904..67f1f3d1 100644 --- a/src/bacnet/basic/service/h_wpm.h +++ b/src/bacnet/basic/service/h_wpm.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_abort.h b/src/bacnet/basic/service/s_abort.h index b3f6117b..3222bc69 100644 --- a/src/bacnet/basic/service/s_abort.h +++ b/src/bacnet/basic/service/s_abort.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_ack_alarm.h b/src/bacnet/basic/service/s_ack_alarm.h index 584631b8..cf95e3ca 100644 --- a/src/bacnet/basic/service/s_ack_alarm.h +++ b/src/bacnet/basic/service/s_ack_alarm.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/alarm_ack.h" diff --git a/src/bacnet/basic/service/s_arfs.h b/src/bacnet/basic/service/s_arfs.h index 5881f8b3..8ed305dc 100644 --- a/src/bacnet/basic/service/s_arfs.h +++ b/src/bacnet/basic/service/s_arfs.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_awfs.h b/src/bacnet/basic/service/s_awfs.h index 22397328..0965d433 100644 --- a/src/bacnet/basic/service/s_awfs.h +++ b/src/bacnet/basic/service/s_awfs.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_cevent.h b/src/bacnet/basic/service/s_cevent.h index 6650f28b..6a473b27 100644 --- a/src/bacnet/basic/service/s_cevent.h +++ b/src/bacnet/basic/service/s_cevent.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/event.h" diff --git a/src/bacnet/basic/service/s_cov.h b/src/bacnet/basic/service/s_cov.h index 9e488d16..aaa1a1c0 100644 --- a/src/bacnet/basic/service/s_cov.h +++ b/src/bacnet/basic/service/s_cov.h @@ -33,9 +33,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/cov.h" diff --git a/src/bacnet/basic/service/s_create_object.h b/src/bacnet/basic/service/s_create_object.h index 13e4cf6d..f070b3fd 100644 --- a/src/bacnet/basic/service/s_create_object.h +++ b/src/bacnet/basic/service/s_create_object.h @@ -14,9 +14,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_dcc.h b/src/bacnet/basic/service/s_dcc.h index 7302ca2a..0d4f08e6 100644 --- a/src/bacnet/basic/service/s_dcc.h +++ b/src/bacnet/basic/service/s_dcc.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_delete_object.h b/src/bacnet/basic/service/s_delete_object.h index 651cb5ed..dff81598 100644 --- a/src/bacnet/basic/service/s_delete_object.h +++ b/src/bacnet/basic/service/s_delete_object.h @@ -14,9 +14,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_error.h b/src/bacnet/basic/service/s_error.h index 9ef83dec..edb93b31 100644 --- a/src/bacnet/basic/service/s_error.h +++ b/src/bacnet/basic/service/s_error.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_get_alarm_sum.h b/src/bacnet/basic/service/s_get_alarm_sum.h index baa637bb..3009c636 100644 --- a/src/bacnet/basic/service/s_get_alarm_sum.h +++ b/src/bacnet/basic/service/s_get_alarm_sum.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_get_event.h b/src/bacnet/basic/service/s_get_event.h index d4853c1a..00e291e1 100644 --- a/src/bacnet/basic/service/s_get_event.h +++ b/src/bacnet/basic/service/s_get_event.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_getevent.h b/src/bacnet/basic/service/s_getevent.h index 3c772b86..2d4b07ff 100644 --- a/src/bacnet/basic/service/s_getevent.h +++ b/src/bacnet/basic/service/s_getevent.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_iam.h b/src/bacnet/basic/service/s_iam.h index 92eb120e..16140730 100644 --- a/src/bacnet/basic/service/s_iam.h +++ b/src/bacnet/basic/service/s_iam.h @@ -32,10 +32,10 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/apdu.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_ihave.h b/src/bacnet/basic/service/s_ihave.h index 28a52652..d283956d 100644 --- a/src/bacnet/basic/service/s_ihave.h +++ b/src/bacnet/basic/service/s_ihave.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_list_element.h b/src/bacnet/basic/service/s_list_element.h index 33067ea3..e14bf148 100644 --- a/src/bacnet/basic/service/s_list_element.h +++ b/src/bacnet/basic/service/s_list_element.h @@ -16,9 +16,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_lso.h b/src/bacnet/basic/service/s_lso.h index 96445ddd..64c6afc6 100644 --- a/src/bacnet/basic/service/s_lso.h +++ b/src/bacnet/basic/service/s_lso.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/lso.h" diff --git a/src/bacnet/basic/service/s_rd.h b/src/bacnet/basic/service/s_rd.h index d2f579ae..fcf088b4 100644 --- a/src/bacnet/basic/service/s_rd.h +++ b/src/bacnet/basic/service/s_rd.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_readrange.h b/src/bacnet/basic/service/s_readrange.h index 696b0357..7aea3cd0 100644 --- a/src/bacnet/basic/service/s_readrange.h +++ b/src/bacnet/basic/service/s_readrange.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/readrange.h" diff --git a/src/bacnet/basic/service/s_rp.h b/src/bacnet/basic/service/s_rp.h index 6d5064ae..e0a6a6af 100644 --- a/src/bacnet/basic/service/s_rp.h +++ b/src/bacnet/basic/service/s_rp.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_rpm.h b/src/bacnet/basic/service/s_rpm.h index ce81cec7..ae2129b7 100644 --- a/src/bacnet/basic/service/s_rpm.h +++ b/src/bacnet/basic/service/s_rpm.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/rpm.h" diff --git a/src/bacnet/basic/service/s_ts.h b/src/bacnet/basic/service/s_ts.h index 1b176ba5..cc7a3873 100644 --- a/src/bacnet/basic/service/s_ts.h +++ b/src/bacnet/basic/service/s_ts.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_uevent.h b/src/bacnet/basic/service/s_uevent.h index 4162eb1c..f5618eed 100644 --- a/src/bacnet/basic/service/s_uevent.h +++ b/src/bacnet/basic/service/s_uevent.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_upt.h b/src/bacnet/basic/service/s_upt.h index 8a33ef5c..5ed8e28e 100644 --- a/src/bacnet/basic/service/s_upt.h +++ b/src/bacnet/basic/service/s_upt.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/ptransfer.h" diff --git a/src/bacnet/basic/service/s_whohas.h b/src/bacnet/basic/service/s_whohas.h index 12a03806..ea5a3ffe 100644 --- a/src/bacnet/basic/service/s_whohas.h +++ b/src/bacnet/basic/service/s_whohas.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_whois.h b/src/bacnet/basic/service/s_whois.h index 813536f3..afb4c4c4 100644 --- a/src/bacnet/basic/service/s_whois.h +++ b/src/bacnet/basic/service/s_whois.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_wp.h b/src/bacnet/basic/service/s_wp.h index 4e8b066e..cd2d120b 100644 --- a/src/bacnet/basic/service/s_wp.h +++ b/src/bacnet/basic/service/s_wp.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_wpm.h b/src/bacnet/basic/service/s_wpm.h index 6d554ddc..a2605692 100644 --- a/src/bacnet/basic/service/s_wpm.h +++ b/src/bacnet/basic/service/s_wpm.h @@ -32,9 +32,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/wpm.h" diff --git a/src/bacnet/basic/services.h b/src/bacnet/basic/services.h index 9755dfdd..2af648b0 100644 --- a/src/bacnet/basic/services.h +++ b/src/bacnet/basic/services.h @@ -25,6 +25,8 @@ #ifndef BASIC_SERVICES_H #define BASIC_SERVICES_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ + /* NPDU layer handlers */ #include "bacnet/basic/npdu/h_npdu.h" #include "bacnet/basic/npdu/h_routed_npdu.h" diff --git a/src/bacnet/basic/sys/bigend.h b/src/bacnet/basic/sys/bigend.h index 09ac987c..f668388d 100644 --- a/src/bacnet/basic/sys/bigend.h +++ b/src/bacnet/basic/sys/bigend.h @@ -24,6 +24,7 @@ #ifndef BIGEND_H #define BIGEND_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/sys/color_rgb.h b/src/bacnet/basic/sys/color_rgb.h index 2052d76b..8677b9ee 100644 --- a/src/bacnet/basic/sys/color_rgb.h +++ b/src/bacnet/basic/sys/color_rgb.h @@ -8,6 +8,7 @@ #define COLOR_RGB_H #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/sys/days.h b/src/bacnet/basic/sys/days.h index 6782642b..ffc162e5 100644 --- a/src/bacnet/basic/sys/days.h +++ b/src/bacnet/basic/sys/days.h @@ -8,6 +8,7 @@ #define DAYS_H #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/sys/debug.h b/src/bacnet/basic/sys/debug.h index ea3f4d7d..84956e31 100644 --- a/src/bacnet/basic/sys/debug.h +++ b/src/bacnet/basic/sys/debug.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #ifndef DEBUG_ENABLED #define DEBUG_ENABLED 0 diff --git a/src/bacnet/basic/sys/fifo.h b/src/bacnet/basic/sys/fifo.h index ae3547e8..2d23391d 100644 --- a/src/bacnet/basic/sys/fifo.h +++ b/src/bacnet/basic/sys/fifo.h @@ -8,6 +8,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" /** diff --git a/src/bacnet/basic/sys/filename.h b/src/bacnet/basic/sys/filename.h index 8b6a7e28..0c7e2e3f 100644 --- a/src/bacnet/basic/sys/filename.h +++ b/src/bacnet/basic/sys/filename.h @@ -24,6 +24,7 @@ #ifndef FILENAME_H #define FILENAME_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/sys/key.h b/src/bacnet/basic/sys/key.h index c4f48cf4..b3e4e0cd 100644 --- a/src/bacnet/basic/sys/key.h +++ b/src/bacnet/basic/sys/key.h @@ -25,6 +25,7 @@ #define KEY_H #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ /* This file has the macros that encode and decode the */ /* keys for the keylist when used with BACnet Object Id's */ diff --git a/src/bacnet/basic/sys/keylist.h b/src/bacnet/basic/sys/keylist.h index 775ca1fc..3405834c 100644 --- a/src/bacnet/basic/sys/keylist.h +++ b/src/bacnet/basic/sys/keylist.h @@ -24,6 +24,7 @@ #ifndef KEYLIST_H #define KEYLIST_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/platform.h" #include "bacnet/basic/sys/key.h" diff --git a/src/bacnet/basic/sys/linear.h b/src/bacnet/basic/sys/linear.h index 1bf4c0e1..0baa165b 100644 --- a/src/bacnet/basic/sys/linear.h +++ b/src/bacnet/basic/sys/linear.h @@ -6,6 +6,8 @@ #ifndef LINEAR_H #define LINEAR_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/src/bacnet/basic/sys/mstimer.h b/src/bacnet/basic/sys/mstimer.h index 1dda63d5..ff965ac2 100644 --- a/src/bacnet/basic/sys/mstimer.h +++ b/src/bacnet/basic/sys/mstimer.h @@ -20,6 +20,7 @@ #ifndef MSTIMER_H_ #define MSTIMER_H_ +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" /** diff --git a/src/bacnet/basic/sys/platform.h b/src/bacnet/basic/sys/platform.h index 29f6a4f8..761819bc 100644 --- a/src/bacnet/basic/sys/platform.h +++ b/src/bacnet/basic/sys/platform.h @@ -20,6 +20,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #ifndef islessgreater #define islessgreater(x, y) ((x) < (y) || (x) > (y)) diff --git a/src/bacnet/basic/sys/ringbuf.h b/src/bacnet/basic/sys/ringbuf.h index d923461c..dabb9973 100644 --- a/src/bacnet/basic/sys/ringbuf.h +++ b/src/bacnet/basic/sys/ringbuf.h @@ -11,6 +11,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" /** diff --git a/src/bacnet/basic/sys/sbuf.h b/src/bacnet/basic/sys/sbuf.h index 081192b2..9deff972 100644 --- a/src/bacnet/basic/sys/sbuf.h +++ b/src/bacnet/basic/sys/sbuf.h @@ -29,6 +29,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" struct static_buffer_t { diff --git a/src/bacnet/basic/tsm/tsm.h b/src/bacnet/basic/tsm/tsm.h index ff6193c2..9c1bca9a 100644 --- a/src/bacnet/basic/tsm/tsm.h +++ b/src/bacnet/basic/tsm/tsm.h @@ -27,9 +27,9 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" /* note: TSM functionality is optional - only needed if we are diff --git a/src/bacnet/basic/ucix/ucix.h b/src/bacnet/basic/ucix/ucix.h index 67ca5975..136f2e1f 100644 --- a/src/bacnet/basic/ucix/ucix.h +++ b/src/bacnet/basic/ucix/ucix.h @@ -19,6 +19,7 @@ #ifndef _UCI_H__ #define _UCI_H__ +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" BACNET_STACK_EXPORT diff --git a/src/bacnet/bits.h b/src/bacnet/bits.h index e4b1253b..e9e1c911 100644 --- a/src/bacnet/bits.h +++ b/src/bacnet/bits.h @@ -24,6 +24,8 @@ #ifndef BITS_H #define BITS_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ + /******************************************************************** * Bit Masks *********************************************************************/ diff --git a/src/bacnet/bytes.h b/src/bacnet/bytes.h index 9d604649..52a68a3c 100644 --- a/src/bacnet/bytes.h +++ b/src/bacnet/bytes.h @@ -27,6 +27,7 @@ /* Defines the bit/byte/word/long conversions that are used in code */ #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #ifndef LO_NIB #define LO_NIB(b) ((b) & 0xF) diff --git a/src/bacnet/calendar_entry.h b/src/bacnet/calendar_entry.h index 676ebe28..6f009c0a 100644 --- a/src/bacnet/calendar_entry.h +++ b/src/bacnet/calendar_entry.h @@ -13,6 +13,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bactimevalue.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/cov.h b/src/bacnet/cov.h index 8159a057..e4b79e7e 100644 --- a/src/bacnet/cov.h +++ b/src/bacnet/cov.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/create_object.h b/src/bacnet/create_object.h index 70c16ef8..e1f9a4b1 100644 --- a/src/bacnet/create_object.h +++ b/src/bacnet/create_object.h @@ -12,10 +12,10 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" /** diff --git a/src/bacnet/credential_authentication_factor.h b/src/bacnet/credential_authentication_factor.h index bd9f5c95..bf95c037 100644 --- a/src/bacnet/credential_authentication_factor.h +++ b/src/bacnet/credential_authentication_factor.h @@ -28,8 +28,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" #include "bacnet/authentication_factor.h" diff --git a/src/bacnet/dailyschedule.h b/src/bacnet/dailyschedule.h index e1294253..93abf5d4 100644 --- a/src/bacnet/dailyschedule.h +++ b/src/bacnet/dailyschedule.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bactimevalue.h" diff --git a/src/bacnet/datalink/arcnet.h b/src/bacnet/datalink/arcnet.h index 3860fb79..01152d8c 100644 --- a/src/bacnet/datalink/arcnet.h +++ b/src/bacnet/datalink/arcnet.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" /* specific defines for ARCNET */ diff --git a/src/bacnet/datalink/automac.h b/src/bacnet/datalink/automac.h index 23822bb1..23a853d7 100644 --- a/src/bacnet/datalink/automac.h +++ b/src/bacnet/datalink/automac.h @@ -29,6 +29,7 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ /* MS/TP Auto MAC address functionality */ /* starting number available for AutoMAC */ diff --git a/src/bacnet/datalink/bacsec.h b/src/bacnet/datalink/bacsec.h index a0ff273f..fd100f73 100644 --- a/src/bacnet/datalink/bacsec.h +++ b/src/bacnet/datalink/bacsec.h @@ -39,8 +39,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" typedef struct BACnet_Security_Wrapper { diff --git a/src/bacnet/datalink/bip.h b/src/bacnet/datalink/bip.h index 668fd0be..1fa34262 100644 --- a/src/bacnet/datalink/bip.h +++ b/src/bacnet/datalink/bip.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/datalink/bvlc.h" diff --git a/src/bacnet/datalink/bip6.h b/src/bacnet/datalink/bip6.h index 52d8f8c2..e854cb34 100644 --- a/src/bacnet/datalink/bip6.h +++ b/src/bacnet/datalink/bip6.h @@ -16,8 +16,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/datalink/bvlc6.h" diff --git a/src/bacnet/datalink/bvlc.h b/src/bacnet/datalink/bvlc.h index c3313362..eeefc3d5 100644 --- a/src/bacnet/datalink/bvlc.h +++ b/src/bacnet/datalink/bvlc.h @@ -27,7 +27,7 @@ #include #include #include -#include "bacnet/bacdef.h" +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/npdu.h" /** diff --git a/src/bacnet/datalink/bvlc6.h b/src/bacnet/datalink/bvlc6.h index 3a22d80d..8a09eaac 100644 --- a/src/bacnet/datalink/bvlc6.h +++ b/src/bacnet/datalink/bvlc6.h @@ -12,8 +12,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" /** diff --git a/src/bacnet/datalink/cobs.h b/src/bacnet/datalink/cobs.h index 2861d9e8..850d937d 100644 --- a/src/bacnet/datalink/cobs.h +++ b/src/bacnet/datalink/cobs.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" /* number of bytes needed for COBS encoded CRC */ diff --git a/src/bacnet/datalink/crc.h b/src/bacnet/datalink/crc.h index f4c674d9..208e5c06 100644 --- a/src/bacnet/datalink/crc.h +++ b/src/bacnet/datalink/crc.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/datalink/datalink.h b/src/bacnet/datalink/datalink.h index 3165ffd1..3d7343e4 100644 --- a/src/bacnet/datalink/datalink.h +++ b/src/bacnet/datalink/datalink.h @@ -24,9 +24,9 @@ #ifndef DATALINK_H #define DATALINK_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/config.h" -#include "bacnet/bacdef.h" #if defined(BACDL_ETHERNET) #include "bacnet/datalink/ethernet.h" diff --git a/src/bacnet/datalink/dlenv.h b/src/bacnet/datalink/dlenv.h index b7536e3a..ce7b3934 100644 --- a/src/bacnet/datalink/dlenv.h +++ b/src/bacnet/datalink/dlenv.h @@ -27,6 +27,7 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/datalink/bvlc.h" #include "bacnet/bacnet_stack_exports.h" diff --git a/src/bacnet/datalink/dlmstp.h b/src/bacnet/datalink/dlmstp.h index 0dab2ce5..d693add5 100644 --- a/src/bacnet/datalink/dlmstp.h +++ b/src/bacnet/datalink/dlmstp.h @@ -27,10 +27,10 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/datalink/mstpdef.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" /* defines specific to MS/TP */ diff --git a/src/bacnet/datalink/ethernet.h b/src/bacnet/datalink/ethernet.h index f4ae4ea1..411ff65d 100644 --- a/src/bacnet/datalink/ethernet.h +++ b/src/bacnet/datalink/ethernet.h @@ -27,8 +27,8 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" /* specific defines for Ethernet */ diff --git a/src/bacnet/datalink/mstp.h b/src/bacnet/datalink/mstp.h index 2e30d50e..090c6aa9 100644 --- a/src/bacnet/datalink/mstp.h +++ b/src/bacnet/datalink/mstp.h @@ -28,6 +28,7 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/datalink/mstpdef.h" #include "bacnet/config.h" diff --git a/src/bacnet/datalink/mstpdef.h b/src/bacnet/datalink/mstpdef.h index e865e0a0..0f091dc9 100644 --- a/src/bacnet/datalink/mstpdef.h +++ b/src/bacnet/datalink/mstpdef.h @@ -27,7 +27,7 @@ #include #include #include -#include "bacnet/bacdef.h" +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ /* The value 255 is used to denote broadcast when used as a */ /* destination address but is not allowed as a value for a station. */ diff --git a/src/bacnet/datalink/mstptext.h b/src/bacnet/datalink/mstptext.h index 6e71b3c7..2846af02 100644 --- a/src/bacnet/datalink/mstptext.h +++ b/src/bacnet/datalink/mstptext.h @@ -24,6 +24,7 @@ #ifndef MSTPTEXT_H #define MSTPTEXT_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/datetime.h b/src/bacnet/datetime.h index c6c2989f..c47eda14 100644 --- a/src/bacnet/datetime.h +++ b/src/bacnet/datetime.h @@ -15,6 +15,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/platform.h" diff --git a/src/bacnet/dcc.h b/src/bacnet/dcc.h index a91f8348..0daaca78 100644 --- a/src/bacnet/dcc.h +++ b/src/bacnet/dcc.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/delete_object.h b/src/bacnet/delete_object.h index 4cb997b1..5880ac8b 100644 --- a/src/bacnet/delete_object.h +++ b/src/bacnet/delete_object.h @@ -12,10 +12,10 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" /** diff --git a/src/bacnet/event.h b/src/bacnet/event.h index 8d3fcc80..2c60746b 100644 --- a/src/bacnet/event.h +++ b/src/bacnet/event.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/get_alarm_sum.h b/src/bacnet/get_alarm_sum.h index 4043e50a..84de8706 100644 --- a/src/bacnet/get_alarm_sum.h +++ b/src/bacnet/get_alarm_sum.h @@ -28,6 +28,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/timestamp.h" diff --git a/src/bacnet/getevent.h b/src/bacnet/getevent.h index e63d9465..979c8932 100644 --- a/src/bacnet/getevent.h +++ b/src/bacnet/getevent.h @@ -26,8 +26,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/timestamp.h" #include "bacnet/event.h" diff --git a/src/bacnet/hostnport.h b/src/bacnet/hostnport.h index ea3ac74c..599fa3ff 100644 --- a/src/bacnet/hostnport.h +++ b/src/bacnet/hostnport.h @@ -14,6 +14,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/iam.h b/src/bacnet/iam.h index 6ad89889..5dfb9225 100644 --- a/src/bacnet/iam.h +++ b/src/bacnet/iam.h @@ -26,8 +26,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacaddr.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/ihave.h b/src/bacnet/ihave.h index 5cf4e213..42ff7c22 100644 --- a/src/bacnet/ihave.h +++ b/src/bacnet/ihave.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/indtext.h b/src/bacnet/indtext.h index cec1af08..64735e2a 100644 --- a/src/bacnet/indtext.h +++ b/src/bacnet/indtext.h @@ -27,6 +27,7 @@ #include #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" /* index and text pairs */ diff --git a/src/bacnet/lighting.h b/src/bacnet/lighting.h index 518669c4..6c992a97 100644 --- a/src/bacnet/lighting.h +++ b/src/bacnet/lighting.h @@ -15,6 +15,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/list_element.h b/src/bacnet/list_element.h index 957b8da4..b15645f5 100644 --- a/src/bacnet/list_element.h +++ b/src/bacnet/list_element.h @@ -14,10 +14,10 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacdef.h" /** * AddListElement-Request ::= SEQUENCE { diff --git a/src/bacnet/lso.h b/src/bacnet/lso.h index bc366514..56016473 100644 --- a/src/bacnet/lso.h +++ b/src/bacnet/lso.h @@ -26,9 +26,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" -#include "bacnet/bacdef.h" #include "bacnet/bacstr.h" typedef struct { diff --git a/src/bacnet/memcopy.h b/src/bacnet/memcopy.h index 611258c1..6340737d 100644 --- a/src/bacnet/memcopy.h +++ b/src/bacnet/memcopy.h @@ -28,6 +28,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/npdu.h b/src/bacnet/npdu.h index 25c1e3f7..4cc6ffb5 100644 --- a/src/bacnet/npdu.h +++ b/src/bacnet/npdu.h @@ -26,9 +26,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/platform.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" /** Hop count default is required by BTL to be maximum */ diff --git a/src/bacnet/property.h b/src/bacnet/property.h index e9084b07..49783538 100644 --- a/src/bacnet/property.h +++ b/src/bacnet/property.h @@ -26,8 +26,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/rp.h" #include "bacnet/proplist.h" diff --git a/src/bacnet/proplist.h b/src/bacnet/proplist.h index c36782cc..2d6b036d 100644 --- a/src/bacnet/proplist.h +++ b/src/bacnet/proplist.h @@ -26,8 +26,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" #include "bacnet/rp.h" diff --git a/src/bacnet/ptransfer.h b/src/bacnet/ptransfer.h index c1b5f3d9..fc7867b7 100644 --- a/src/bacnet/ptransfer.h +++ b/src/bacnet/ptransfer.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" typedef struct BACnet_Private_Transfer_Data { diff --git a/src/bacnet/rd.h b/src/bacnet/rd.h index 9b6a7f8f..c5005575 100644 --- a/src/bacnet/rd.h +++ b/src/bacnet/rd.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/readrange.h b/src/bacnet/readrange.h index 64b6a67f..00c3d1e4 100644 --- a/src/bacnet/readrange.h +++ b/src/bacnet/readrange.h @@ -24,6 +24,7 @@ #ifndef READRANGE_H #define READRANGE_H +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacstr.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/reject.h b/src/bacnet/reject.h index 9b798a39..726c1384 100644 --- a/src/bacnet/reject.h +++ b/src/bacnet/reject.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/rp.h b/src/bacnet/rp.h index 3c302e16..59001c30 100644 --- a/src/bacnet/rp.h +++ b/src/bacnet/rp.h @@ -26,8 +26,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" #include "bacnet/bacenum.h" typedef struct BACnet_Read_Property_Data { diff --git a/src/bacnet/rpm.h b/src/bacnet/rpm.h index 524d7eff..0a896702 100644 --- a/src/bacnet/rpm.h +++ b/src/bacnet/rpm.h @@ -26,9 +26,9 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacenum.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" #include "bacnet/proplist.h" #include "bacnet/rp.h" diff --git a/src/bacnet/special_event.h b/src/bacnet/special_event.h index 245deefb..c15b97a3 100644 --- a/src/bacnet/special_event.h +++ b/src/bacnet/special_event.h @@ -13,6 +13,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bactimevalue.h" #include "bacnet/calendar_entry.h" diff --git a/src/bacnet/timestamp.h b/src/bacnet/timestamp.h index 38a1cd0c..9e0355fd 100644 --- a/src/bacnet/timestamp.h +++ b/src/bacnet/timestamp.h @@ -24,6 +24,7 @@ #ifndef _TIMESTAMP_H_ #define _TIMESTAMP_H_ #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/basic/sys/platform.h" #include "bacnet/bacenum.h" diff --git a/src/bacnet/timesync.h b/src/bacnet/timesync.h index 6a8d36e9..2691bdb4 100644 --- a/src/bacnet/timesync.h +++ b/src/bacnet/timesync.h @@ -26,8 +26,8 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" struct BACnet_Recipient_List; typedef struct BACnet_Recipient_List { diff --git a/src/bacnet/version.h b/src/bacnet/version.h index f881b7d9..808debf2 100644 --- a/src/bacnet/version.h +++ b/src/bacnet/version.h @@ -10,6 +10,8 @@ #ifndef _BACNET_VERSION_H_ #define _BACNET_VERSION_H_ +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ + /* This BACnet protocol stack version 0.0.0 - 255.255.255 */ #ifndef BACNET_VERSION #define BACNET_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z)) diff --git a/src/bacnet/weeklyschedule.h b/src/bacnet/weeklyschedule.h index 57ff377a..503df5a5 100644 --- a/src/bacnet/weeklyschedule.h +++ b/src/bacnet/weeklyschedule.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/dailyschedule.h" #include "bacnet/bactimevalue.h" diff --git a/src/bacnet/whohas.h b/src/bacnet/whohas.h index da040af4..847127c1 100644 --- a/src/bacnet/whohas.h +++ b/src/bacnet/whohas.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/whois.h b/src/bacnet/whois.h index d61314da..366ec368 100644 --- a/src/bacnet/whois.h +++ b/src/bacnet/whois.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #ifdef __cplusplus diff --git a/src/bacnet/wp.h b/src/bacnet/wp.h index e8941a59..de67493d 100644 --- a/src/bacnet/wp.h +++ b/src/bacnet/wp.h @@ -26,6 +26,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/wpm.h b/src/bacnet/wpm.h index 760d708b..505f83c7 100644 --- a/src/bacnet/wpm.h +++ b/src/bacnet/wpm.h @@ -27,6 +27,7 @@ #include #include +#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #include "bacnet/bacnet_stack_exports.h" #include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" diff --git a/test/bacnet/datetime/src/main.c b/test/bacnet/datetime/src/main.c index 589e375d..de0dad68 100644 --- a/test/bacnet/datetime/src/main.c +++ b/test/bacnet/datetime/src/main.c @@ -70,7 +70,7 @@ static void datetime_print(const char *title, BACNET_DATE_TIME *bdatetime) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testBACnetDateTimeWildcard) +ZTEST(bacnet_datetime, testBACnetDateTimeWildcard) #else static void testBACnetDateTimeWildcard(void) #endif @@ -88,7 +88,7 @@ static void testBACnetDateTimeWildcard(void) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testBACnetDateTimeAdd) +ZTEST(bacnet_datetime, testBACnetDateTimeAdd) #else static void testBACnetDateTimeAdd(void) #endif @@ -156,7 +156,7 @@ static void testBACnetDateTimeSeconds(void) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testBACnetDate) +ZTEST(bacnet_datetime, testBACnetDate) #else static void testBACnetDate(void) #endif @@ -221,7 +221,7 @@ static void testBACnetDate(void) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testBACnetTime) +ZTEST(bacnet_datetime, testBACnetTime) #else static void testBACnetTime(void) #endif @@ -274,7 +274,7 @@ static void testBACnetTime(void) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testBACnetDateTime) +ZTEST(bacnet_datetime, testBACnetDateTime) #else static void testBACnetDateTime(void) #endif @@ -344,7 +344,7 @@ static void testBACnetDateTime(void) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testWildcardDateTime) +ZTEST(bacnet_datetime, testWildcardDateTime) #else static void testWildcardDateTime(void) #endif @@ -433,7 +433,7 @@ static void testDateEpochConversionCompare(uint16_t year, } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testDateEpochConversion) +ZTEST(bacnet_datetime, testDateEpochConversion) #else static void testDateEpochConversion(void) #endif @@ -476,7 +476,7 @@ static void testDateEpoch(void) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testBACnetDayOfWeek) +ZTEST(bacnet_datetime, testBACnetDayOfWeek) #else static void testBACnetDayOfWeek(void) #endif @@ -508,7 +508,7 @@ static void testBACnetDayOfWeek(void) } #if defined(CONFIG_ZTEST_NEW_API) -ZTEST(wp_tests, testDatetimeCodec) +ZTEST(bacnet_datetime, testDatetimeCodec) #else static void testDatetimeCodec(void) #endif @@ -630,7 +630,7 @@ static void testDatetimeConvertUTC(void) */ #if defined(CONFIG_ZTEST_NEW_API) -ZTEST_SUITE(datetime_tests, NULL, NULL, NULL, NULL, NULL); +ZTEST_SUITE(bacnet_datetime, NULL, NULL, NULL, NULL, NULL); #else void test_main(void) { @@ -639,7 +639,7 @@ void test_main(void) ztest_unit_test(testBACnetDateTimeSeconds), ztest_unit_test(testDayOfYear), #endif - ztest_test_suite(datetime_tests, + ztest_test_suite(bacnet_datetime, ztest_unit_test(testBACnetDate), ztest_unit_test(testBACnetTime), ztest_unit_test(testBACnetDateTime), @@ -653,6 +653,6 @@ void test_main(void) ztest_unit_test(testDayOfYear), ztest_unit_test(testDatetimeConvertUTC)); - ztest_run_test_suite(datetime_tests); + ztest_run_test_suite(bacnet_datetime); } #endif diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 0a1242d2..65984bcb 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -484,3 +484,7 @@ target_compile_definitions( PRINT_ENABLED=1 ) +zephyr_compile_definitions( + BACNET_CONFIG_H=1 # Use ports/zephyr/bacnet-config.h + ) + diff --git a/zephyr/subsys/object/object.h b/zephyr/subsys/object/object.h index fb446fe3..d5737795 100644 --- a/zephyr/subsys/object/object.h +++ b/zephyr/subsys/object/object.h @@ -15,6 +15,7 @@ #define _CONCAT(x, y) _DO_CONCAT(x, y) #endif +#include "bacnet/bacdef.h" // Must be before all other bacnet/*.h files #include "bacnet/basic/sys/keylist.h" diff --git a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt index c8983f54..4725cfb8 100644 --- a/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/command/CMakeLists.txt @@ -74,5 +74,6 @@ else() ${TEST_OBJECT_INCLUDE}) target_sources(app PRIVATE ${BACNET_TEST_PATH}/src/main.c + ${TEST_OBJECT_SRC}/property_test.c ) endif() diff --git a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt index e1695d81..339be0d2 100644 --- a/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt @@ -76,5 +76,6 @@ else() ${TEST_OBJECT_INCLUDE}) target_sources(app PRIVATE ${BACNET_TEST_PATH}/src/main.c + ${TEST_OBJECT_SRC}/property_test.c ) endif() diff --git a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt index 1c83a3e9..fd19c95d 100644 --- a/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt @@ -20,14 +20,17 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME) # Update include path for this module list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src) +set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object) +list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC}) + if(BOARD STREQUAL unit_testing) file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src) - list(APPEND INCLUDE ${BACNET_INCLUDE}) + file(RELATIVE_PATH TEST_OBJECT_INCLUDE $ENV{ZEPHYR_BASE} ${TEST_OBJECT_SRC}) + list(APPEND INCLUDE ${BACNET_INCLUDE} ${TEST_OBJECT_INCLUDE}) list(APPEND SOURCES ${BACNET_SRC_PATH}.c ${BACNET_TEST_PATH}/src/main.c - ${BACNET_TEST_PATH}/../property_test.c - ${BACNET_TEST_PATH}/../property_test.h + ${TEST_OBJECT_SRC}/property_test.c ) get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH) @@ -68,8 +71,11 @@ else() find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(${BACNET_NAME}) - target_include_directories(app PRIVATE ${BACNET_INCLUDE}) + target_include_directories(app PRIVATE + ${BACNET_INCLUDE} + ${TEST_OBJECT_INCLUDE}) target_sources(app PRIVATE ${BACNET_TEST_PATH}/src/main.c + ${TEST_OBJECT_SRC}/property_test.c ) endif() diff --git a/zephyr/tests/bacnet/basic/object/netport/testcase.yaml b/zephyr/tests/bacnet/basic/object/netport/testcase.yaml index 7dc788f1..8004f742 100644 --- a/zephyr/tests/bacnet/basic/object/netport/testcase.yaml +++ b/zephyr/tests/bacnet/basic/object/netport/testcase.yaml @@ -2,6 +2,7 @@ tests: bacnet.basic.object.netport: tags: bacnet extra_args: EXTRA_CFLAGS='-Wno-error=array-compare' # for zephyr_v3.0.0 net_if.c + skip: true # TODO: Remove once unit test builds/runs under Zephyr CI bacnet.basic.object.netport.unit: tags: bacnet type: unit diff --git a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt index da3d331a..21f36543 100644 --- a/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt +++ b/zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt @@ -75,5 +75,6 @@ else() ${TEST_OBJECT_INCLUDE}) target_sources(app PRIVATE ${BACNET_TEST_PATH}/src/main.c + ${TEST_OBJECT_SRC}/property_test.c ) endif()