From 715b1ff5a6c73aca74f7f672c2b1947ee32ea3ca Mon Sep 17 00:00:00 2001
From: "MYCOMPUTER\\nlab" <h-sekine@g.ecc.u-tokyo.ac.jp>
Date: Fri, 15 Mar 2024 17:31:20 +0900
Subject: [PATCH 1/2] modify include

---
 src/components/CMakeLists.txt             | 4 ++--
 src/simulation/hils/hils_port_manager.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt
index 36d90a7b8..b5d49d1c7 100644
--- a/src/components/CMakeLists.txt
+++ b/src/components/CMakeLists.txt
@@ -57,8 +57,8 @@ ports/i2c_port.cpp
 if(USE_HILS)
   set(SOURCE_FILES
     ${SOURCE_FILES}
-    hils/ports/hils_uart_port.cpp
-    hils/ports/hils_i2c_target_port.cpp
+    ports/hils_uart_port.cpp
+    ports/hils_i2c_target_port.cpp
   )
 endif()
 
diff --git a/src/simulation/hils/hils_port_manager.hpp b/src/simulation/hils/hils_port_manager.hpp
index d4db5958e..9fbeaf2c7 100644
--- a/src/simulation/hils/hils_port_manager.hpp
+++ b/src/simulation/hils/hils_port_manager.hpp
@@ -7,8 +7,8 @@
 #define S2E_SIMULATION_HILS_HILS_PORT_MANAGER_HPP_
 
 #ifdef USE_HILS
-#include "ports/hils_i2c_target_port.hpp"
-#include "ports/hils_uart_port.hpp"
+#include "../../components/ports/hils_i2c_target_port.hpp"
+#include "../../components/ports/hils_uart_port.hpp"
 #endif
 #include <map>
 

From 6f95f218ffa2fba659e77b51a3a7bb09e83ebb33 Mon Sep 17 00:00:00 2001
From: hirotaka_sekine <h-sekine@g.ecc.u-tokyo.ac.jp>
Date: Tue, 26 Mar 2024 18:44:41 +0900
Subject: [PATCH 2/2] restore changes

---
 src/components/ports/hils_i2c_target_port.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/ports/hils_i2c_target_port.hpp b/src/components/ports/hils_i2c_target_port.hpp
index a9e2c8663..08437cbc4 100644
--- a/src/components/ports/hils_i2c_target_port.hpp
+++ b/src/components/ports/hils_i2c_target_port.hpp
@@ -10,6 +10,9 @@
 
 #include "hils_uart_port.hpp"
 
+const unsigned int kDefaultCommandSize = 0xff;  //!< Default command size
+const unsigned int kDefaultTxSize = 0xff;       //!< Default TX size
+
 /**
  * @class HilsI2cTargetPort
  * @brief Class to control I2C-USB converter for the target(device) side from COM port
@@ -93,8 +96,6 @@ class HilsI2cTargetPort : public HilsUartPort {
   int GetStoredFrameCounter();
 
  private:
-  const unsigned int kDefaultCommandSize = 0xff;  //!< Default command size
-  const unsigned int kDefaultTxSize = 0xff;       //!< Default TX size
   unsigned char max_register_number_ = 0xff;      //!< Maximum register number
   unsigned char saved_register_address_ = 0x00;   //!< Saved register address
   unsigned int stored_frame_counter_ = 0;         //!< Send a few frames of telemetry to the converter in advance.