skarg
2a0bf4926a
Performed standard indent script indent.sh on project files.
2010-12-15 19:02:40 +00:00
skarg
f820697464
Converted C++ comments to ifdef for testing.
2010-12-15 18:59:03 +00:00
skarg
8f1e8d82cd
Changed Object Table from a global to a local variable and added a Device function to initialize it.
2010-12-13 03:41:55 +00:00
skarg
20ca252a8d
Fixed compiler warning messages.
2010-12-12 05:42:42 +00:00
skarg
d5b8dee34e
Updated make to $(MAKE) as recommended best practice.
2010-12-12 05:42:13 +00:00
tbrennan3
2f424e038d
Touched up some of the Doxygen tags.
2010-12-03 07:25:34 +00:00
tbrennan3
b768518a9d
Now using Who-Is-Remote() to get the address binding if targeting a routed Device.
...
Eliminated empty braces for the Device object in its own list of objects.
2010-12-03 06:54:02 +00:00
tbrennan3
de4ead47c6
Improvements to bacepics for the routing case; can now specify a DNET on the command line.
...
Not all there yet, however, for the routed case.
Added null tests and dummy string defaults in Add_Routed_Device().
2010-12-02 22:05:59 +00:00
tbrennan3
31f440e070
Implemented separate Who-Is and Who-Has handlers for the routed case, where we loop through all the Devices looking for matches.
...
Tested and improved the routing code.
Gateway demo now sends I-Am as each Device is added.
Added test for valid Network number when routing, and only send Reject message if this fails (and not if we just can't find a Device match).
Test the hop_count and discard the packet if would reach 0 and a destination Network is called for.
2010-12-02 20:33:43 +00:00
skarg
e850469da8
Added character string helper to test for printable. Added to WP checks.
2010-12-02 19:33:22 +00:00
skarg
f26997a367
Changed make to $(MAKE). Not sure if this is still needed, since MSYS has make.exe (in lieu of MinGW). Lots of demo makefiles still have make in them...
2010-11-30 18:04:27 +00:00
skarg
a39bf392bd
Fixed Makefile for MinGW build. Testing with MinGW 20101030 and MSYS. gcc (GCC) 4.5.0 (MinGW), GNU Make 3.81 (MSYS).
2010-11-30 17:50:24 +00:00
skarg
01d1d5bd77
Changed %zu back to %d since Borland C++ doesn't understand %zu.
2010-11-30 06:08:48 +00:00
skarg
0e34c5ce5c
Moved ports back into root Makefile.
2010-11-29 04:18:53 +00:00
petermcs
072640f887
Added in call to trend_log_timer so Trendlogs are updated and changed stop time on initial setup of logs to the year 2020 instead of 2009 so they would accumulate some more records.
2010-11-26 13:16:55 +00:00
bacpack
47ecaeabaa
To build the Routing demo define BAC_ROUTING in the top Makefile. The value is not important - the symbol has to be defined.
2010-11-25 05:10:01 +00:00
bacpack
6a523e4d23
First attempt to clean-up Makefiles.
...
1. Top (main) makefile defines build configuration variables and export them for sub-makes to use. BAC_ROUTING is defined here - is has been removed from config.h.
2. A new makefile has been added in demo subdirectory. It builds the demo applications. NOTE: the 'ports' target is not build.
2010-11-25 04:17:58 +00:00
tbrennan3
a595bdb4b5
Resolved more code where we didn't need to define separate BAC_ROUTING functionality, since the npdu_encode_pdu() will do the right thing if our source address is for the gateway (root device), because src->net and/or src->len will be 0.
...
For the important Device_Object_Instance_Number(), will redirect to the Routed_Device_Object_Instance_Number() function if this is a routing build.
This leaves only the Who-Is and Who-Has handlers to be dealt with.
2010-11-24 22:04:02 +00:00
tbrennan3
22c14fccad
Followed Steve's good recommendation, and made routed_get_my_address() be a variant of datalink_get_my_address() just when routing is in use. Haven't done anything about the sending functions yet.
...
Renamed Lookup_Routed_Device_Address() as Routed_Device_Address_Lookup(), and replaced it in the routed npdu handler with a function that finds the "next" gateway or routed device, as per the destination address. (Less tied to the specifics of the gw_device.c implementation.)
Fixed a few build warnings (eg, %zu for size_t arguments).
Until we improve the makefile system, I've enabled BAC_ROUTING in config.h
2010-11-24 20:44:32 +00:00
bacpack
db5dea31e7
Compiler fails - missing declaration of Get_Routed_Device_Address().
2010-11-21 17:03:04 +00:00
petermcs
dbb8997b4d
Added routing support for virtual network to more of the handlers and fixed up a couple of typos from the previous changes.
...
Added ReadRange service handler so that trendlogs can be read.
2010-11-18 21:29:11 +00:00
petermcs
3bb228edf2
Added routing support for virtual network so that source addresses are transmitted when required and the correct object ID is used.
2010-11-17 23:16:24 +00:00
petermcs
a1eaffccff
Added Get_Routed_Device_Address function
2010-11-17 23:14:07 +00:00
petermcs
38d307d780
Added in the full set of objects.
...
Fixed up snprintf to work with MSVC.
Fixed virtual object address initialisation so network and address are initialised.
2010-11-17 23:05:54 +00:00
skarg
3d80d1a272
Corrected Multi-State Input and Output object Present_Value and number of states handling after being reminded at the BACnet Plugfest that "The Present_Value property shall always have a value greater than zero."
2010-11-17 08:13:33 +00:00
tbrennan3
6319e1a7d9
Good IDE tools can be sooo helpful.
2010-11-16 13:12:23 +00:00
bacpack
502cbcc2e6
1. In device.c, the Object_Table[] is now extern; it has to be defined by the user application (see demos); only the required BACnet objects have to be included.
...
2. Objects' .h files define macro to be used to initialize Object_Table[].
2010-11-13 19:57:29 +00:00
bacpack
d50eb7fef7
In bvlc.c, IP address and port number are always in the network byte order (including FD_Table[] and BBMD_Table[]).
...
The only left hton and ntoh functions are in debug_printf() and test functions.
2010-11-05 19:30:20 +00:00
bacpack
a639864cc8
In bip.c getter and setter functions of IP address and Port number expect and return values in the network byte order. All ntoh and hton were eliminated from bip.c.
...
All other modules changed to be consistent.
arm7 port left unchanged.
2010-11-04 13:30:26 +00:00
petermcs
d6cee12acb
added ms-input.c and trendlog.c to project file
2010-10-30 16:16:05 +00:00
skarg
2cac9ba528
Corrected printing of array properties.
2010-10-21 20:14:07 +00:00
tbrennan3
e77f12d261
Yes, these should be deleted now that the code is moved into the regular library area.
2010-10-21 18:19:58 +00:00
tbrennan3
a5f24fa19f
Tweaked the comments for better Doxygen output.
2010-10-13 19:00:57 +00:00
tbrennan3
48411b8dbf
Routing functionality complete, and working. (Have not done extensive testing, though.)
...
For building, made it possible to include or exclude the routing functionality with simple changes in the main Makefile and enables in lib/Makefile and include/config.h
The Device object (device.c and .h) was extended to support the virtually routed Devices, with most of the new functions in new file gw_device.c to replace their simpler cousins in device.c.
2010-10-13 15:59:39 +00:00
skarg
2c3e03256d
Added missing initialization for PFM count.
2010-10-13 00:06:07 +00:00
skarg
86dbaf409b
Added handling for bacapp decode value returning error codes.
2010-10-12 03:02:05 +00:00
skarg
e9249b5b5e
Added test for a decoding problem where the stack is unable to decode something, and retrofitted into WriteProperty for each of the demo objects by returning an Error, Out of Range.
2010-10-12 01:17:50 +00:00
tbrennan3
9058fc7f3a
Finished up the Network Layer Message handling (I hope).
...
Simplified the Router Table encoding (just based on DNETs).
2010-10-08 02:50:14 +00:00
tbrennan3
478d7aeb41
Working out the sending of Network Layer Messages; trying to refactor the actual sending routines to just one since the beginning, end, and error handling are the same for all types - just the payload is different.
...
For many, need to know what our managed downstream BACnet Network list is, so added that argument.
2010-10-07 21:00:46 +00:00
skarg
23eecbc100
Added more informative error message.
2010-10-06 18:49:52 +00:00
tbrennan3
cf0f01c5a1
Adding a gateway project to demonstrate routing to a virtual network.
...
The work is not complete yet; this is an interim checkin. Ultimately the device.c file will be merged with the regular one or the deltas will be separated into some other file.
2010-09-29 21:04:00 +00:00
tbrennan3
9f4b8e5f19
Adding a handler for routed NPDUs (ie, Network Layer Message handling).
...
The work is not complete yet; this is an interim checkin.
2010-09-29 20:52:51 +00:00
tbrennan3
d39d4fded3
More function documentation.
...
Defined a default Hop Count value, and used 15 instead of 255.
2010-09-29 20:29:12 +00:00
tbrennan3
e5f5dce995
Added some javadoc-type function comments.
...
Reduced the default hop count from way-big 255 to 15.
2010-09-28 21:05:38 +00:00
tbrennan3
44b7e02721
Tweaked the debug building and printing a little - I hope this works OK for everyone. Let me know if not.
...
Tamped down a few warnings.
For the demo/server Makefile, made an either/or choice between executable size optimization (normal) or gdb debug info and no optimization.
2010-09-27 20:27:29 +00:00
tbrennan3
5e5f38cb06
My gcc complained about a conflict with the function of the same name as the array, Binary_Output_Out_Of_Service. This fix lets it build.
2010-09-22 02:16:22 +00:00
skarg
9569f2c536
Fixed EOL and performed standard indentation.
2010-09-16 22:00:47 +00:00
skarg
c8f4aac1b7
Cleaning up some code to make it more robust.
2010-09-16 14:49:33 +00:00
skarg
5524cab7cd
Corrected MS/TP capture statistics after converversion of FSM.
2010-09-13 14:08:28 +00:00
skarg
bb0c98a9c1
added MS/TP state skip data to MS/TP capture tool, and removed Lurking.
2010-09-12 16:08:31 +00:00