Added more functionality to the ATmega168 demo.

bacnet-stack/include/bv.h

@@ -31,6 +31,11 @@
 #include "bacerror.h"
 #include "wp.h"
 
+#ifndef MAX_BINARY_VALUES
+#define MAX_BINARY_VALUES 10
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

bacnet-stack/ports/atmega168/Makefile

@@ -18,6 +18,7 @@ BACNET_CORE = ../../src
 BACNET_INCLUDE = ../../include
 BACNET_DEMO = ../../demo
 
+# local files for this project
 CSRC = main.c \
 	timer.c \
 	rs485.c \
@@ -25,14 +26,17 @@ CSRC = main.c \
 	apdu.c \
 	$(BACNET_CORE)/crc.c
 
+# common demo files needed
 DEMOSRC = h_rp.c \
 	device.c \
 	av.c \
+	bv.c \
 	$(BACNET_DEMO)/handler/txbuf.c \
 	$(BACNET_DEMO)/handler/noserv.c \
 	h_whois.c \
 	h_wp.c
 
+# core BACnet stack files
 CORESRC =  \
 	$(BACNET_CORE)/apdu.c \
 	$(BACNET_CORE)/npdu.c \
@@ -100,9 +104,11 @@ BFLAGS += -DMAX_TSM_TRANSACTIONS=0
 BFLAGS += -DBACAPP_REAL
 BFLAGS += -DBACAPP_OBJECT_ID
 BFLAGS += -DBACAPP_UNSIGNED
+BFLAGS += -DBACAPP_ENUMERATED
 BFLAGS += -DBACAPP_CHARACTER_STRING
 BFLAGS += -DWRITE_PROPERTY
 BFLAGS += -DMAX_ANALOG_VALUES=10
+BFLAGS += -DMAX_BINARY_VALUES=10
 CFLAGS = $(COMMON)
 # dead code removal
 CFLAGS += -ffunction-sections -fdata-sections

bacnet-stack/ports/atmega168/av.c

