From 814eea5fd9d4c3b4bce36b8fba4d18dc95e1991e Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Wed, 24 Sep 2025 11:01:49 -0500
Subject: [PATCH] Fixed compile errors in basic/server/device when
 BACAPP_TIMESTAMP or Channel object are not enabled. (#1109)

---
 src/bacnet/basic/server/bacnet_device.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/bacnet/basic/server/bacnet_device.c b/src/bacnet/basic/server/bacnet_device.c
index 369ebd88..a5e2f72e 100644
--- a/src/bacnet/basic/server/bacnet_device.c
+++ b/src/bacnet/basic/server/bacnet_device.c
@@ -2300,8 +2300,10 @@ bool Device_Write_Property_Local(BACNET_WRITE_PROPERTY_DATA *wp_data)
             status = write_property_type_valid(
                 wp_data, &value, BACNET_APPLICATION_TAG_TIMESTAMP);
             if (status) {
+#if defined(BACAPP_TIMESTAMP)
                 bacapp_timestamp_copy(
                     &Time_Of_Device_Restart, &value.type.Time_Stamp);
+#endif
             }
             break;
         default:
@@ -2762,8 +2764,10 @@ void Device_Init(object_functions_t *object_table)
     }
     characterstring_init_ansi(&My_Object_Name, Device_Name_Default);
 #if (BACNET_PROTOCOL_REVISION >= 14)
+#ifdef CONFIG_BACNET_BASIC_OBJECT_CHANNEL
     Channel_Write_Property_Internal_Callback_Set(Device_Write_Property);
 #endif
+#endif
 }
 
 bool DeviceGetRRInfo(