LAPTOP-SNT8I5JK\Boounion
2025-01-10 df71cb126c2016d1e1b8b614bd9805d063068eb0
1.SECS 测试,实现Are you there回复,建立通讯回复,时间设置处理及回复;
已修改8个文件
129 ■■■■■ 文件已修改
SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/HsmsPassive.cpp 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/HsmsPassive.h 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Servo.rc 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Servo.vcxproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/Servo.vcxproj.filters 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/ServoDlg.cpp 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/Servo/resource.h 补丁 | 查看 | 原始文档 | blame | 历史
SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h
@@ -31,5 +31,7 @@
    virtual bool getSubItemString(int index, char*& pszText) = 0;
    virtual void reset() = 0;
    virtual ISECS2Item* addItem(const char* pszText, const char* pszNote) = 0;
    virtual ISECS2Item* addBinaryItem(const char* pszData, int nDataLen, const char* pszNote) = 0;
    virtual void setBinary(const char* pszData, int nLen, const char* pszNote) = 0;
    virtual ISECS2Item* addItem() = 0;
};
SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -3,7 +3,11 @@
#include "Log.h"
#include "Model.h"
#include "Common.h"
#include <time.h>
char g_szAckOkData[] = { 0, 0, 0, 0 };
char g_szAckNgData[] = { 1, 0, 0, 0 };
unsigned __stdcall CimWorkThreadFunction(LPVOID lpParam)
{
@@ -26,11 +30,13 @@
    m_pModel = nullptr;
    m_nActionTimeout = 6;
    m_nSystemByte = 0;
    m_strEquipmentModelType = "2860";
    m_strSoftRev = _T("1.0.1");
    m_hCimWorkThreadHandle = NULL;
    m_nCimWorkThrdaddr = 0;
    m_bCimWorking = FALSE;
    m_hCimWorkEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL);
    m_nSessionId = 1;
    InitializeCriticalSection(&m_criticalSection);
}
@@ -109,7 +115,9 @@
    auto onStatusChanged = [&](void* pFrom, STATE state) -> void {
        m_pModel->notifyInt(RX_CODE_PASSIVE_STATUS_CHANGED, (int)state);
        // 连上之后发S1F1,
        // 连上之后发S1F1
        // 修改为不主动发送,而是响应
        /*
        if (STATE::SELECTED == state) {
            m_bAreYouThereRequest = FALSE;
            if (!m_bAreYouThereRequest) {
@@ -117,17 +125,20 @@
                secsAreYouThereRequest();
            }
        }
        */
    };
    auto onRecvSysMessage = [&](void* pFrom, IMessage* pMessage) -> void {
        LOGI("<HSMS>onRecvSysMessage:sessionId:%d, sType:%d systemBytes:%d",
            pMessage->getHeader()->sessionId, pMessage->getHeader()->sType, pMessage->getHeader()->systemBytes);
        onRecvMsg(pMessage);
        if (MSG_LINKTEST_REQ == pMessage->getHeader()->sType) {
            /*
            Sleep(10);
            if (!m_bAreYouThereRequest) {
                m_bAreYouThereRequest = TRUE;
                secsAreYouThereRequest();
                requestYouThere();
            }
            */
        }
    };
@@ -147,7 +158,13 @@
        LOGI("<HSMS>收到消息 S%dF%d", nStream, pHeader->function);
        if (nStream == 1 && pHeader->function == 1) {
            // S1F1
            secsAreYouThereReply(pHeader->sessionId, pHeader->systemBytes);
            replyAreYouThere(pHeader->systemBytes);
        }
        else if (nStream == 1 && pHeader->function == 13) {
            replyEstablishCommunications(pHeader->systemBytes);
        }
        else if (nStream == 2 && pHeader->function == 31) {
            replyDatetime(pMessage);
        }
    };
@@ -251,7 +268,7 @@
}
// S1F1
int CHsmsPassive::secsAreYouThereRequest()
int CHsmsPassive::requestAreYouThere()
{
    if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
        return ER_NOTSELECT;
@@ -261,7 +278,7 @@
    CHsmsAction* pAction = new CHsmsAction(ACTION_HELLO, FALSE, m_nActionTimeout);
    m_listAction.push_back(pAction);
    IMessage* pMessage = NULL;
    HSMS_Create1Message(pMessage, 0xffff, 1 | REPLY, 1, ++m_nSystemByte);
    HSMS_Create1Message(pMessage, m_nSessionId, 1 | REPLY, 1, ++m_nSystemByte);
    ASSERT(pMessage);
    pAction->setSendMessage(pMessage);
@@ -272,14 +289,14 @@
}
// S1F2
int CHsmsPassive::secsAreYouThereReply(unsigned int sessionId, unsigned int systemBytes)
int CHsmsPassive::replyAreYouThere(unsigned int systemBytes)
{
    if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
        return ER_NOTSELECT;
    }
    IMessage* pMessage = NULL;
    HSMS_Create1Message(pMessage, sessionId, 1, 2, systemBytes);
    HSMS_Create1Message(pMessage, m_nSessionId, 1, 2, systemBytes);
    ASSERT(pMessage);
    ISECS2Item* pItem = pMessage->getBody();