@@ -183,11 +183,6 @@ bool Analog_Value_Write_Property(
                 object_index =
                     Analog_Value_Instance_To_Index(wp_data->object_instance);
                 AV_Present_Value[object_index] = value.type.Real;
-                if ((AV_Present_Value[0] < 1.0) && (AV_Present_Value[0] > -1.0)) {
-                    LED_GREEN_OFF();
-                } else {
-                    LED_GREEN_ON();
-                }
                 status = true;
             } else {
                 *error_class = ERROR_CLASS_PROPERTY;
@@ -221,7 +216,6 @@ void testAnalog_Value(
     BACNET_ERROR_CLASS error_class;
     BACNET_ERROR_CODE error_code;
 
-
     len =
         Analog_Value_Encode_Property_APDU(&apdu[0], instance,
         PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);

bacnet-stack/ports/atmega168/bacnet.ewp

@@ -243,6 +243,10 @@
           <state>BIG_ENDIAN=0</state>
           <state>MAX_TSM_TRANSACTIONS=0</state>
           <state>BACAPP_REAL</state>
+          <state>BACAPP_UNSIGNED</state>
+          <state>BACAPP_ENUMERATED</state>
+          <state>BACAPP_CHARACTER_STRING</state>
+          <state>BACAPP_OBJECT_ID</state>
         </option>
         <option>
           <name>CCPreprocFile</name>
@@ -1964,6 +1968,9 @@
   <file>
     <name>$PROJ_DIR$\..\..\src\bacstr.c</name>
   </file>
+  <file>
+    <name>$PROJ_DIR$\bv.c</name>
+  </file>
   <file>
     <name>$PROJ_DIR$\..\..\src\crc.c</name>
   </file>
@@ -1979,6 +1986,9 @@
   <file>
     <name>$PROJ_DIR$\h_whois.c</name>
   </file>
+  <file>
+    <name>$PROJ_DIR$\h_wp.c</name>
+  </file>
   <file>
     <name>$PROJ_DIR$\hardware.h</name>
   </file>

bacnet-stack/ports/atmega168/bv.c

@@ -0,0 +1,301 @@
+/**************************************************************************
+*
+* Copyright (C) 2006 Steve Karg <skarg@users.sourceforge.net>
+*
+* 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.
+*
+*********************************************************************/
+
+/* Binary Value Objects - customize for your use */
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include "hardware.h"
+#include "bacdef.h"
+#include "bacdcode.h"
+#include "bacenum.h"
+#include "config.h"     /* the custom stuff */
+#include "wp.h"
+#include "bv.h"
+
+#if (MAX_BINARY_VALUES > 10)
+#error Modify the Binary_Value_Name to handle multiple digits
+#endif
+
+static BACNET_BINARY_PV Present_Value[MAX_BINARY_VALUES];
+
+/* we simply have 0-n object instances. */
+bool Binary_Value_Valid_Instance(
+    uint32_t object_instance)
+{
+    if (object_instance < MAX_BINARY_VALUES)
+        return true;
+
+    return false;
+}
+
+/* we simply have 0-n object instances. */
+unsigned Binary_Value_Count(
+    void)
+{
+    return MAX_BINARY_VALUES;
+}
+
+/* we simply have 0-n object instances. */
+uint32_t Binary_Value_Index_To_Instance(
+    unsigned index)
+{
+    return index;
+}
+
+/* we simply have 0-n object instances.  */
+unsigned Binary_Value_Instance_To_Index(
+    uint32_t object_instance)
+{
+    unsigned index = MAX_BINARY_VALUES;
+
+    if (object_instance < MAX_BINARY_VALUES)
+        index = object_instance;
+
+    return index;
+}
+
+static BACNET_BINARY_PV Binary_Value_Present_Value(
+    uint32_t object_instance)
+{
+    BACNET_BINARY_PV value = BINARY_INACTIVE;
+
+    if (object_instance < MAX_BINARY_VALUES) {
+        value = Present_Value[object_instance];
+    }
+
+    return value;
+}
+
+/* note: the object name must be unique within this device */
+char *Binary_Value_Name(
+    uint32_t object_instance)
+{
+    static char text_string[5] = "BV-0";       /* okay for single thread */
+
+    if (object_instance < MAX_BINARY_VALUES) {
+        text_string[3] = '0' + (uint8_t) object_instance;
+        return text_string;
+    }
+
+    return NULL;
+}
+
+/* return apdu len, or -1 on error */
+int Binary_Value_Encode_Property_APDU(
+    uint8_t * apdu,
+    uint32_t object_instance,
+    BACNET_PROPERTY_ID property,
+    int32_t array_index,
+    BACNET_ERROR_CLASS * error_class,
+    BACNET_ERROR_CODE * error_code)
+{
+    int apdu_len = 0;   /* return value */
+    BACNET_BIT_STRING bit_string;
+    BACNET_CHARACTER_STRING char_string;
+    BACNET_BINARY_PV present_value = BINARY_INACTIVE;
+    BACNET_POLARITY polarity = POLARITY_NORMAL;
+
+    switch (property) {
+        case PROP_OBJECT_IDENTIFIER:
+            apdu_len =
+                encode_application_object_id(&apdu[0], OBJECT_BINARY_VALUE,
+                object_instance);
+            break;
+            /* note: Name and Description don't have to be the same.
+               You could make Description writable and different */
+        case PROP_OBJECT_NAME:
+            characterstring_init_ansi(&char_string,
+                Binary_Value_Name(object_instance));
+            apdu_len =
+                encode_application_character_string(&apdu[0], &char_string);
+            break;
+        case PROP_OBJECT_TYPE:
+            apdu_len =
+                encode_application_enumerated(&apdu[0], OBJECT_BINARY_VALUE);
+            break;
+        case PROP_PRESENT_VALUE:
+            present_value = Binary_Value_Present_Value(object_instance);
+            apdu_len = encode_application_enumerated(&apdu[0], present_value);
+            break;
+        case PROP_STATUS_FLAGS:
+            /* note: see the details in the standard on how to use these */
+            bitstring_init(&bit_string);
+            bitstring_set_bit(&bit_string, STATUS_FLAG_IN_ALARM, false);
+            bitstring_set_bit(&bit_string, STATUS_FLAG_FAULT, false);
+            bitstring_set_bit(&bit_string, STATUS_FLAG_OVERRIDDEN, false);
+            bitstring_set_bit(&bit_string, STATUS_FLAG_OUT_OF_SERVICE, false);
+            apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
+            break;
+        case PROP_EVENT_STATE:
+            /* note: see the details in the standard on how to use this */
+            apdu_len =
+                encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
+            break;
+        case PROP_OUT_OF_SERVICE:
+            apdu_len = encode_application_boolean(&apdu[0], false);
+            break;
+        case PROP_POLARITY:
+            /* FIXME: figure out the polarity */
+            apdu_len = encode_application_enumerated(&apdu[0], polarity);
+            break;
+        default:
+            *error_class = ERROR_CLASS_PROPERTY;
+            *error_code = ERROR_CODE_UNKNOWN_PROPERTY;
+            apdu_len = -1;
+            break;
+    }
+
+    return apdu_len;
+}
+
+/* returns true if successful */
+bool Binary_Value_Write_Property(
+    BACNET_WRITE_PROPERTY_DATA * wp_data,
+    BACNET_ERROR_CLASS * error_class,
+    BACNET_ERROR_CODE * error_code)
+{
+    bool status = false;        /* return value */
+    unsigned int object_index = 0;
+    int len = 0;
+    BACNET_APPLICATION_DATA_VALUE value;
+
+    if (!Binary_Value_Valid_Instance(wp_data->object_instance)) {
+        *error_class = ERROR_CLASS_OBJECT;
+        *error_code = ERROR_CODE_UNKNOWN_OBJECT;
+        return false;
+    }
+    /* decode the some of the request */
+    len =
+        bacapp_decode_application_data(wp_data->application_data,
+        wp_data->application_data_len, &value);
+    /* FIXME: len < application_data_len: more data? */
+    /* FIXME: len == 0: unable to decode? */
+    switch (wp_data->object_property) {
+        case PROP_PRESENT_VALUE:
+            if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) {
+                if ((value.type.Enumerated == BINARY_ACTIVE) ||
+                    (value.type.Enumerated == BINARY_INACTIVE)) {
+                    object_index =
+                        Binary_Value_Instance_To_Index(wp_data->
+                        object_instance);
+                    /* NOTE: this Binary value has no priority array */
+                    Present_Value[object_index] = (BACNET_BINARY_PV)value.type.Enumerated;
+                    /* Note: you could set the physical output here if we
+                       are the highest priority.
+                       However, if Out of Service is TRUE, then don't set the
+                       physical output. */
+                    if (Present_Value[0] == BINARY_ACTIVE) {
+                        LED_GREEN_ON();
+                    } else {
+                        LED_GREEN_OFF();
+                    }
+                    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;
+#if 0
+        case PROP_OUT_OF_SERVICE:
+            if (value.tag == BACNET_APPLICATION_TAG_BOOLEAN) {
+                object_index =
+                    Binary_Value_Instance_To_Index(wp_data->object_instance);
+                Binary_Value_Out_Of_Service[object_index] = value.type.Boolean;
+                status = true;
+            } 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;
+    }
+
+    return status;
+}
+
+#ifdef TEST
+#include <assert.h>
+#include <string.h>
+#include "ctest.h"
+
+void testBinary_Value(
+    Test * pTest)
+{
+    uint8_t apdu[MAX_APDU] = { 0 };
+    int len = 0;
+    uint32_t len_value = 0;
+    uint8_t tag_number = 0;
+    BACNET_OBJECT_TYPE decoded_type = OBJECT_BINARY_VALUE;
+    uint32_t decoded_instance = 0;
+    uint32_t instance = 123;
+    BACNET_ERROR_CLASS error_class;
+    BACNET_ERROR_CODE error_code;
+
+
+    len =
+        Binary_Value_Encode_Property_APDU(&apdu[0], instance,
+        PROP_OBJECT_IDENTIFIER, BACNET_ARRAY_ALL, &error_class, &error_code);
+    ct_test(pTest, len != 0);
+    len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
+    ct_test(pTest, tag_number == BACNET_APPLICATION_TAG_OBJECT_ID);
+    len =
+        decode_object_id(&apdu[len], (int *) &decoded_type, &decoded_instance);
+    ct_test(pTest, decoded_type == OBJECT_BINARY_VALUE);
+    ct_test(pTest, decoded_instance == instance);
+
+    return;
+}
+
+#ifdef TEST_BINARY_VALUE
+int main(
+    void)
+{
+    Test *pTest;
+    bool rc;
+
+    pTest = ct_create("BACnet Binary_Value", NULL);
+    /* individual tests */
+    rc = ct_addTestFunction(pTest, testBinary_Value);
+    assert(rc);
+
+    ct_setStream(pTest, stdout);
+    ct_run(pTest);
+    (void) ct_report(pTest);
+    ct_destroy(pTest);
+
+    return 0;
+}
+#endif /* TEST_BINARY_VALUE */
+#endif /* TEST */

bacnet-stack/ports/atmega168/device.c

@@ -37,13 +37,8 @@
 /* objects */
 #include "device.h"
 #include "av.h"
-#if 0
-#include "ai.h"
-#include "bi.h"
 #include "bv.h"
 #include "wp.h"
-#include "dcc.h"
-#endif
 
 /* note: you really only need to define variables for
    properties that are writable or that may change.
@@ -111,12 +106,8 @@ unsigned Device_Object_List_Count(
     unsigned count = 1; /* at least 1 for device object */
 
     /* FIXME: add objects as needed */
-#if 0
-    count += Analog_Input_Count();
-    count += Binary_Input_Count();
-    count += Binary_Value_Count();
-#endif
     count += Analog_Value_Count();
+    count += Binary_Value_Count();
 
     return count;
 }
@@ -143,15 +134,14 @@ bool Device_Object_List_Identifier(
     /* 1 for the device object */
     object_count = 1;
     /* FIXME: add objects as needed */
-    /* analog input objects */
+    /* analog value objects */
-#if 0
     if (!status) {
         /* array index starts at 1, and 1 for the device object */
         object_index -= object_count;
-        object_count = Analog_Input_Count();
+        object_count = Analog_Value_Count();
         if (object_index < object_count) {
-            *object_type = OBJECT_ANALOG_INPUT;
+            *object_type = OBJECT_ANALOG_VALUE;
-            *instance = Analog_Input_Index_To_Instance(object_index);
+            *instance = Analog_Value_Index_To_Instance(object_index);
             status = true;
         }
     }
@@ -166,33 +156,6 @@ bool Device_Object_List_Identifier(
             status = true;
         }
     }
-#endif
-    /* analog value objects */
-    if (!status) {
-        /* array index starts at 1, and 1 for the device object */
-        object_index -= object_count;
-        object_count = Analog_Value_Count();
-        if (object_index < object_count) {
-            *object_type = OBJECT_ANALOG_VALUE;
-            *instance = Analog_Value_Index_To_Instance(object_index);
-            status = true;
-        }
-    }
-#if 0
-    /* binary input objects */
-    if (!status) {
-        /* normalize the index since
-           we know it is not the previous objects */
-        object_index -= object_count;
-        object_count = Binary_Input_Count();
-        /* is it a valid index for this object? */
-        if (object_index < object_count) {
-            *object_type = OBJECT_BINARY_INPUT;
-            *instance = Binary_Input_Index_To_Instance(object_index);
-            status = true;
-        }
-    }
-#endif
 
     return status;
 }
@@ -285,11 +248,7 @@ int Device_Encode_Property_APDU(
             /* FIXME: indicate the objects that YOU support */
             bitstring_set_bit(&bit_string, OBJECT_DEVICE, true);
             bitstring_set_bit(&bit_string, OBJECT_ANALOG_VALUE, true);
-#if 0
-            bitstring_set_bit(&bit_string, OBJECT_ANALOG_INPUT, true);
             bitstring_set_bit(&bit_string, OBJECT_BINARY_VALUE, true);
-            bitstring_set_bit(&bit_string, OBJECT_BINARY_INPUT, true);
-#endif
             apdu_len = encode_application_bitstring(&apdu[0], &bit_string);
             break;
         case PROP_OBJECT_LIST:

bacnet-stack/ports/atmega168/h_rp.c

@@ -39,11 +39,7 @@
 /* demo objects */
 #include "device.h"
 #include "av.h"
-#if 0
-#include "ai.h"
-#include "bi.h"
 #include "bv.h"
-#endif
 
 /* Encodes the property APDU and returns the length,
    or sets the error, and returns -1 */
@@ -73,6 +69,14 @@ int Encode_Property_APDU(
                     rp_data->array_index, error_class, error_code);
             }
             break;
+        case OBJECT_BINARY_VALUE:
+            if (Binary_Value_Valid_Instance(rp_data->object_instance)) {
+                apdu_len =
+                    Binary_Value_Encode_Property_APDU(&apdu[0],
+                    rp_data->object_instance, rp_data->object_property,
+                    rp_data->array_index, error_class, error_code);
+            }
+            break;
         default:
             *error_class = ERROR_CLASS_OBJECT;
             *error_code = ERROR_CODE_UNSUPPORTED_OBJECT_TYPE;

bacnet-stack/ports/atmega168/h_wp.c

@@ -39,11 +39,7 @@
 /* demo objects */
 #include "device.h"
 #include "av.h"
-#if 0
-#include "ai.h"
-#include "bi.h"
 #include "bv.h"
-#endif
 
 /* too big to reside on stack frame for PIC */
 static BACNET_WRITE_PROPERTY_DATA wp_data;
@@ -96,18 +92,8 @@ void handler_write_property(
                         error_code);
                 }
                 break;
