Cleaned up device object and server demo for MS/TP properties and compiler warnings.

bacnet-stack/demo/handler/h_rpm.c

@@ -1,7 +1,7 @@
 /**************************************************************************
 *
 * Copyright (C) 2007 Steve Karg <skarg@users.sourceforge.net>
-* Inspired by John Stachler.
+* Inspired by John Stachler <John.Stachler@lennoxind.com> 
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the

bacnet-stack/demo/object/device.c

@@ -46,7 +46,9 @@
 #if BACFILE
 #include "bacfile.h"            /* object list dependency */
 #endif
-
+#if defined(BACDL_MSTP)
+#include "dlmstp.h"
+#endif
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int Device_Properties_Required[] =
 {
@@ -891,7 +893,6 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
             *error_code = ERROR_CODE_INVALID_DATA_TYPE;
         }
         break;
-
     case PROP_NUMBER_OF_APDU_RETRIES:
         if (value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) {
             /* FIXME: bounds check? */
@@ -903,7 +904,6 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
             *error_code = ERROR_CODE_INVALID_DATA_TYPE;
         }
         break;
-
     case PROP_APDU_TIMEOUT:
         if (value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) {
             /* FIXME: bounds check? */
@@ -914,7 +914,6 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
             *error_code = ERROR_CODE_INVALID_DATA_TYPE;
         }
         break;
-
     case PROP_VENDOR_IDENTIFIER:
         if (value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) {
             /* FIXME: bounds check? */
@@ -926,7 +925,6 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
             *error_code = ERROR_CODE_INVALID_DATA_TYPE;
         }
         break;
-
     case PROP_SYSTEM_STATUS:
         if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) {
             /* FIXME: bounds check? */
@@ -937,7 +935,6 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
             *error_code = ERROR_CODE_INVALID_DATA_TYPE;
         }
         break;
-
     case PROP_OBJECT_NAME:
         if (value.tag == BACNET_APPLICATION_TAG_CHARACTER_STRING) {
             uint8_t encoding;
@@ -961,8 +958,38 @@ bool Device_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
             *error_code = ERROR_CODE_INVALID_DATA_TYPE;
         }
         break;
-
+#if defined(BACDL_MSTP)
-    default:
+    case PROP_MAX_INFO_FRAMES:
+        if (value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) {
+            if (value.type.Unsigned_Int <= 255) {
+                dlmstp_set_max_info_frames(value.type.Unsigned_Int);
+                status = true;
+            } else {
+                *error_class = ERROR_CLASS_PROPERTY;
+                *error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+            }
+        } else {
+            *error_class = ERROR_CLASS_PROPERTY;
+            *error_code = ERROR_CODE_INVALID_DATA_TYPE;
+        }
+        break;
+    case PROP_MAX_MASTER:
+        if (value.tag == BACNET_APPLICATION_TAG_UNSIGNED_INT) {
+            if ((value.type.Unsigned_Int > 0) &&
+                (value.type.Unsigned_Int <= 127)) {
+                dlmstp_set_max_master(value.type.Unsigned_Int);
+                status = true;
+            } else {
+                *error_class = ERROR_CLASS_PROPERTY;
+                *error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+            }
+        } else {
+            *error_class = ERROR_CLASS_PROPERTY;
+            *error_code = ERROR_CODE_INVALID_DATA_TYPE;
+        }
+        break;
+#endif
+        default:
         *error_class = ERROR_CLASS_PROPERTY;
         *error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
         break;

bacnet-stack/demo/server/main.c

@@ -45,6 +45,9 @@
 #include "net.h"
 #include "txbuf.h"
 #include "lc.h"
+#if defined(BACDL_MSTP)
+#include "rs485.h"
+#endif
 
 /* This is an example server application using the BACnet Stack */
 
@@ -122,8 +125,10 @@ int main(int argc, char *argv[])
     }
 #endif
     printf("BACnet Server Demo\n"
-        "BACnet Device ID: %u\r\n",
+        "BACnet Device ID: %u\n"
-        Device_Object_Instance_Number());
+        "Max APDU: %d\n",
+        Device_Object_Instance_Number(),
+        MAX_APDU);
     Init_Service_Handlers();
     if (!datalink_init(Network_Interface))
         return 1;