From a2523cef9a89e9d0a095e96fa6d3890f1e3b7673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B6=80=EA=B1=B4?= Date: Mon, 27 Apr 2026 10:30:22 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fin=5Fcontrol=5Fmain=5Fcommand.h=20theta?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/dto/fin_control_main_command.h | 16 ++++++++++++++++ include/dto/pin_control_main_command.h | 16 ---------------- include/enum/icd_id.h | 8 +++++--- 3 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 include/dto/fin_control_main_command.h delete mode 100644 include/dto/pin_control_main_command.h diff --git a/include/dto/fin_control_main_command.h b/include/dto/fin_control_main_command.h new file mode 100644 index 0000000..7db245b --- /dev/null +++ b/include/dto/fin_control_main_command.h @@ -0,0 +1,16 @@ +#ifndef FIN_CONTROL_MAIN_COMMAND_H +#define FIN_CONTROL_MAIN_COMMAND_H + +#include + +#include "../enum/icd_id.h" + +#pragma pack(push, 1) +struct FinControlMainCommand { + IcdId message_id; + int32_t a_motor_theta; + int32_t b_motor_theta; +}; +#pragma pack(pop) + +#endif // FIN_CONTROL_MAIN_COMMAND_H \ No newline at end of file diff --git a/include/dto/pin_control_main_command.h b/include/dto/pin_control_main_command.h deleted file mode 100644 index b7e8925..0000000 --- a/include/dto/pin_control_main_command.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef PIN_CONTROL_MAIN_COMMAND_H -#define PIN_CONTROL_MAIN_COMMAND_H - -#include - -#include "../enum/icd_id.h" - -#pragma pack(push, 1) -struct PinControlMainCommand { - IcdId message_id; - int32_t a_motor_rad; - int32_t b_motor_rad; -}; -#pragma pack(pop) - -#endif // PIN_CONTROL_MAIN_COMMAND_H \ No newline at end of file diff --git a/include/enum/icd_id.h b/include/enum/icd_id.h index 7078be4..9d1382d 100644 --- a/include/enum/icd_id.h +++ b/include/enum/icd_id.h @@ -41,9 +41,11 @@ enum class IcdId : uint16_t { CONTROL_TEST_MISSILE_TARGET_STATE = 0x001C, // 제어시험 미사일/표적 상태 (control_test_missile_target_state) CONTROL_TEST_ATTITUDE_FEEDBACK = - 0x001D // 제어시험 자세 피드백 (control_test_attitude_feedback) - COMM_RELIABLE_TEST = 0xFFF0, // 통신 신뢰성 테스트용 ICD ID (comm_reliable_test) - COMM_BIG_DATA_TEST = 0xFFF1 // 통신 대용량 데이터 테스트용 ICD ID (comm_big_data_test) + 0x001D, // 제어시험 자세 피드백 (control_test_attitude_feedback) + COMM_RELIABLE_TEST = + 0xFFF0, // 통신 신뢰성 테스트용 ICD ID (comm_reliable_test) + COMM_BIG_DATA_TEST = + 0xFFF1 // 통신 대용량 데이터 테스트용 ICD ID (comm_big_data_test) }; #endif // ICD_ID_H From e02ccd244d36541758911258f0223ebc503e1bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B6=80=EA=B1=B4?= Date: Mon, 27 Apr 2026 10:33:38 +0900 Subject: [PATCH 2/2] =?UTF-8?q?icd=5Fid=20fin=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/enum/icd_id.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/enum/icd_id.h b/include/enum/icd_id.h index 9d1382d..d722782 100644 --- a/include/enum/icd_id.h +++ b/include/enum/icd_id.h @@ -31,8 +31,8 @@ enum class IcdId : uint16_t { ACT_DATA = 0x0014, // ACT값(act_data) INS_MAIN_DATA = 0x0015, // INS실제값(ins_main_data) SKR_MAIN_DATA = 0x0016, // SKR실제값(skr_main_data) - PIN_CONTROL_MAIN_COMMAND = - 0x0017, // 핀제어실제명령(pin_control_main_command) + FIN_CONTROL_MAIN_COMMAND = + 0x0017, // 핀제어실제명령(fin_control_main_command) GUIDANCE_COMMAND = 0x0018, // 유도 명령 (guidance_command) MISSILE_TARGET_STATE = 0x0019, // 미사일/표적 참값 상태 (missile_target_state)