sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
zhouhuang 2024-12-04 08:48:18 +08:00
parent e3b12266cd
commit d6d031172b
2 changed files with 324 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
das-dn/hostadsbf/hostadsbf.cpp
View File

@ -4,7 +4,8 @@
#include <curl/curl.h> #include <curl/curl.h>
#include <ry.h> #include <ry.h>
#define MAX_BUF_SIZE 512 #define MAX_BLOCKF_SIZE 512
#define DATA_BLOCK_BOUNDARY 1000
#define REGISTER_DATA_TYPE_YC 1 #define REGISTER_DATA_TYPE_YC 1
#define REGISTER_DATA_TYPE_YM 2 #define REGISTER_DATA_TYPE_YM 2
@ -12,6 +13,11 @@
#define REGISTER_DATA_TYPE_YX_WORD 4 #define REGISTER_DATA_TYPE_YX_WORD 4
#define REGISTER_DATA_TYPE_YX_DWORD 5 #define REGISTER_DATA_TYPE_YX_DWORD 5
#define ADSP_READ_ID 100 //读取文件及文件夹ID
#define ADSP_READ_ID_FUNCCODE 0x03 //读取文件及文件夹ID功能码。
#define ADSP_READ_ID_REGISTER_ADDRESS 150 //读取文件及文件夹ID寄存器地址。
#define ADSP_READ_ID_REGISTER_LENGTH 9 //读取文件及文件夹ID寄存器长度。
static datalen2mbaddrmap m_datalen2mbaddr_map; static datalen2mbaddrmap m_datalen2mbaddr_map;
static struDataLengthMBAddr m_datalen_mbaddr[] = { static struDataLengthMBAddr m_datalen_mbaddr[] = {
@ -219,7 +225,6 @@ static bool publish_sensor_data(const char* command, const Json::Value payload)
jsonRoot["time"] = mtime; jsonRoot["time"] = mtime;
jsonRoot["data"] = payload; jsonRoot["data"] = payload;
//vLog(LOG_DEBUG, "here start to send.\n");
std::string outputConfig = Json::writeString(builder, jsonRoot); std::string outputConfig = Json::writeString(builder, jsonRoot);
g_conn->sendMsg(outputConfig); g_conn->sendMsg(outputConfig);
@ -236,7 +241,7 @@ static WORD GetUnitYCRegisterAddr(int uid, int point)
if (pUnit->yccount <= 0) return (WORD)65535; if (pUnit->yccount <= 0) return (WORD)65535;
if (point < 0 || point >= pUnit->yccount) return (WORD)65535; if (point < 0 || point >= pUnit->yccount) return (WORD)65535;
pYC = &pUnit->ycs[point]; pYC = &pUnit->ycs[point];
return (MAKEWORD(pYC->m_param[1], pYC->m_param[2])); return (MAKEWORD(pYC->m_param[0], pYC->m_param[1]));
} }
static WORD GetUnitYXRegisterAddr(int uid, int point) static WORD GetUnitYXRegisterAddr(int uid, int point)
@ -249,7 +254,7 @@ static WORD GetUnitYXRegisterAddr(int uid, int point)
if (pUnit->yxcount <= 0) return (WORD)65535; if (pUnit->yxcount <= 0) return (WORD)65535;
if (point < 0 || point >= pUnit->yxcount) return (WORD)65535; if (point < 0 || point >= pUnit->yxcount) return (WORD)65535;
pYX = &pUnit->yxs[point]; pYX = &pUnit->yxs[point];
return (MAKEWORD(pYX->m_param[1], pYX->m_param[2])); return (MAKEWORD(pYX->m_param[0], pYX->m_param[1]));
} }
static BYTE GetUnitYXDataPos(int uid, int point) static BYTE GetUnitYXDataPos(int uid, int point)
@ -626,7 +631,15 @@ static void* ryftp_process(void* param)
CHostADSBFProcess::CHostADSBFProcess() CHostADSBFProcess::CHostADSBFProcess()
{ {
m_adsOverviewDataMemAddr = 1000; m_adsDatas[0].inuse = FALSE;
m_adsDatas[1].inuse = FALSE;
m_adsDatas[2].inuse = FALSE;
m_adsDatas[3].inuse = FALSE;
m_adsDatas[0].adsDataMemAddr = 99999;
m_adsDatas[1].adsDataMemAddr = 99999;
m_adsDatas[2].adsDataMemAddr = 99999;
m_adsDatas[3].adsDataMemAddr = 99999;
m_localIp = "192.168.0.1"; //本机IP地址 m_localIp = "192.168.0.1"; //本机IP地址
m_localNetId = "192.168.0.1.1.1"; //本机IP地址 m_localNetId = "192.168.0.1.1.1"; //本机IP地址
m_remoteIp = "192.168.0.2"; //PLC设备ip地址 m_remoteIp = "192.168.0.2"; //PLC设备ip地址
@ -669,7 +682,14 @@ BOOLEAN CHostADSBFProcess::calc(void)
uid = GetCurUnitID(); uid = GetCurUnitID();
if (uid < 0 || uid >= UNIT_NUM) return FALSE; if (uid < 0 || uid >= UNIT_NUM) return FALSE;
m_adsOverviewDataMemAddr = 65535; m_adsDatas[0].inuse = FALSE;
m_adsDatas[1].inuse = FALSE;
m_adsDatas[2].inuse = FALSE;
m_adsDatas[3].inuse = FALSE;
m_adsDatas[0].adsDataMemAddr = 99999;
m_adsDatas[1].adsDataMemAddr = 99999;
m_adsDatas[2].adsDataMemAddr = 99999;
m_adsDatas[3].adsDataMemAddr = 99999;
//需要给单元添加一个是否有ftp数据的标识 //需要给单元添加一个是否有ftp数据的标识
if (m_bHaveFTP) config.units[uid].state |= 0x20; //存在ftp标识 if (m_bHaveFTP) config.units[uid].state |= 0x20; //存在ftp标识
@ -690,26 +710,54 @@ BOOLEAN CHostADSBFProcess::calc(void)
pData = GetUnitYCParamByPoint(uid, n); pData = GetUnitYCParamByPoint(uid, n);
if (pData[4] == 1) continue; if (pData[4] == 1) continue;
registerAddr = MAKEWORD(pData[0], pData[1]); registerAddr = MAKEWORD(pData[0], pData[1]);
if (registerAddr < m_adsOverviewDataMemAddr) m_adsOverviewDataMemAddr = registerAddr; if (registerAddr < DATA_BLOCK_BOUNDARY)
if (m_register2type_map.find(registerAddr) == m_register2type_map.end()) { {
m_register2type_map.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YC)); if (!m_adsDatas[0].inuse) m_adsDatas[0].inuse = TRUE;
if (registerAddr < m_adsDatas[0].adsDataMemAddr) m_adsDatas[0].adsDataMemAddr = registerAddr;
if (m_adsDatas[0].adsDataBlocks.find(registerAddr) == m_adsDatas[0].adsDataBlocks.end()) {
m_adsDatas[0].adsDataBlocks.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YC));
} else { } else {
vLog(LOG_WARN, "遥测测点配置了相同的寄存器地址\n"); vLog(LOG_WARN, "遥测测点配置了相同的寄存器地址\n");
} }
} }
else
{
if (!m_adsDatas[1].inuse) m_adsDatas[1].inuse = TRUE;
if (registerAddr < m_adsDatas[1].adsDataMemAddr) m_adsDatas[1].adsDataMemAddr = registerAddr;
if (m_adsDatas[1].adsDataBlocks.find(registerAddr) == m_adsDatas[1].adsDataBlocks.end()) {
m_adsDatas[1].adsDataBlocks.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YC));
} else {
vLog(LOG_WARN, "遥测测点配置了相同的寄存器地址\n");
}
}
}
for (n = 0; n < ymcount; n++) for (n = 0; n < ymcount; n++)
{ {
pData = GetUnitYMParamByPoint(uid, n); pData = GetUnitYMParamByPoint(uid, n);
if (pData[4] == 1) continue; if (pData[4] == 1) continue;
registerAddr = MAKEWORD(pData[0], pData[1]); registerAddr = MAKEWORD(pData[0], pData[1]);
if (registerAddr < m_adsOverviewDataMemAddr) m_adsOverviewDataMemAddr = registerAddr; if (registerAddr < DATA_BLOCK_BOUNDARY)
if (m_register2type_map.find(registerAddr) == m_register2type_map.end()) { {
m_register2type_map.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YM)); if (!m_adsDatas[0].inuse) m_adsDatas[0].inuse = TRUE;
if (registerAddr < m_adsDatas[0].adsDataMemAddr) m_adsDatas[0].adsDataMemAddr = registerAddr;
if (m_adsDatas[0].adsDataBlocks.find(registerAddr) == m_adsDatas[0].adsDataBlocks.end()) {
m_adsDatas[0].adsDataBlocks.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YM));
} else { } else {
vLog(LOG_WARN, "遥脉测点配置了相同的寄存器地址\n"); vLog(LOG_WARN, "遥脉测点配置了相同的寄存器地址\n");
} }
} }
else
{
if (!m_adsDatas[1].inuse) m_adsDatas[1].inuse = TRUE;
if (registerAddr < m_adsDatas[1].adsDataMemAddr) m_adsDatas[1].adsDataMemAddr = registerAddr;
if (m_adsDatas[1].adsDataBlocks.find(registerAddr) == m_adsDatas[1].adsDataBlocks.end()) {
m_adsDatas[1].adsDataBlocks.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YM));
} else {
vLog(LOG_WARN, "遥脉测点配置了相同的寄存器地址\n");
}
}
}
for (n = 0; n < yxcount; n++) for (n = 0; n < yxcount; n++)
{ {
@ -717,13 +765,24 @@ BOOLEAN CHostADSBFProcess::calc(void)
if (pData[4] == 1) continue; if (pData[4] == 1) continue;
registerAddr = MAKEWORD(pData[0], pData[1]); registerAddr = MAKEWORD(pData[0], pData[1]);
value_type = pData[2]; value_type = pData[2];
if (registerAddr < m_adsOverviewDataMemAddr) m_adsOverviewDataMemAddr = registerAddr; if (registerAddr < DATA_BLOCK_BOUNDARY)
if (m_register2type_map.find(registerAddr) == m_register2type_map.end()) { {
m_register2type_map.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YX_BYTE + value_type)); if (!m_adsDatas[0].inuse) m_adsDatas[0].inuse = TRUE;
if (registerAddr < m_adsDatas[0].adsDataMemAddr) m_adsDatas[0].adsDataMemAddr = registerAddr;
if (m_adsDatas[0].adsDataBlocks.find(registerAddr) == m_adsDatas[0].adsDataBlocks.end()) {
m_adsDatas[0].adsDataBlocks.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YX_BYTE + value_type));
}
}
else
{
if (!m_adsDatas[1].inuse) m_adsDatas[1].inuse = TRUE;
if (registerAddr < m_adsDatas[1].adsDataMemAddr) m_adsDatas[1].adsDataMemAddr = registerAddr;
if (m_adsDatas[1].adsDataBlocks.find(registerAddr) == m_adsDatas[1].adsDataBlocks.end()) {
m_adsDatas[1].adsDataBlocks.insert(register2typemap::value_type(registerAddr, REGISTER_DATA_TYPE_YX_BYTE + value_type));
}
} }
} }
vLog(LOG_DEBUG, "m_adsOverviewDataMemAddr is: %d\n", m_adsOverviewDataMemAddr);
return TRUE; return TRUE;
} }
@ -836,7 +895,6 @@ BOOLEAN CHostADSBFProcess::OnTimer(void)
if ((m_currentDirNo == -1) && (m_currentFileNo == -1)) if ((m_currentDirNo == -1) && (m_currentFileNo == -1))
{ //当前文件和目录都为-1，程序第一次启动。需要获取ftp目录及文件ID { //当前文件和目录都为-1，程序第一次启动。需要获取ftp目录及文件ID
readFileID(); readFileID();
//return TRUE;
} }
} }
readRealData(); readRealData();
@ -849,15 +907,15 @@ BOOLEAN CHostADSBFProcess::readFileID()
int uid = GetCurUnitID(); int uid = GetCurUnitID();
if (uid < 0 || uid >= UNIT_NUM) return TRUE; if (uid < 0 || uid >= UNIT_NUM) return TRUE;
AdsVariable<std::array<BYTE, MAX_BUF_SIZE>> turbineData {*m_turbine, ADSIGRP_IOIMAGE_RWOB, m_adsOverviewDataMemAddr}; AdsVariable<std::array<BYTE, ADSP_READ_ID_REGISTER_LENGTH>> turbineData {*m_turbine, ADSIGRP_IOIMAGE_RWOB, ADSP_READ_ID_REGISTER_ADDRESS};
BYTE buffer[1024]; BYTE buffer[1024];
BYTE *pData = buffer; BYTE *pData = buffer;
BYTE params[MAX_UNIT_POINT_PARAM_SIZE]; BYTE params[MAX_UNIT_POINT_PARAM_SIZE];
BYTE* pParam = params; BYTE* pParam = params;
pData = ((std::array<BYTE, MAX_BUF_SIZE>)turbineData).data(); pData = ((std::array<BYTE, ADSP_READ_ID_REGISTER_LENGTH>)turbineData).data();
WORD registerAddr = m_adsOverviewDataMemAddr; WORD registerAddr = ADSP_READ_ID_REGISTER_ADDRESS;
return TRUE; return TRUE;
} }
@ -867,14 +925,20 @@ BOOLEAN CHostADSBFProcess::readRealData()
int uid = GetCurUnitID(); int uid = GetCurUnitID();
if (uid < 0 || uid >= UNIT_NUM) return TRUE; if (uid < 0 || uid >= UNIT_NUM) return TRUE;
AdsVariable<std::array<BYTE, MAX_BUF_SIZE>> turbineData {*m_turbine, ADSIGRP_IOIMAGE_RWOB, m_adsOverviewDataMemAddr}; for (int k = 0; k < 4; k++)
{
if (!m_adsDatas[k].inuse) continue;
WORD m_adsOverviewDataMemAddr = m_adsDatas[k].adsDataMemAddr;
register2typemap m_register2type_map = m_adsDatas[k].adsDataBlocks;
AdsVariable<std::array<BYTE, MAX_BLOCKF_SIZE>> turbineData {*m_turbine, ADSIGRP_IOIMAGE_RWOB, m_adsOverviewDataMemAddr};
BYTE buffer[1024]; BYTE buffer[1024];
BYTE *pData = buffer; BYTE *pData = buffer;
BYTE params[MAX_UNIT_POINT_PARAM_SIZE]; BYTE params[MAX_UNIT_POINT_PARAM_SIZE];
BYTE* pParam = params; BYTE* pParam = params;
pData = ((std::array<BYTE, MAX_BUF_SIZE>)turbineData).data(); pData = ((std::array<BYTE, MAX_BLOCKF_SIZE>)turbineData).data();
WORD registerAddr = m_adsOverviewDataMemAddr; WORD registerAddr = m_adsOverviewDataMemAddr;
float f_val; float f_val;
@ -884,7 +948,7 @@ BOOLEAN CHostADSBFProcess::readRealData()
DWORD nValue = 0; DWORD nValue = 0;
int point; int point;
for (int i = 0; i < MAX_BUF_SIZE;) for (int i = 0; i < MAX_BLOCKF_SIZE;)
{ {
//vLog(LOG_DEBUG, "registerAddr is: %d\n", registerAddr); //vLog(LOG_DEBUG, "registerAddr is: %d\n", registerAddr);
if (m_register2type_map.find(registerAddr) != m_register2type_map.end()) if (m_register2type_map.find(registerAddr) != m_register2type_map.end())
@ -1114,6 +1178,7 @@ BOOLEAN CHostADSBFProcess::readRealData()
registerAddr++; i++; pData++; registerAddr++; i++; pData++;
} }
} }
}
return TRUE; return TRUE;
} }

12
das-dn/hostadsbf/hostadsbf.h
View File

@ -11,6 +11,14 @@ using namespace Beckhoff::Ads;
typedef std::unordered_map<short, short> register2typemap; typedef std::unordered_map<short, short> register2typemap;
typedef struct
{
BOOLEAN inuse;
WORD adsDataMemAddr;
WORD adsDataMaxAddr;
register2typemap adsDataBlocks;
} struADSData;
typedef std::vector<struADSData> adsReadDataVector;
class CHostADSBFProcess : public CProcess class CHostADSBFProcess : public CProcess
{ {
public: public:
@ -32,13 +40,11 @@ private:
std::string m_remoteNetId; std::string m_remoteNetId;
AdsDevice *m_turbine; AdsDevice *m_turbine;
WORD m_adsOverviewDataMemAddr;
int m_total_length; int m_total_length;
DWORD last_sec; DWORD last_sec;
register2typemap m_register2type_map; //寄存器类型表 struADSData m_adsDatas[4];
public: public:
BOOLEAN m_bHaveFTP; //存在FTP协议 BOOLEAN m_bHaveFTP; //存在FTP协议