@@ -291,3 +308,74 @@
    return 0;
}
// S1F14
int CHsmsPassive::replyEstablishCommunications(unsigned int systemBytes)
{
    if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
        return ER_NOTSELECT;
    }
    IMessage* pMessage = NULL;
    HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, systemBytes);
    ASSERT(pMessage);
    ISECS2Item* pItem = pMessage->getBody();
    pItem->addBinaryItem(g_szAckOkData, 1, "COMMACK");
    ISECS2Item* pList = pItem->addItem();
    pList->addItem(m_strEquipmentModelType.c_str(), "MDLN");
    pList->addItem(m_strSoftRev.c_str(), "SOFTREV");
    m_pPassive->sendMessage(pMessage);
    LOGI("<HSMS>[SECS Msg SEND]S1F14 (SysByte=%u)", pMessage->getHeader()->systemBytes);
    HSMS_Destroy1Message(pMessage);
    return 0;
}
// S2F31
#include <iostream>
#include <time.h>
#include <stdlib.h>
#include <string.h>
int CHsmsPassive::replyDatetime(IMessage* pRecv)
{
    if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
        return ER_NOTSELECT;
    }
    ISECS2Item* pBody =    pRecv->getBody();
    if (pBody == nullptr || pBody->getType() != SITYPE::A) ER_PARAM_ERROR;
    char* pszMessage;
    if (pBody->getString(pszMessage)) {
        // 更新时间
        SYSTEMTIME time;
        char szBuffer[20];
        memcpy(szBuffer, pszMessage, 16);
        szBuffer[14] = '\0';
        time.wSecond = atoi(&szBuffer[12]);
        szBuffer[12] = '\0';
        time.wMinute = atoi(&szBuffer[10]);
        szBuffer[10] = '\0';
        time.wHour = atoi(&szBuffer[8]);
        szBuffer[8] = '\0';
        time.wDay = atoi(&szBuffer[6]);
        szBuffer[6] = '\0';
        time.wMonth = atoi(&szBuffer[4]);
        szBuffer[4] = '\0';
        time.wYear = atoi(&szBuffer[0]);
        time.wMilliseconds = 0;
        SetLocalTime(&time);
    }
    IMessage* pMessage = NULL;
    HSMS_Create1Message(pMessage, m_nSessionId, 2, 32, pRecv->getHeader()->systemBytes);
    ASSERT(pMessage);
    ISECS2Item* pItem = pMessage->getBody();
    pItem->setBinary(g_szAckOkData, 1, "TIACK");
    m_pPassive->sendMessage(pMessage);
    LOGI("<HSMS>[SECS Msg SEND]S2F32 (SysByte=%u)", pRecv->getHeader()->systemBytes);
    HSMS_Destroy1Message(pMessage);
    return 0;
}
SourceCode/Bond/Servo/HsmsPassive.h
@@ -7,7 +7,7 @@
#define ER_NOERROR            0
#define ER_NOTSELECT        -1
#define ER_BUSY                -2
#define ER_PARAM_ERROR        -3
class CModel;
class CHsmsPassive
@@ -22,8 +22,14 @@
    void setActionTimeout(int nSecond);
    int init(CModel* pModel, const char* pszName, unsigned int port);
    int term();
    int secsAreYouThereRequest();
    int secsAreYouThereReply(unsigned int sessionId, unsigned int systemBytes);
public:
    int requestAreYouThere();
private:
    int replyAreYouThere(unsigned int systemBytes);
    int replyEstablishCommunications(unsigned int systemBytes);
    int replyDatetime(IMessage* pRecv);
private:
    inline void Lock() { EnterCriticalSection(&m_criticalSection); }
@@ -35,6 +41,7 @@
    IPassive* m_pPassive;
    int m_nActionTimeout;
    unsigned int m_nSystemByte;
    unsigned short m_nSessionId;
    BOOL m_bAreYouThereRequest;
    std::string m_strEquipmentModelType;
    std::string m_strSoftRev;
SourceCode/Bond/Servo/Servo.rc
Binary files differ
SourceCode/Bond/Servo/Servo.vcxproj
@@ -201,6 +201,7 @@
    <ClInclude Include="LogEdit.h" />
    <ClInclude Include="Model.h" />
    <ClInclude Include="Resource.h" />
    <ClInclude Include="SecsTestDlg.h" />
    <ClInclude Include="Servo.h" />
    <ClInclude Include="ServoDlg.h" />
    <ClInclude Include="ServoGraph.h" />
@@ -217,6 +218,7 @@
    <ClCompile Include="LogDlg.cpp" />
    <ClCompile Include="LogEdit.cpp" />
    <ClCompile Include="Model.cpp" />
    <ClCompile Include="SecsTestDlg.cpp" />
    <ClCompile Include="Servo.cpp" />
    <ClCompile Include="ServoDlg.cpp" />
    <ClCompile Include="ServoGraph.cpp" />
SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -66,6 +66,9 @@
    <ClInclude Include="Context.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="SecsTestDlg.h">
      <Filter>头文件</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="Servo.cpp">
@@ -107,6 +110,9 @@
    <ClCompile Include="Context.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="SecsTestDlg.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Servo.rc">
SourceCode/Bond/Servo/ServoDlg.cpp
@@ -8,6 +8,7 @@
#include "afxdialogex.h"
#include "Common.h"
#include "Log.h"
#include "SecsTestDlg.h"
#ifdef _DEBUG
@@ -378,7 +379,8 @@
void CServoDlg::OnMenuFileSecsTest()
{
    AfxMessageBox("OnMenuFileSecsTest");
    CSecsTestDlg dlg;
    dlg.DoModal();
}
void CServoDlg::OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI)
SourceCode/Bond/Servo/resource.h
Binary files differ