-#if 0
+            case OBJECT_ANALOG_VALUE:
-            case OBJECT_ANALOG_INPUT:
+                if (Analog_Value_Write_Property(&wp_data, &error_class,
-            case OBJECT_BINARY_INPUT:
-                error_class = ERROR_CLASS_PROPERTY;
-                error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
-                len =
-                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
-                    error_class, error_code);
-                break;
-            case OBJECT_BINARY_VALUE:
-                if (Binary_Value_Write_Property(&wp_data, &error_class,
                         &error_code)) {
                     len =
                         encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
@@ -121,9 +107,8 @@ void handler_write_property(
                         error_code);
                 }
                 break;
-#endif
+            case OBJECT_BINARY_VALUE:
-            case OBJECT_ANALOG_VALUE:
+                if (Binary_Value_Write_Property(&wp_data, &error_class,
-                if (Analog_Value_Write_Property(&wp_data, &error_class,
                         &error_code)) {
                     len =
                         encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],

bacnet-stack/ports/atmega168/iar2gcc.h

@@ -38,6 +38,7 @@
 #define F_CPU (7372800)
 #endif
 
+/* IAR */
 #if defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ASM__)
 #include <inavr.h>
 #include <ioavr.h>
@@ -57,6 +58,7 @@ static inline void _delay_us(
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <util/delay.h>
+#include <avr/eeprom.h>
 
 typedef struct {
     unsigned char bit0:1;

bacnet-stack/ports/atmega168/main.c

@@ -35,12 +35,15 @@
 #include "device.h"
 #include "av.h"
 
+/* From the WhoIs hander - performed by the DLMSTP module */
+extern bool Send_I_Am;
+/* local version override */
 const char *BACnet_Version = "1.0";
 
 /* For porting to IAR, see:
    http://www.avrfreaks.net/wiki/index.php/Documentation:AVR_GCC/IarToAvrgcc*/
 
-/* dummy function */
+/* dummy function - so we can use default demo handlers */
 bool dcc_communication_enabled(
     void)
 {
@@ -130,6 +133,7 @@ static void input_switch_read(
             dlmstp_set_mac_address(Address_Switch);
 #endif
             Device_Set_Object_Instance_Number(86000 + Address_Switch);
+            Send_I_Am = true;
         }
     }
 }