Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
Smart Grid Modell
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Armin Co
Smart Grid Modell
Commits
e61f31fe
Commit
e61f31fe
authored
4 years ago
by
Armin Co
Browse files
Options
Downloads
Patches
Plain Diff
removed spdlog
parent
304cc4bc
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/apps/smart_grid/SmartOpcServer.cpp
+2
-2
2 additions, 2 deletions
src/apps/smart_grid/SmartOpcServer.cpp
src/apps/smart_grid/smg_server.cpp
+7
-4
7 additions, 4 deletions
src/apps/smart_grid/smg_server.cpp
with
9 additions
and
6 deletions
src/apps/smart_grid/SmartOpcServer.cpp
+
2
−
2
View file @
e61f31fe
...
@@ -53,8 +53,8 @@ private:
...
@@ -53,8 +53,8 @@ private:
SmartOpcServer
::
SmartOpcServer
(
SmgStateMachine
&
state_machine
)
SmartOpcServer
::
SmartOpcServer
(
SmgStateMachine
&
state_machine
)
:
m_state_machine
{
state_machine
}
:
m_state_machine
{
state_machine
}
{
{
m_logger
=
spdlog
::
stderr_color_mt
(
"server"
);
//
m_logger = spdlog::stderr_color_mt("server");
m_server
=
UaServer
(
m_logger
);
m_server
=
UaServer
();
m_server
.
SetEndpoint
(
k_opc_server_url
);
m_server
.
SetEndpoint
(
k_opc_server_url
);
m_server
.
SetServerURI
(
"Smart Grid OPC UA server"
);
m_server
.
SetServerURI
(
"Smart Grid OPC UA server"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/apps/smart_grid/smg_server.cpp
+
7
−
4
View file @
e61f31fe
/// @file main.cpp
/// @file main.cpp
///
///
#include
<thread>
#include
<thread>
#include
<iostream>
#include
"i2c/Node.hpp"
#include
"i2c/Node.hpp"
#include
"HardwareControl.hpp"
#include
"HardwareControl.hpp"
...
@@ -35,13 +36,15 @@ int main(int argc, char **argv)
...
@@ -35,13 +36,15 @@ int main(int argc, char **argv)
{
{
exit
(
1
);
exit
(
1
);
}
}
std
::
cout
<<
"At least hardware works!"
<<
std
::
endl
;
HardwareControl
hardware
{
i2c_channel
};
HardwareControl
hardware
{
i2c_channel
};
//
SmartGridModel model{hardware};
SmartGridModel
model
{
hardware
};
//
SmgStateMachine stateMachine{model};
SmgStateMachine
stateMachine
{
model
};
// SmartOpcServer server{stateMachine};
// server.run_server();
SmartOpcServer
server
{
stateMachine
};
server
.
run_server
();
// spdlog::info("End");
// spdlog::info("End");
return
0
;
return
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment