From c2da64d8317589496e77fb65449b259f1f7a6ef3 Mon Sep 17 00:00:00 2001 From: AnKdy1227 <123557052+AnKdy1227@users.noreply.github.com> Date: Thu, 23 Apr 2026 15:51:30 +0900 Subject: [PATCH 1/3] act parameter name change theta -> rad --- include/dto/act_data.h | 4 ++-- include/dto/act_info.h | 3 ++- include/dto/pin_control_main_command.h | 4 ++-- include/dto/pin_control_req.h | 4 ++-- include/fsm/{act_status.h => act_status.hpp} | 0 include/fsm/gcu_status.hpp | 16 ++++++++++++++++ include/fsm/{ins_status.h => ins_status.hpp} | 0 7 files changed, 24 insertions(+), 7 deletions(-) rename include/fsm/{act_status.h => act_status.hpp} (100%) create mode 100644 include/fsm/gcu_status.hpp rename include/fsm/{ins_status.h => ins_status.hpp} (100%) diff --git a/include/dto/act_data.h b/include/dto/act_data.h index a7468e2..91c3666 100644 --- a/include/dto/act_data.h +++ b/include/dto/act_data.h @@ -8,9 +8,9 @@ #pragma pack(push, 1) struct ActData { IcdId message_id; - int32_t a_motor_theta; + int32_t a_motor_rad; int32_t a_motor_omega; - int32_t b_motor_theta; + int32_t b_motor_rad; int32_t b_motor_omega; }; #pragma pack(pop) diff --git a/include/dto/act_info.h b/include/dto/act_info.h index 55bff19..02d18cb 100644 --- a/include/dto/act_info.h +++ b/include/dto/act_info.h @@ -4,10 +4,11 @@ #include #include "../enum/icd_id.h" -#include "../fsm/act_status.h" +#include "../fsm/act_status.hpp" #include "act_data.h" #include "common_parameter.h" + #pragma pack(push, 1) struct ActInfo { IcdId message_id; diff --git a/include/dto/pin_control_main_command.h b/include/dto/pin_control_main_command.h index 7d2d5bc..b7e8925 100644 --- a/include/dto/pin_control_main_command.h +++ b/include/dto/pin_control_main_command.h @@ -8,8 +8,8 @@ #pragma pack(push, 1) struct PinControlMainCommand { IcdId message_id; - int32_t a_motor_theta; - int32_t b_motor_theta; + int32_t a_motor_rad; + int32_t b_motor_rad; }; #pragma pack(pop) diff --git a/include/dto/pin_control_req.h b/include/dto/pin_control_req.h index 0b22ca0..c604677 100644 --- a/include/dto/pin_control_req.h +++ b/include/dto/pin_control_req.h @@ -8,8 +8,8 @@ #pragma pack(push, 1) struct PinControlReq { IcdId message_id; - int32_t a_motor_theta; - int32_t b_motor_theta; + int32_t a_motor_rad; + int32_t b_motor_rad; }; #pragma pack(pop) diff --git a/include/fsm/act_status.h b/include/fsm/act_status.hpp similarity index 100% rename from include/fsm/act_status.h rename to include/fsm/act_status.hpp diff --git a/include/fsm/gcu_status.hpp b/include/fsm/gcu_status.hpp new file mode 100644 index 0000000..712311d --- /dev/null +++ b/include/fsm/gcu_status.hpp @@ -0,0 +1,16 @@ +#ifndef GcuStatus_H +#define GcuStatus_H + +#include + +enum class GcuStatus : uint8_t { + INIT, // 초기화, + READY, // 대기, + CHECK, // 점검 + LAUNCH, // 발사 + INERTIAL_GUIDANCE, // 관성유도 + TERMINAL_GUIDANCE, // 종말유도 + AIRBURST // 비상폭발 +}; + +#endif // GcuStatus_H \ No newline at end of file diff --git a/include/fsm/ins_status.h b/include/fsm/ins_status.hpp similarity index 100% rename from include/fsm/ins_status.h rename to include/fsm/ins_status.hpp From 811610d7225783aa38f70f3afca631ab1b67624d Mon Sep 17 00:00:00 2001 From: AnKdy1227 <123557052+AnKdy1227@users.noreply.github.com> Date: Thu, 23 Apr 2026 16:05:34 +0900 Subject: [PATCH 2/3] =?UTF-8?q?gcu=5Fstatus.hpp=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/fsm/gcu_status.hpp | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 include/fsm/gcu_status.hpp diff --git a/include/fsm/gcu_status.hpp b/include/fsm/gcu_status.hpp deleted file mode 100644 index 712311d..0000000 --- a/include/fsm/gcu_status.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef GcuStatus_H -#define GcuStatus_H - -#include - -enum class GcuStatus : uint8_t { - INIT, // 초기화, - READY, // 대기, - CHECK, // 점검 - LAUNCH, // 발사 - INERTIAL_GUIDANCE, // 관성유도 - TERMINAL_GUIDANCE, // 종말유도 - AIRBURST // 비상폭발 -}; - -#endif // GcuStatus_H \ No newline at end of file From facb2c800adf978691de2d477e4f9054303e99ec Mon Sep 17 00:00:00 2001 From: AnKdy1227 <123557052+AnKdy1227@users.noreply.github.com> Date: Thu, 23 Apr 2026 17:36:24 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fsm=20=ED=97=A4=EB=8D=94=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20hpp->h=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/fsm/{act_status.hpp => act_status.h} | 0 include/fsm/{ins_status.hpp => ins_status.h} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename include/fsm/{act_status.hpp => act_status.h} (100%) rename include/fsm/{ins_status.hpp => ins_status.h} (100%) diff --git a/include/fsm/act_status.hpp b/include/fsm/act_status.h similarity index 100% rename from include/fsm/act_status.hpp rename to include/fsm/act_status.h diff --git a/include/fsm/ins_status.hpp b/include/fsm/ins_status.h similarity index 100% rename from include/fsm/ins_status.hpp rename to include/fsm/ins_status.h