dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged revision(s) 2731 from branches/releases/bacnet-stack-0-8-0:

Browse Source 
fixed BDK MAC to Device ID initialization
........
Merged revision(s) 2732 from branches/releases/bacnet-stack-0-8-0:
made function local
........
This commit is contained in:
skarg
2014-01-31 14:31:59 +00:00
parent f7724eea6a
commit 9553660732
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/bdk-atxx4-mstp/bacnet.c
+17 -10
View File
@@ -85,10 +85,24 @@ static bool seeprom_version_test(
return status; return status;
} }
static void device_id_init(uint8_t mac)
{
uint32_t device_id = 0;
/* Get the device ID from the eeprom */
eeprom_bytes_read(NV_EEPROM_DEVICE_0, (uint8_t *) & device_id,
sizeof(device_id));
if (device_id < BACNET_MAX_INSTANCE) {
Device_Set_Object_Instance_Number(device_id);
} else {
/* use the DIP switch address as the Device ID if unconfigured */
Device_Set_Object_Instance_Number(MSTP_MAC_Address);
}
}
void bacnet_init( void bacnet_init(
void) void)
{ {
uint32_t device_id = 0;
uint8_t max_master = 0; uint8_t max_master = 0;
MSTP_MAC_Address = input_address(); MSTP_MAC_Address = input_address();
@@ -105,15 +119,7 @@ void bacnet_init(
} }
/* initialize objects */ /* initialize objects */
Device_Init(NULL); Device_Init(NULL);
/* Get the device ID from the eeprom */ device_id_init(MSTP_MAC_Address);
eeprom_bytes_read(NV_EEPROM_DEVICE_0, (uint8_t *) & device_id,
sizeof(device_id));
if (device_id < BACNET_MAX_INSTANCE) {
Device_Set_Object_Instance_Number(device_id);
} else {
/* use the DIP switch address as the Device ID if unconfigured */
Device_Set_Object_Instance_Number(MSTP_MAC_Address);
}
/* set up our confirmed service unrecognized service handler - required! */ /* set up our confirmed service unrecognized service handler - required! */
apdu_set_unrecognized_service_handler_handler apdu_set_unrecognized_service_handler_handler
(handler_unrecognized_service); (handler_unrecognized_service);
@@ -158,6 +164,7 @@ void bacnet_task(
/* address changed! */ /* address changed! */
MSTP_MAC_Address = mstp_mac_address; MSTP_MAC_Address = mstp_mac_address;
dlmstp_set_mac_address(MSTP_MAC_Address); dlmstp_set_mac_address(MSTP_MAC_Address);
device_id_init(MSTP_MAC_Address);
Send_I_Am(&Handler_Transmit_Buffer[0]); Send_I_Am(&Handler_Transmit_Buffer[0]);
} }
/* handle the inputs */ /* handle the inputs */