Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
d2d7bcc
add s7comm
Jun 11, 2024
6db2f35
added more comments
Jun 11, 2024
38420db
Client sets connection type now
htoohey22 Jun 20, 2024
e6164bc
git and set client connection parameters from XML
Jun 20, 2024
43d9723
finish client admin functions (in theory)
Jun 20, 2024
5730b58
Imported Snap7 library
Jun 20, 2024
2c3842a
Snap7 library imported
Jun 20, 2024
d841750
create loops that will check inputs and outputs of clients/servers
Jun 21, 2024
b5c3406
comments
Jun 21, 2024
fc0b542
Implement listener class based on dnp3 but without mutex locking base…
Jun 24, 2024
fac4cde
Prepare to implement handlers for subscribing
Jun 24, 2024
c2ef559
Replaced references to dnp3 with s7 counterparts
Jun 25, 2024
0d1da4d
create update handler
Jun 25, 2024
d266b0e
add server input tags to sub's updateHandler
Jun 25, 2024
7a29513
replace updateHandler code with statusHandler code
Jun 25, 2024
48013e5
implement all server handlers
Jun 25, 2024
2a8fa9f
add client handlers (incomplete)
Jun 25, 2024
0963070
finish implementing (untested) subscription handler logic
Jun 25, 2024
5d4358a
fix typos related to handlers
Jun 25, 2024
2503b54
add value and ts to output
Jun 25, 2024
5de5040
edit cmake files to include Snap7 and ot-stim-s7comm-module
Jun 25, 2024
8fea373
Move all of snap7 into one folder, also run cmake and make in root
htoohey22 Jun 25, 2024
6f60894
replace all mentions of 'byte' with 'std::byte
htoohey22 Jun 25, 2024
eebf288
bug: include library for condition_variable
htoohey22 Jun 25, 2024
095d158
bug: pusher pointer error
htoohey22 Jun 25, 2024
f17602b
created snap7 cmake list, editted s7comm_module cmake list
htoohey22 Jun 26, 2024
b0a0bda
restore snap7 library to original, unaltered version
htoohey22 Jun 26, 2024
44b1b93
reorganize snap7 library
htoohey22 Jun 26, 2024
1bc8d40
fixed bugs: imported namespace, wununsed variable, fixed boost unreco…
htoohey22 Jun 27, 2024
91c9ae4
fix bugs: mismatched types (incorrect XML defaults)
htoohey22 Jun 27, 2024
f26104e
cmake updates
htoohey22 Jun 28, 2024
1ec3917
use shared lib and existing c++ wrappers
activeshadow Jul 1, 2024
a946345
update devcontainer dockerfile to compile and install snap7 shared lib
activeshadow Jul 1, 2024
c022846
merge ex-brichard/s7comm-integration branch
htoohey22 Jul 2, 2024
6f0cad4
made client connect AFTER looping through inputs and outputs
htoohey22 Jul 2, 2024
ef95b72
create s7 folder, cmake file, and start creating server.hpp and serve…
htoohey22 Jul 5, 2024
d3dbbd8
remove dnp3 functions from s7::server.hpp, start implementing s7::ser…
htoohey22 Jul 5, 2024
a612519
create s7 common file, finish coding server.hpp (for now)
htoohey22 Jul 8, 2024
43cf199
write constructor for server.cpp and fix namespace issue in server.hpp
htoohey22 Jul 8, 2024
f973c4f
write add analog/binary input/ouput code in server.cpp
htoohey22 Jul 8, 2024
a9ad63f
server.cpp functions: reset outputs, get outputs, handleMsgBusStatus
htoohey22 Jul 8, 2024
152a188
begin to implement additional files in s7commmodule main file
htoohey22 Jul 8, 2024
053fe8e
client.hpp buildConfig, add binary/analog tags, get tags, begin writi…
htoohey22 Jul 9, 2024
ee36537
finish HandleMsgBusUpdate function
htoohey22 Jul 9, 2024
51bf76b
add comments
htoohey22 Jul 9, 2024
fd46cda
Fix formatting, add comments, add
htoohey22 Jul 9, 2024
adcdc93
comment client.cpp and client.hpp, begin coding XML DB loop in main.c…
htoohey22 Jul 10, 2024
d29f976
fix errors with xml scanning and comment out broken/ unfinished code …
htoohey22 Jul 10, 2024
9fd5296
link against correct library for S7 module executable
activeshadow Jul 10, 2024
8e8596e
comments, bug fixes
htoohey22 Jul 11, 2024
6386f98
link ot-sim-s7comm-module main.cpp server binary inputs (only) with …
htoohey22 Jul 11, 2024
67aa41d
remove old commented-out code, link ot-sim-s7comm-module main.cpp ser…
htoohey22 Jul 11, 2024
91f86ea
write s7::server run() function, call s7::server run from otsim-s7com…
htoohey22 Jul 11, 2024
fb04ac1
allow for s7 inputs to be either binary or analog
htoohey22 Jul 11, 2024
2b5d3cf
Add binary/analog outputs for s7 servers
htoohey22 Jul 11, 2024
2d2b20a
allow s7comm clients to have binary or analog inputs and outputs
htoohey22 Jul 11, 2024
d3e3b10
Converted client point in otsim-s7comm-module to otsim::s7 point, rea…
htoohey22 Jul 11, 2024
f3851c9
add client handler
htoohey22 Jul 11, 2024
93882f8
client input code
htoohey22 Jul 11, 2024
d744afc
finish client tag analog and binary input output functionality, attem…
htoohey22 Jul 11, 2024
673d5d3
add comments about input/output reading
htoohey22 Jul 11, 2024
2e62e8f
add comments explaining s7 folder implementation and add TODO's
htoohey22 Jul 12, 2024
9192450
alter client functions, prepare for snap7 wrapping, add comments
htoohey22 Jul 12, 2024
61815bd
morning push
htoohey22 Jul 15, 2024
76be030
fix header declaration issue
htoohey22 Jul 15, 2024
9d2147b
actually implement S7 Client constructor function definition
activeshadow Jul 15, 2024
b62105a
formatting
htoohey22 Jul 15, 2024
65f09c5
slight format commenting and format changes
htoohey22 Jul 15, 2024
ab31b18
start writing procfiles and XML
htoohey22 Jul 16, 2024
05c333d
device.xml change
htoohey22 Jul 16, 2024
484ee66
install snap7 lib into docker image
activeshadow Jul 29, 2024
e80709d
cleanup build artifacts that got committed to git history
activeshadow Jul 29, 2024
54e85d2
create device2xml, called in Procfile.single, debugging
htoohey22 Jul 30, 2024
bfb4dfb
update xml and minor changes
htoohey22 Jul 30, 2024
b135bb8
xml correction
htoohey22 Jul 30, 2024
304c274
XML re-ordering
htoohey22 Jul 30, 2024
1d3ef8a
initialize pusher and config
htoohey22 Jul 31, 2024
15d0e1f
restore XML
htoohey22 Jul 31, 2024
638ce20
add threading/mutexes to server logic, actually start the server, fix…
htoohey22 Aug 1, 2024
e8e67f0
fix s7 server subscriber
htoohey22 Aug 9, 2024
145648d
create new XML to test s7 client and dnp3 client, debugging
htoohey22 Aug 12, 2024
90e2a5d
Debugging, experimenting with listener
htoohey22 Aug 13, 2024
b76cd35
temporarily commented out node-red, it was causing docker to fail to …
htoohey22 Aug 13, 2024
9984eb9
xml changes, slight debugging attempts
htoohey22 Aug 14, 2024
efe45c5
remove auto-generated extensions in workspace file
htoohey22 Aug 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ENV TZ=America/Denver
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN apt update && apt install -y \
bash-completion build-essential cmake curl git git-lfs mbpoll sudo tmux tree vim wget xz-utils \
7zip bash-completion build-essential cmake curl git git-lfs mbpoll sudo tmux tree vim wget xz-utils \
cmake libboost-dev libczmq-dev libxml2-dev libzmq3-dev pkg-config python3-dev python3-pip

ARG USERNAME=vscode
Expand Down Expand Up @@ -68,4 +68,8 @@ RUN /root/install-node-red.sh \
ADD ./src/js/node-red /root/.node-red/nodes/ot-sim
RUN cd /root/.node-red/nodes/ot-sim && npm install

RUN wget -O snap7.7z https://versaweb.dl.sourceforge.net/project/snap7/1.4.2/snap7-full-1.4.2.7z \
&& 7zz -o/tmp x snap7.7z && rm snap7.7z \
&& make -C /tmp/snap7-full-1.4.2/build/unix -f x86_64_linux.mk install LibInstall=/usr/local/lib

RUN python3 -m pip install --break-system-packages opendssdirect.py~=0.8.4
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
bin
build

*.cmake
CMakeFiles

__pycache__
Loading