#0021: 新增ACS通讯IP的可配置

This commit is contained in:
zhengxuan.zhang
2025-02-20 16:22:10 +08:00
parent 2a7d4bedc7
commit f8cea5d5ce
5 changed files with 15 additions and 4 deletions
+1 -1
View File
@@ -96,7 +96,7 @@ BOOL CheckLicense()
{
if (g_pLogger)
{
g_pLogger->SendAndFlushWithTime(L"CLMTool.dll Load Failed");
g_pLogger->SendAndFlushWithTime(L"MORCODE.dll Load Failed");
}
return FALSE;
+10 -1
View File
@@ -492,7 +492,7 @@ HSI_STATUS HSI_Motion::Startup(HWND _hWnd, bool _bOfflineOnly)
handleACS = acsc_OpenCommSimulator();
#else
// 10.0.0.100 - default IP address of the controller
handleACS = acsc_OpenCommEthernet("100.0.0.100", ACSC_SOCKET_DGRAM_PORT);
handleACS = acsc_OpenCommEthernet(m_ACS_IPAddresses, ACSC_SOCKET_DGRAM_PORT);
// for the connection to the controller via local network or Internet
// hComm = acsc_OpenCommEthernet("10.0.0.100", ACSC_SOCKET_STREAM_PORT);
@@ -4254,6 +4254,15 @@ HSI_STATUS HSI_Motion::Load_EF3_Config_Inifile(CString GoogolIniFile)
m_IsUseACS = GetPrivateProfileInt(L"EF3", L"IS_USEACS", 0, csAppPath);
m_ForSoft = GetPrivateProfileInt(L"SOFTWARE", L"USE_SOFTWARE", 0, csAppPath);
// 从配置文件中读取IP地址
TCHAR buffer[50];
GetPrivateProfileString(L"EF3", L"ACS_ADDRESS", L"100.0.0.100",
buffer, 50, csAppPath);
// 将TCHAR类型的buffer转换为char类型的m_ACS_IPAddresses
size_t convertedChars = 0;
wcstombs_s(&convertedChars, m_ACS_IPAddresses, buffer, _TRUNCATE);
g_pLogger->SendAndFlushWithTime(L"ACS IP Address: %S\n", m_ACS_IPAddresses);
m_IsUse_HSICompensation = GetPrivateProfileInt(L"ASIX", L"IS_USE_HSICOMPENSATION", 0, csAppPath);
m_Compensation_Pluse = GetPrivateProfileInt(L"ASIX", L"COMPENSATE_PLUSE", 20, csAppPath);
m_IsHardLimit = GetPrivateProfileInt(L"ASIX", L"IS_HARD_LIMIT", 7, csAppPath);
+2
View File
@@ -461,6 +461,8 @@ public:
int m_IsUseTwentySixLight; //是否启用26路灯光 0为不启用 1位启用 默认为0
int m_IsUseEF3; //是否启用EF3
int m_IsUseACS; //是否用ACS运动控制
char m_ACS_IPAddresses[50]; // 定义字符串,存储ACS IP地址
int m_DeviceType; //设备类型,0为通用设备,1为三激光, 2为大视野,3为转盘设备 默认为0
int m_UseAxisNum; //转盘设备使用轴号
int m_IbinCount; //记录获取到的分bin数
+2 -2
View File
@@ -12,5 +12,5 @@
#define HSI_VERSION_REVNUM
#define HSI_VERSION_BUILD_DATE _T(__DATE__ )
#define HSI_VERSION_BUILD_TIME _T(__TIME__ )
#define HSI_FILE_DESCRIPTION "2025.02.20 / 9:50 "
#define HSI_FILE_CSDESCRIPTION _T("2025.02.20 / 9:50 ")
#define HSI_FILE_DESCRIPTION "2025.02.20 / 16:04 "
#define HSI_FILE_CSDESCRIPTION _T("2025.02.20 / 16:04 ")