Skip to content

adding connection_status #14

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.

Sign up for GitHub

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

Merged
philbucher merged 2 commits into from
May 8, 2020
Merged

adding connection_status #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dd04d5
adding connection_status
philbucher May 8, 2020
54e9632
changing to int
philbucher May 8, 2020
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
8 changes: 3 additions & 5 deletions co_sim_io/impl/co_sim_io_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,18 @@ inline ReturnInfo Connect(const std::string& rConnectionName, CoSimIO::SettingsT

inline ReturnInfo Connect(const std::string& rConnectionName, const std::string& rSettingsFileName)
{
Connect(rConnectionName, Internals::ReadSettingsFile(rSettingsFileName)); // forward call to funciton above

return ReturnInfo(); // TODO use this
return Connect(rConnectionName, Internals::ReadSettingsFile(rSettingsFileName)); // forward call to funciton above
}

inline ReturnInfo Disconnect(const std::string& rConnectionName)
{
using namespace Internals;
CO_SIM_IO_ERROR_IF_NOT(HasIO(rConnectionName)) << "Trying to disconnect connection \"" << rConnectionName << "\" which does not exist!" << std::endl;

auto info = GetConnection(rConnectionName).Disconnect();
auto ret_info = GetConnection(rConnectionName).Disconnect();
s_co_sim_connections.erase(rConnectionName);

return ReturnInfo(); // TODO use this
return ret_info;
}

// Version for C++, there this input is a std::vector, which we have to wrap before passing it on
Expand Down
12 changes: 8 additions & 4 deletions co_sim_io/impl/connection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,18 @@ class Connection

ReturnInfo Connect()
{
mpComm->Connect();
return ReturnInfo(); // TODO use this, should put a return code based on the bool that comes back from mpComm->Connect()
const bool is_connected = mpComm->Connect();
ReturnInfo ret_info;
ret_info.Set<int>("connection_status", is_connected);
return ret_info;
}

ReturnInfo Disconnect()
{
mpComm->Disconnect();
return ReturnInfo(); // TODO use this
const bool is_disconnected = mpComm->Disconnect();
ReturnInfo ret_info;
ret_info.Set<int>("connection_status", is_disconnected!=true);
return ret_info;
}

ReturnInfo SendControlSignal(const std::string& rIdentifier, const CoSimIO::ControlSignal Signal)
Expand Down