From 8ffc831c6bf37a73961e22efc145be4e8c8f1241 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期四, 19 六月 2025 10:05:07 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/CEquipment.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h index 76e78b0..8108f02 100644 --- a/SourceCode/Bond/Servo/CEquipment.h +++ b/SourceCode/Bond/Servo/CEquipment.h @@ -43,7 +43,7 @@ #define SIGNAL_UPSTREAM_TROUBLE 1 #define SIGNAL_INTERLOCK 2 #define SIGNAL_SEND_ABLE 3 - typedef std::function<int(int writeCode, int retCode)> ONWRITEDRET; + typedef std::function<void(int writeCode, int retCode)> ONWRITEDRET; typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE; typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED; -- Gitblit v1.9.3