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

Added CodeBlocks workspace and updated demo/epics to use the Required Properties list of the Device Object.

Browse Source
This commit is contained in:
skarg
2007-09-05 17:21:36 +00:00
parent 46ab0030c8
commit 8994735720
4 changed files with 415 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/BACnetDemo.workspace
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="Workspace">
<Project filename="epics\bacepics.cbp" active="1" />
<Project filename="..\lib\bacnet.cbp" />
<Project filename="server\bacserv.cbp" />
</Workspace>
</CodeBlocks_workspace_file>
bacnet-stack/demo/epics/bacepics.cbp
+55
View File
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="bacepics" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="bin\Debug\bacepics" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Debug\" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-g" />
</Compiler>
</Target>
<Target title="Release">
<Option output="bin\Release\bacepics" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Release\" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="-fexceptions" />
<Add option="-DBACDL_BIP" />
<Add option="-DPRINT_ENABLED=1" />
<Add directory="." />
<Add directory="..\.." />
<Add directory="..\handler" />
<Add directory="..\object" />
<Add directory="..\..\ports\win32" />
</Compiler>
<Linker>
<Add library="..\..\lib\libbacnet.a" />
<Add library="ws2_32" />
</Linker>
<Unit filename="main.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
<code_completion />
<envvars />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>
bacnet-stack/demo/epics/main.c
+20 -45
View File
@@ -220,50 +220,20 @@ static uint8_t Read_Properties(uint32_t device_instance)
{ {
uint8_t invoke_id = 0; uint8_t invoke_id = 0;
static unsigned index = 0; static unsigned index = 0;
/* list of required (and some optional) properties in the /* note: you could just loop through
Device Object
note: you could just loop through
all the properties in all the objects. */ all the properties in all the objects. */
const int object_props[] = { static const int *pRequired = NULL;
PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, if (!pRequired) {
PROP_OBJECT_TYPE, Device_Property_Lists(&pRequired, NULL, NULL);
PROP_SYSTEM_STATUS, }
PROP_VENDOR_NAME,
PROP_VENDOR_IDENTIFIER, if (pRequired[index] != -1) {
PROP_MODEL_NAME, printf(" %s: ",bactext_property_name(pRequired[index]));
PROP_FIRMWARE_REVISION,
PROP_APPLICATION_SOFTWARE_VERSION,
PROP_PROTOCOL_VERSION,
PROP_PROTOCOL_CONFORMANCE_CLASS,
PROP_PROTOCOL_SERVICES_SUPPORTED,
PROP_PROTOCOL_OBJECT_TYPES_SUPPORTED,
PROP_MAX_APDU_LENGTH_ACCEPTED,
PROP_SEGMENTATION_SUPPORTED,
PROP_LOCAL_TIME,
PROP_LOCAL_DATE,
PROP_UTC_OFFSET,
PROP_DAYLIGHT_SAVINGS_STATUS,
PROP_APDU_SEGMENT_TIMEOUT,
PROP_APDU_TIMEOUT,
PROP_NUMBER_OF_APDU_RETRIES,
PROP_TIME_SYNCHRONIZATION_RECIPIENTS,
PROP_MAX_MASTER,
PROP_MAX_INFO_FRAMES,
PROP_DEVICE_ADDRESS_BINDING,
/* note: PROP_OBJECT_LIST is missing cause
we need to get it with an index method since
the list could be very large */
/* end of list */
-1
};
if (object_props[index] != -1) {
printf(" %s: ",bactext_property_name(object_props[index]));
invoke_id = Send_Read_Property_Request(device_instance, invoke_id = Send_Read_Property_Request(device_instance,
OBJECT_DEVICE, OBJECT_DEVICE,
device_instance, device_instance,
object_props[index], pRequired[index],
BACNET_ARRAY_ALL); BACNET_ARRAY_ALL);
if (invoke_id) { if (invoke_id) {
index++; index++;
@@ -287,7 +257,7 @@ int main(int argc, char *argv[])
bool found = false; bool found = false;
/* FIXME: handle multi homed systems - use an argument passed to the datalink_init() */ /* FIXME: handle multi homed systems - use an argument passed to the datalink_init() */
/* print help if not enough arguments */ /* print help if not enough arguments */
if (argc < 2) { if (argc < 2) {
printf printf
@@ -330,22 +300,27 @@ int main(int argc, char *argv[])
npdu_handler(&src, &Rx_Buf[0], pdu_len); npdu_handler(&src, &Rx_Buf[0], pdu_len);
} }
/* at least one second has passed */ /* at least one second has passed */
if (current_seconds != last_seconds) if (current_seconds != last_seconds) {
tsm_timer_milliseconds(((current_seconds - tsm_timer_milliseconds(((current_seconds -
last_seconds) * 1000)); last_seconds) * 1000));
}
/* wait until the device is bound, or timeout and quit */ /* wait until the device is bound, or timeout and quit */
found = address_bind_request(Target_Device_Object_Instance, found = address_bind_request(Target_Device_Object_Instance,
&max_apdu, &Target_Address); &max_apdu, &Target_Address);
if (found) { if (found) {
/* invoke ID is set to zero when it is not in use */
if (invoke_id == 0) { if (invoke_id == 0) {
invoke_id = Read_Properties(Target_Device_Object_Instance); invoke_id = Read_Properties(Target_Device_Object_Instance);
if (invoke_id == 0) { if (invoke_id == 0) {
break; break;
} }
} else if ((Read_Property_Data.new_data) && } else if ((Read_Property_Data.new_data) &&
(invoke_id == Read_Property_Data.service_data.invoke_id)) { (invoke_id == Read_Property_Data.service_data.invoke_id)) {
Read_Property_Data.new_data = false; Read_Property_Data.new_data = false;
PrintReadPropertyData(&Read_Property_Data.data); PrintReadPropertyData(&Read_Property_Data.data);
if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0;
}
} else if (tsm_invoke_id_free(invoke_id)) { } else if (tsm_invoke_id_free(invoke_id)) {
invoke_id = 0; invoke_id = 0;
} }
@@ -355,7 +330,7 @@ int main(int argc, char *argv[])
invoke_id = 0; invoke_id = 0;
} else if (Error_Detected) { } else if (Error_Detected) {
invoke_id = 0; invoke_id = 0;
} }
} else { } else {
/* increment timer - exit if timed out */ /* increment timer - exit if timed out */
elapsed_seconds += (current_seconds - last_seconds); elapsed_seconds += (current_seconds - last_seconds);
bacnet-stack/lib/bacnet.cbp
+332
View File
@@ -0,0 +1,332 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="bacnet" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="libbacnet" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="obj\Debug\" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-g" />
</Compiler>
</Target>
<Target title="Release">
<Option output="libbacnet" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="obj\Release\" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-O2" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="-DBACDL_BIP" />
<Add option="-DPRINT_ENABLED=1" />
<Add directory=".." />
<Add directory="..\demo\handler" />
<Add directory="..\demo\object" />
<Add directory="..\ports\win32" />
</Compiler>
<Linker>
<Add library="ws2_32" />
</Linker>
<Unit filename="..\abort.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\abort.h" />
<Unit filename="..\address.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\address.h" />
<Unit filename="..\apdu.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\apdu.h" />
<Unit filename="..\arf.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\arf.h" />
<Unit filename="..\awf.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\awf.h" />
<Unit filename="..\bacaddr.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bacaddr.h" />
<Unit filename="..\bacapp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bacapp.h" />
<Unit filename="..\bacdcode.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bacdcode.h" />
<Unit filename="..\bacdef.h" />
<Unit filename="..\bacenum.h" />
<Unit filename="..\bacerror.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bacerror.h" />
<Unit filename="..\bacint.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bacint.h" />
<Unit filename="..\bacprop.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bacprop.h" />
<Unit filename="..\bacstr.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bacstr.h" />
<Unit filename="..\bactext.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bactext.h" />
<Unit filename="..\bip.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\bip.h" />
<Unit filename="..\bits.h" />
<Unit filename="..\config.h" />
<Unit filename="..\cov.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\cov.h" />
<Unit filename="..\crc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\crc.h" />
<Unit filename="..\datalink.h" />
<Unit filename="..\datetime.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\datetime.h" />
<Unit filename="..\dcc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\dcc.h" />
<Unit filename="..\demo\handler\client.h" />
<Unit filename="..\demo\handler\h_arf.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_arf_a.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_awf.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_cov.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_dcc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_iam.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_ihave.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_rd.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_rp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_rp_a.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_rpm.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_ts.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_whohas.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_whois.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_wp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\handlers.h" />
<Unit filename="..\demo\handler\noserv.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_arfs.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_awfs.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_dcc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_ihave.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_rd.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_rp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_ts.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_whohas.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_whois.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_wp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\txbuf.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\ai.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\ai.h" />
<Unit filename="..\demo\object\ao.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\ao.h" />
<Unit filename="..\demo\object\av.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\av.h" />
<Unit filename="..\demo\object\bacfile.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\bacfile.h" />
<Unit filename="..\demo\object\bi.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\bi.h" />
<Unit filename="..\demo\object\bo.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\bo.h" />
<Unit filename="..\demo\object\bv.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\bv.h" />
<Unit filename="..\demo\object\device.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\device.h" />
<Unit filename="..\demo\object\lc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\lc.h" />
<Unit filename="..\demo\object\lsp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\lsp.h" />
<Unit filename="..\demo\object\mso.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\object\mso.h" />
<Unit filename="..\dlmstp.h" />
<Unit filename="..\ethernet.h" />
<Unit filename="..\filename.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\filename.h" />
<Unit filename="..\iam.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\iam.h" />
<Unit filename="..\ihave.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\ihave.h" />
<Unit filename="..\indtext.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\indtext.h" />
<Unit filename="main.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\mstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\mstp.h" />
<Unit filename="..\npdu.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\npdu.h" />
<Unit filename="..\ports\win32\bip-init.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\ports\win32\dlmstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\rd.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\rd.h" />
<Unit filename="..\reject.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\reject.h" />
<Unit filename="..\rp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\rp.h" />
<Unit filename="..\rpm.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\rpm.h" />
<Unit filename="..\timesync.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\timesync.h" />
<Unit filename="..\tsm.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\tsm.h" />
<Unit filename="..\version.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\version.h" />
<Unit filename="..\whohas.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\whohas.h" />
<Unit filename="..\whois.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\whois.h" />
<Unit filename="..\wp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\wp.h" />
<Extensions>
<code_completion />
<envvars />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>