forked from dnp3/opendnp3
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feature/bat-45 #2
Open
bgrindy
wants to merge
32
commits into
develop
Choose a base branch
from
feature/BAT-45
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 23 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
406fd5d
BAT-44
0b53268
BAT-44
3179861
BAT-44
2943dad
BAT-44
2e01c48
BAT-44
e72b1cd
BAT-44
4edcaa8
BAT-44
d20775b
BAT-44
04421d5
BAT-44
03b7b6f
BAT-43
d4ed9a2
BAT-43
d92f96f
BAT-44
50f3218
BAT-44
b2e1e15
BAT-44
17c1cc5
BAT-44
604f81c
BAT-44
94d4106
BAT-44
5c2facc
BAT-44
389bf60
BAT-43
38b2737
BAT-45
e428126
BAT-45
9e4f757
BAT-45
9340f51
BAT-45
2e5fe6d
BAT-45
348b943
BAT-45
99157a6
BAT-45
87920eb
BAT-45
2a0bc10
BAT-45
e30f10a
BAT-45
40c8bc1
BAT-45
b858a2c
BAT-45
381aab5
BAT-67
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[submodule "thirdparty/asio"] | ||
path = thirdparty/asio | ||
url = ../asio/ | ||
branch = develop | ||
[submodule "thirdparty/rapidjson"] | ||
path = thirdparty/rapidjson | ||
url = ../rapidjson | ||
branch = develop | ||
[submodule "thirdparty/yaml-cpp"] | ||
path = thirdparty/yaml-cpp | ||
url = ../yaml-cpp | ||
branch = develop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<projectDescription> | ||
<name>dnp3</name> | ||
<comment></comment> | ||
<projects> | ||
</projects> | ||
<buildSpec> | ||
<buildCommand> | ||
<name>org.eclipse.cdt.autotools.core.genmakebuilderV2</name> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> | ||
<triggers>clean,full,incremental,</triggers> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
<buildCommand> | ||
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> | ||
<triggers>full,incremental,</triggers> | ||
<arguments> | ||
</arguments> | ||
</buildCommand> | ||
</buildSpec> | ||
<natures> | ||
<nature>org.eclipse.cdt.core.cnature</nature> | ||
<nature>org.eclipse.cdt.core.ccnature</nature> | ||
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> | ||
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> | ||
<nature>org.eclipse.cdt.autotools.core.autotoolsNatureV2</nature> | ||
</natures> | ||
</projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/** | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
using namespace opendnp3; | ||
|
||
class AsyncCommand { | ||
public: | ||
AsyncCommand(const ControlRelayOutputBlock* crob, uint16_t idx) : | ||
idx_(idx), crob_(crob), aoInt16_(), aoInt32_(), aoFloat32_(), aoDouble64_() { | ||
} | ||
AsyncCommand(const AnalogOutputInt16* aoInt16, uint16_t idx) : | ||
idx_(idx), crob_(), aoInt16_(aoInt16), aoInt32_(), aoFloat32_(), aoDouble64_() { | ||
} | ||
AsyncCommand(const AnalogOutputInt32* aoInt32, uint16_t idx) : | ||
idx_(idx), crob_(), aoInt16_(), aoInt32_(aoInt32), aoFloat32_(), aoDouble64_() { | ||
} | ||
AsyncCommand(const AnalogOutputFloat32* aoFloat32, uint16_t idx) : | ||
idx_(idx), crob_(), aoInt16_(), aoInt32_(), aoFloat32_(aoFloat32), aoDouble64_() { | ||
} | ||
AsyncCommand(const AnalogOutputDouble64* aoDouble64, uint16_t idx) : | ||
idx_(idx), crob_(), aoInt16_(), aoInt32_(), aoFloat32_(), aoDouble64_(aoDouble64) { | ||
} | ||
|
||
uint16_t Idx() { | ||
return idx_; | ||
} | ||
const ControlRelayOutputBlock* CROB() { | ||
return crob_; | ||
} | ||
const AnalogOutputInt16* AOInt16() { | ||
return aoInt16_; | ||
} | ||
const AnalogOutputInt32* AOInt32() { | ||
return aoInt32_; | ||
} | ||
const AnalogOutputFloat32* AOFloat32() { | ||
return aoFloat32_; | ||
} | ||
const AnalogOutputDouble64* AODouble64() { | ||
return aoDouble64_; | ||
} | ||
|
||
private: | ||
uint16_t idx_; | ||
const ControlRelayOutputBlock* crob_; | ||
const AnalogOutputInt16* aoInt16_; | ||
const AnalogOutputInt32* aoInt32_; | ||
const AnalogOutputFloat32* aoFloat32_; | ||
const AnalogOutputDouble64* aoDouble64_; | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are a bunch of these code-style changes here, are they legit? Does the parent project have a style guide?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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