feature/bat-45 #2

bgrindy · 2015-10-06T15:57:55Z

Please provide any feedback as I am just getting back into the C++ world and learning of C++11 features/paradigms

- add git submodule rapidjson, stub-in build section of readme

- move rapidjson submodule to thirdparty/ to avoid confusion with include/ - added thirdparty/build.sh as hack to setup dependencies before running autotools - updated gitignore to include outstation app - update gitignore to include outstation app - implemented JSONCommandHandler that currently only prints out JSON representation of DNP3 commands - added analog output test function in master demo and code-formatted Conflicts: Makefile.am thirdparty/rapidjson

- add eclipse cdt project and update git ignore with eclipse entries

- convert from demo outstation to new outstation app, add TODOs for implementation

- syntax highlight on readme build steps

- add TCP server implementation, still needs major work to integrate with JSONCommandHandler

- addded TCPSession.cpp changes, cleaning out debug info

- preparing for some pub/sub action, not currently stable at all

- update docs with ubuntu build setup

- half-baked threads, needs fixing

- add stop/start actions on app - pass asynchandler to json tcp server correctly

- AsyncCommand refers to pointers to allow multiple types being set (NULL otherwise) - AsyncCommandHandler queues commands using blocking queue w/ one subscriber supported - OutstationJSONTCPServer tracks multiple sessions and publishes AsyncCommands to all - JSONTCPSession writes AsyncCommands received to stdout, needs to write to socket_ - lock/thread/queue updated to C++11 std implementations

- update JSON processing to send size before json char array for supporting multiple objects on same session

- sending AsyncCommands to sockets is nearly complete, started working on receiving JSON commands and converting to MeasUpdate

- add logging messages to figure out deserialization protocol

- remove newline from ao16_test.bin - fix up char[] buffering logic for read() - NEEDS proper JSON->MeasUpdate parsing

- clean up read() and applyUpdate() - added better test file with multiple updates in same tcp buffer (also tested changing buffer lower than message size)

- add proper session tracking by determining if JSONTCPSocket is active

- update inline docs

- added outstation app tests - created git submodule for asio includes - created outstation app build directives for cmake - fixed up compiler warnings for outstation app - better pointer handling in outstation app -

- add gitignore for outstation app - fix master demo merge issue - clean up debugging code in asyncommand/handler

- remove old build hack - update README.md with build instructions

- add yaml-cpp submodule for config support

kenahoo · 2015-10-06T18:15:07Z

cpp/examples/master/main.cpp

@@ -34,8 +34,7 @@ using namespace asiopal;
 using namespace asiodnp3;
 using namespace opendnp3;

-int main(int argc, char* argv[])
-{
+int main(int argc, char* argv[]) {


There are a bunch of these code-style changes here, are they legit? Does the parent project have a style guide?

there is a code formatting command here, although it touches a bunch of files already in the repository too. I'll run it on the shared code so at least that part will be formatted correctly.
https://github.com/automatak/dnp3-guide/blob/master/mkdoc/docs/contributing/tasks.md

- astyle master main.cpp - first crack at yaml config for outstation app

- include yaml-cpp in cmake build and link test app

- add basic yaml test case

- add program_options for outstation app usage - first pass at yaml outstation config support, currently only used to determine number of analogs,counters, etc. - added local/remote outstation address yaml conf options

- add OutstationAppConfig class for managing yaml configuration (still needs some work) - prepare for multiple outstation support

- fix up sample with demostation id

- add AsyncCommandQueue that is used by all instances of AsyncCommandHandlers for sending commands to the OutstationJSONTCPServer (publish/subscribe), attempted boost:signals2 but ran into issues (turns out they were not related to signals2 - so it may be worth revisiting) - add AsyncCommand "id" support for handling multiple outstations

- add all known enum mappings the hard way

- shutdown DNP3Manager cleanly

Ben Grindy added 22 commits October 6, 2015 09:28

BAT-44

406fd5d

- add git submodule rapidjson, stub-in build section of readme

BAT-44

3179861

- add eclipse cdt project and update git ignore with eclipse entries

BAT-44

2943dad

- convert from demo outstation to new outstation app, add TODOs for implementation

BAT-44

2e01c48

- syntax highlight on readme build steps

BAT-44

e72b1cd

- add TCP server implementation, still needs major work to integrate with JSONCommandHandler

BAT-44

4edcaa8

- addded TCPSession.cpp changes, cleaning out debug info

BAT-44

d20775b

- preparing for some pub/sub action, not currently stable at all

BAT-44

04421d5

- update docs with ubuntu build setup

BAT-43

03b7b6f

- half-baked threads, needs fixing

BAT-43

d4ed9a2

- add stop/start actions on app - pass asynchandler to json tcp server correctly

BAT-44

50f3218

- update JSON processing to send size before json char array for supporting multiple objects on same session

BAT-44

b2e1e15

- sending AsyncCommands to sockets is nearly complete, started working on receiving JSON commands and converting to MeasUpdate

BAT-44

17c1cc5

- add logging messages to figure out deserialization protocol

BAT-44

604f81c

- remove newline from ao16_test.bin - fix up char[] buffering logic for read() - NEEDS proper JSON->MeasUpdate parsing

BAT-44

94d4106

- clean up read() and applyUpdate() - added better test file with multiple updates in same tcp buffer (also tested changing buffer lower than message size)

BAT-44

5c2facc

- add proper session tracking by determining if JSONTCPSocket is active

BAT-43

389bf60

- update inline docs

BAT-45

38b2737

- added outstation app tests - created git submodule for asio includes - created outstation app build directives for cmake - fixed up compiler warnings for outstation app - better pointer handling in outstation app -

BAT-45

e428126

- add gitignore for outstation app - fix master demo merge issue - clean up debugging code in asyncommand/handler

BAT-45

9e4f757

- remove old build hack - update README.md with build instructions

bgrindy assigned drarun Oct 6, 2015

BAT-45

9340f51

- add yaml-cpp submodule for config support

kenahoo reviewed Oct 6, 2015
View reviewed changes

Ben Grindy added 5 commits October 6, 2015 14:32

BAT-45

2e5fe6d

- astyle master main.cpp - first crack at yaml config for outstation app

BAT-45

348b943

- include yaml-cpp in cmake build and link test app

BAT-45

99157a6

- add basic yaml test case

BAT-45

87920eb

- add program_options for outstation app usage - first pass at yaml outstation config support, currently only used to determine number of analogs,counters, etc. - added local/remote outstation address yaml conf options

BAT-45

2a0bc10

- add OutstationAppConfig class for managing yaml configuration (still needs some work) - prepare for multiple outstation support

Ben Grindy added 4 commits October 12, 2015 14:46

BAT-45

e30f10a

- fix up sample with demostation id

BAT-45

b858a2c

- add all known enum mappings the hard way

BAT-67

381aab5

- shutdown DNP3Manager cleanly

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature/bat-45 #2

feature/bat-45 #2

bgrindy commented Oct 6, 2015

kenahoo Oct 6, 2015

bgrindy Oct 6, 2015

feature/bat-45 #2

Are you sure you want to change the base?

feature/bat-45 #2

Conversation

bgrindy commented Oct 6, 2015

kenahoo Oct 6, 2015

Choose a reason for hiding this comment

bgrindy Oct 6, 2015

Choose a reason for hiding this comment