Merge pull request #634 from ut-issl/feature/update_hils

最新のs2e-coreでHILSが動かせるようにする
ut-issl · Apr 25, 2024 · db02f9f · db02f9f
2 parents 520ed7e + fd7504b
commit db02f9f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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/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.

diff --git 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>