Skip to content

Commit

Permalink
Merge pull request edimetia3d#4 from gc87/opcclient-dll
Browse files Browse the repository at this point in the history 
feat: sync read and write completed
  • Loading branch information
@gc87
gc87 authored Aug 3, 2022
2 parents bae634e + 8d55604 commit 90b8ac6
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 24 deletions.
110 changes: 89 additions & 21 deletions OPCClientDLL/opc_client_interface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
#include <algorithm>
#include <iostream>
#include <limits.h>
#include <mutex>
#include <sys\timeb.h>
#include <thread>
#include <utility>

#include "OPCClient.h"
Expand All @@ -16,8 +18,8 @@

using namespace std;

using Items = map<wstring, COPCItem *>;
using GroupTuple = tuple<COPCGroup *, Items>;
using Items = vector<COPCItem *>;
using GroupTuple = tuple<COPCGroup *, Items, ReadCallback>;

class OPCClient : public OPCClientInterface
{
Expand All @@ -27,9 +29,11 @@ class OPCClient : public OPCClientInterface
bool Connect(wstring &host_name, wstring &server_name) override;
ServerNames GetServers(wstring &host_name) override;
ServerItems GetItems() override;
void AddGroup(wstring &group_name) override;
void AddGroup(wstring &group_name, ReadCallback callback) override;
void AddItem(wstring &group_name, wstring &item_name) override;
string GetItemType(wstring &item_name) override;
VARENUM GetItemType(wstring &item_name) override;
void ReadSync(wstring &group_name) override;
bool WriteSync(wstring &item_name, VARIANT &var) override;

private:
wstring host_name_;
Expand Down Expand Up @@ -82,8 +86,8 @@ bool OPCClient::Connect(wstring &host_name, wstring &server_name)
for (int i = 0; i < 10; i++)
{
server_->getStatus(status);
wcout << "server state is " << server_state_msg[status.dwServerState] << ", vendor is "
<< status.vendorInfo.c_str() << endl;
// wcout << "server state is " << server_state_msg[status.dwServerState] << ", vendor is "
// << status.vendorInfo.c_str() << endl;

if (status.dwServerState == OPC_STATUS_RUNNING)
{
Expand All @@ -110,10 +114,9 @@ bool OPCClient::Connect(wstring &host_name, wstring &server_name)
ServerNames OPCClient::GetServers(wstring &host_name)
{
COPCHost *host = COPCClient::makeHost(host_name);
ServerNames servers;
vector<CLSID> local_class_ids;
ServerNames local_servers;
host->getListOfDAServers(IID_CATID_OPCDAServer20, local_servers, local_class_ids);
ServerNames servers;
host->getListOfDAServers(IID_CATID_OPCDAServer20, servers, local_class_ids);
delete host;
return servers;
}
Expand All @@ -125,7 +128,7 @@ ServerItems OPCClient::GetItems()
return items;
}

void OPCClient::AddGroup(wstring &group_name)
void OPCClient::AddGroup(wstring &group_name, ReadCallback callback)
{
if (groups_.end() != groups_.find(group_name))
{
Expand All @@ -134,7 +137,7 @@ void OPCClient::AddGroup(wstring &group_name)

unsigned long refresh_rate;
COPCGroup *group = server_->makeGroup(group_name, true, 1000, refresh_rate, 0.0);
GroupTuple group_tuple = make_tuple(group, Items{});
GroupTuple group_tuple = make_tuple(group, Items{}, callback);
groups_[group_name] = group_tuple;
}

Expand All @@ -148,33 +151,98 @@ void OPCClient::AddItem(wstring &group_name, wstring &item_name)
auto &group_tuple = groups_[group_name];
auto &items = get<1>(group_tuple);

if (items.end() != items.find(item_name))
auto it = find_if(items.begin(), items.end(), [item_name](COPCItem *item) { return item->getName() == item_name; });

if (items.end() != it)
{
return;
}

COPCItem *item = get<0>(group_tuple)->addItem(item_name, true);
items[item_name] = item;
items.push_back(item);
}

string OPCClient::GetItemType(wstring &item_name)
VARENUM OPCClient::GetItemType(wstring &item_name)
{
for_each(groups_.begin(), groups_.end(), [item_name](auto &group_kv) {
VARENUM type = VT_NULL;
for_each(groups_.begin(), groups_.end(), [item_name, &type](auto &group_kv) {
GroupTuple &group_tuple = group_kv.second;
Items &items = get<1>(group_tuple);
if (items.end() == items.find(item_name))
{
auto item = items[item_name];

auto it =
find_if(items.begin(), items.end(), [item_name](COPCItem *item) { return item->getName() == item_name; });
if (items.end() != it)
{
auto item = *it;
vector<CPropertyDescription> prop_desc;
item->getSupportedProperties(prop_desc);
for (unsigned i = 0; i < prop_desc.size(); ++i)
CAutoPtrArray<SPropertyValue> prop_vals;
item->getProperties(prop_desc, prop_vals);

if (prop_vals[0])
{
// wcout << "name: " << item_name << ", data type: " << prop_vals[0]->value.iVal << endl;
type = static_cast<VARENUM>(prop_vals[0]->value.iVal);
}
}
});

return type;
}

return;
void OPCClient::ReadSync(wstring &group_name)
{
if (groups_.end() == groups_.find(group_name))
{
return;
}

auto &group_tuple = groups_[group_name];
auto &group = get<0>(group_tuple);
auto &items = get<1>(group_tuple);
auto &callback = get<2>(group_tuple);

if (items.empty())
{
return;
}

COPCItemDataMap item_data_map;
group->readSync(items, item_data_map, OPC_DS_DEVICE);
POSITION pos = item_data_map.GetStartPosition();
while (pos)
{
OPCHANDLE handle = item_data_map.GetKeyAt(pos);
OPCItemData *data = item_data_map.GetNextValue(pos);
if (data)
{
const COPCItem *item = data->item();
if (item)
{
//printf("-----> '%ws', handle: %u, group sync read quality %d value %d\n", item->getName().c_str(),
// handle, data->wQuality, data->vDataValue.iVal);

callback(item->getName(), data->vDataValue);
}
}
}

}

bool OPCClient::WriteSync(wstring &item_name, VARIANT &var)
{
for_each(groups_.begin(), groups_.end(), [item_name, &var](auto &group_kv) {
GroupTuple &group_tuple = group_kv.second;
Items &items = get<1>(group_tuple);

auto it =
find_if(items.begin(), items.end(), [item_name](COPCItem *item) { return item->getName() == item_name; });
if (items.end() != it)
{
auto item = *it;
return item->writeSync(var);
}
});

return string();
return false;
}
11 changes: 8 additions & 3 deletions OPCClientDLL/opc_client_interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
#define OPC_CLIENT_DLL_API __declspec(dllimport)
#endif

#include <vector>
#include <map>
#include <vector>
#include <functional>

using ServerNames = std::vector<std::wstring>;
using ServerItems = std::vector<std::wstring>;
using ReadCallback = std::function<void(std::wstring, VARIANT &var)>;

class OPC_CLIENT_DLL_API OPCClientInterface
{
Expand All @@ -25,12 +27,15 @@ class OPC_CLIENT_DLL_API OPCClientInterface
virtual ServerNames GetServers(std::wstring &host_name) = 0;
virtual bool Connect(std::wstring &host_name, std::wstring &server_name) = 0;
virtual ServerItems GetItems() = 0;
virtual void AddGroup(std::wstring &group_name) = 0;
virtual void AddGroup(std::wstring &group_name, ReadCallback callback) = 0;
virtual void AddItem(std::wstring &group_name, std::wstring &item_name) = 0;
virtual std::string GetItemType(std::wstring &item_name) = 0;
virtual VARENUM GetItemType(std::wstring &item_name) = 0;
virtual void ReadSync(std::wstring &group_name) = 0;
virtual bool WriteSync(std::wstring &item_name, VARIANT &var) = 0;
};

extern "C" OPC_CLIENT_DLL_API ServerNames;
extern "C" OPC_CLIENT_DLL_API ServerItems;
extern "C" OPC_CLIENT_DLL_API ReadCallback;
extern "C" OPC_CLIENT_DLL_API OPCClientInterface *instance_create();
extern "C" OPC_CLIENT_DLL_API void instance_destroy(OPCClientInterface *instance);

0 comments on commit 90b8ac6

Please sign in to comment.