| SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SourceCode/Bond/Servo/HsmsPassive.cpp | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SourceCode/Bond/Servo/HsmsPassive.h | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SourceCode/Bond/Servo/Model.cpp | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h
@@ -25,24 +25,48 @@ public: virtual SITYPE getType() = 0; virtual const char* toString() = 0; virtual bool getString(char*& pszText) = 0; virtual bool getBinary(BYTE& bin) = 0; virtual bool getString(const char*& pszText) = 0; virtual bool getBinary(const char*& pszData, unsigned int& len) = 0; virtual bool getBool(bool& boolValue) = 0; virtual bool getI8(long long& value) = 0; virtual bool getI4(int& value) = 0; virtual bool getI2(short& value) = 0; virtual bool getI1(char& value) = 0; virtual bool getF8(double& value) = 0; virtual bool getF4(float& value) = 0; virtual bool getU8(unsigned long long& value) = 0; virtual bool getU4(unsigned int& value) = 0; virtual bool getU2(unsigned short& value) = 0; virtual bool getU1(unsigned char& value) = 0; virtual int getSubItemSize() = 0; virtual ISECS2Item* getSubItem(int index) = 0; virtual bool getSubItemString(int index, char*& pszText) = 0; virtual bool getSubItemBinary(int index, BYTE& bin) = 0; virtual bool getSubItemString(int index, const char*& pszText) = 0; virtual bool getSubItemBinary(int index, const char*& pszData, unsigned int& len) = 0; virtual bool getSubItemBool(int index, bool& boolValue) = 0; virtual bool getSubItemI8(int index, long long& value) = 0; virtual bool getSubItemI4(int index, int& value) = 0; virtual bool getSubItemI2(int index, short& value) = 0; virtual bool getSubItemI1(int index, char& value) = 0; virtual bool getSubItemF8(int index, double& value) = 0; virtual bool getSubItemF4(int index, float& value) = 0; virtual bool getSubItemU8(int index, unsigned long long& value) = 0; virtual bool getSubItemU4(int index, unsigned int& value) = 0; virtual bool getSubItemU2(int index, unsigned short& value) = 0; virtual bool getSubItemU1(int index, unsigned char& value) = 0; virtual void reset() = 0; virtual ISECS2Item* addItem(const char* pszText, const char* pszNote) = 0; virtual ISECS2Item* addBinaryItem(BYTE bin, const char* pszNote) = 0; virtual ISECS2Item* addBoolItem(bool boolValue, const char* pszNote) = 0; virtual ISECS2Item* addI8Item(long long value, const char* pszNote) = 0; virtual ISECS2Item* addI4Item(int value, const char* pszNote) = 0; virtual ISECS2Item* addI2Item(short value, const char* pszNote) = 0; virtual ISECS2Item* addI1Item(char value, const char* pszNote) = 0; virtual ISECS2Item* addF8Item(double value, const char* pszNote) = 0; virtual ISECS2Item* addF4Item(float value, const char* pszNote) = 0; virtual ISECS2Item* addU8Item(unsigned long long value, const char* pszNote) = 0; virtual ISECS2Item* addU4Item(unsigned int value, const char* pszNote) = 0; virtual ISECS2Item* addU2Item(unsigned short value, const char* pszNote) = 0; virtual void setBinary(BYTE bin, const char* pszNote) = 0; virtual ISECS2Item* addU1Item(unsigned char value, const char* pszNote) = 0; virtual void setBinary(const char* pszData, unsigned int len, const char* pszNote) = 0; virtual ISECS2Item* addItem() = 0; }; SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -38,6 +38,7 @@ m_bCimWorking = FALSE; m_hCimWorkEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL); m_nSessionId = 1; m_listener.onEQConstantRequest = nullptr; InitializeCriticalSection(&m_criticalSection); } @@ -59,6 +60,11 @@ m_hCimWorkEvent = NULL; } DeleteCriticalSection(&m_criticalSection); } void CHsmsPassive::setListener(SECSListener listener) { m_listener.onEQConstantRequest = listener.onEQConstantRequest; } void CHsmsPassive::setActionTimeout(int nSecond) @@ -181,6 +187,9 @@ } else if (nStream == 1 && pHeader->function == 13) { replyEstablishCommunications(pMessage); } else if (nStream == 2 && pHeader->function == 13) { replyEquipmentConstant(pMessage); } else if (nStream == 2 && pHeader->function == 31) { replyDatetime(pMessage); @@ -305,7 +314,7 @@ HSMS_Create1Message(pMessage, m_nSessionId, s, f, systemBytes); ASSERT(pMessage); ISECS2Item* pItem = pMessage->getBody(); pItem->setBinary(ack, pszAckName); pItem->setBinary((const char*)&ack, 1, pszAckName); m_pPassive->sendMessage(pMessage); LOGI("<HSMS>[SECS Msg SEND]S%dF%d (SysByte=%u)", s, f, systemBytes); HSMS_Destroy1Message(pMessage); @@ -376,6 +385,52 @@ return 0; } // S2F13 int CHsmsPassive::replyEquipmentConstant(IMessage* pRecv) { if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) { return ER_NOTSELECT; } // 要获取的常量表表 BOOL bCheckData = FALSE; std::vector<unsigned int> ecids; { ISECS2Item* pItem = pRecv->getBody(); int ecidSize = pItem->getSubItemSize(); for (int i = 0; i < ecidSize; i++) { unsigned short id; if (pItem->getSubItemU2(i, id)) { ecids.push_back((int)id); } } } // 交由上层应用来获取机器常量值 std::vector<unsigned int> ecvs; if (m_listener.onEQConstantRequest != nullptr) { m_listener.onEQConstantRequest(this, ecids, ecvs); } // 回复 IMessage* pMessage = NULL; HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, pRecv->getHeader()->systemBytes); ASSERT(pMessage); ISECS2Item* pItem = pMessage->getBody(); for (auto item : ecvs) { pItem->addU2Item(item, "ECV"); } m_pPassive->sendMessage(pMessage); LOGI("<HSMS>[SECS Msg SEND]S2F14 (SysByte=%u)", pMessage->getHeader()->systemBytes); HSMS_Destroy1Message(pMessage); return 0; } // S2F31 int CHsmsPassive::replyDatetime(IMessage* pRecv) { @@ -384,7 +439,7 @@ } ISECS2Item* pBody = pRecv->getBody(); if (pBody == nullptr || pBody->getType() != SITYPE::A) ER_PARAM_ERROR; char* pszMessage; const char* pszMessage; if (pBody->getString(pszMessage)) { // 更新时间 SYSTEMTIME time; @@ -462,15 +517,46 @@ BOOL bCheckData = FALSE; BYTE ALED; const char* ALED; unsigned int ALID; unsigned int ALEDLEN; { ISECS2Item* pItem = pRecv->getBody(); if (pItem->getSubItemSize() < 2) goto MYREPLY; if (!pItem->getSubItemBinary(0, ALED)) goto MYREPLY; if (!pItem->getSubItemBinary(0, ALED, ALEDLEN)) goto MYREPLY; if (!pItem->getSubItemU4(1, ALID)) goto MYREPLY; bCheckData = TRUE; LOGI("EanbleDisableAlarmReport ALED:%d, ALID:%d", ALED, ALID); LOGI("EanbleDisableAlarmReport ALED:0x%02x, ALID:%d", ALED[0], ALID); double d; float f; pItem->getSubItemF4(2, f); pItem->getSubItemF8(3, d); LOGI("EanbleDisableAlarmReport d:%lf, f:%f", d, f); /* unsigned long long n1; unsigned int n2; unsigned short n3; unsigned char n4; long long sn1; int sn2; short sn3; char sn4; pItem->getSubItemU8(2, n1); pItem->getSubItemU4(3, n2); pItem->getSubItemU2(4, n3); pItem->getSubItemU1(5, n4); pItem->getSubItemI8(6, sn1); pItem->getSubItemI4(7, sn2); pItem->getSubItemI2(8, sn3); pItem->getSubItemI1(9, sn4); LOGI("EanbleDisableAlarmReport n1:%llu, n2:%u, n3:%hu, n4:%hhu", n1, n2, n3, n4); LOGI("EanbleDisableAlarmReport sn1:%lld, sn2:%d, sn3:%hd, sn4:%hhd", sn1, sn2, sn3, sn4); */ } @@ -494,6 +580,10 @@ ISECS2Item* pItem = pMessage->getBody(); pItem->addItem("banana1", "PPID1"); pItem->addItem("banana2", "PPID2"); pItem->addF8Item(-123.45, "PPID2"); pItem->addF4Item(-568.99f, "PPID2"); pItem->addF8Item(456.456, "PPID2"); pItem->addF4Item(123.123f, "PPID2"); m_pPassive->sendMessage(pMessage); LOGI("<HSMS>[SECS Msg SEND]S7F20 (SysByte=%u)", pMessage->getHeader()->systemBytes); HSMS_Destroy1Message(pMessage); @@ -513,15 +603,16 @@ BOOL bCheckData = FALSE; BYTE tid; char* pszText = nullptr;; const char* tid; unsigned int tidlen; const char* pszText = nullptr;; { ISECS2Item* pItem = pRecv->getBody(); if (pItem->getSubItemSize() < 2) goto MYREPLY; if (!pItem->getSubItemBinary(0, tid)) goto MYREPLY; if (!pItem->getSubItemBinary(0, tid, tidlen)) goto MYREPLY; if (!pItem->getSubItemString(1, pszText)) goto MYREPLY; bCheckData = TRUE; LOGI("TerminalDisplay tid:%d, pszText:%s", tid, pszText); LOGI("TerminalDisplay tid:0x%02x, pszText:%s", tid[0], pszText); m_pModel->notifyText(RX_HSMS_TERMINAL_TEXT, pszText); }
@@ -2,12 +2,22 @@ #include <string> #include <list> #include "HsmsAction.h" #include <functional> #include <vector> #define ER_NOERROR 0 #define ER_NOTSELECT -1 #define ER_BUSY -2 #define ER_PARAM_ERROR -3 typedef std::function<void(void* pFrom, const std::vector<unsigned int>& ecids, std::vector<unsigned int>& ecvs)> SECSEQCONSTANTREQUEST; typedef std::function<void(void* pFrom, int error)> ONDATAERROR; typedef struct _SECSListener { SECSEQCONSTANTREQUEST onEQConstantRequest; } SECSListener; class CModel; class CHsmsPassive @@ -23,6 +33,7 @@ /* 设置软件版本号 最大长度 20 bytes */ void setSoftRev(const char* pszRev); void setListener(SECSListener listener); unsigned OnCimWork(); void OnTimer(UINT nTimerid); void setActionTimeout(int nSecond); @@ -40,6 +51,7 @@ /* reply开头的函数为回复函数 */ int replyAreYouThere(IMessage* pRecv); int replyEstablishCommunications(IMessage* pRecv); int replyEquipmentConstant(IMessage* pRecv); int replyDatetime(IMessage* pRecv); int replyEanbleDisableEventReport(IMessage* pRecv); int replyEanbleDisableAlarmReport(IMessage* pRecv); @@ -65,6 +77,7 @@ std::list<CHsmsAction*> m_listActionSent; private: SECSListener m_listener; BOOL m_bCimWorking; HANDLE m_hCimWorkEvent; HANDLE m_hCimWorkThreadHandle; SourceCode/Bond/Servo/Model.cpp
@@ -57,6 +57,15 @@ }); SECSListener listener; listener.onEQConstantRequest = [&](void* pFrom, const std::vector<unsigned int>& ecids, std::vector<unsigned int>& ecvs) -> void { // 在此填充常量值，目前仅是加1后返回 for (auto item : ecids) { ecvs.push_back(item + 1); } }; m_hsmsPassive.setListener(listener); m_hsmsPassive.setEquipmentModelType((LPTSTR)(LPCTSTR)strModeType); m_hsmsPassive.setSoftRev((LPTSTR)(LPCTSTR)strSoftRev); m_hsmsPassive.init(this, "APP", 7000);
