Merge pull request #671 from ut-issl/main

Merge main into develop for hotfix #670
ut-issl · Aug 23, 2024 · d94af62 · d94af62
2 parents 768107b + 518e9a9
commit d94af62
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13)
 project(S2E
   LANGUAGES CXX
   DESCRIPTION "S2E: Spacecraft Simulation Environment"
-  VERSION 7.2.7
+  VERSION 7.2.8
 )
 
 # build config
@@ -109,7 +109,7 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 
 ## cspice library
 if(APPLE)
-  if(APPLE_SILICON)  
+  if(APPLE_SILICON)
     # APPLE Silicon
     set(CSPICE_LIB_DIR ${CSPICE_DIR}/cspice_apple_silicon64/lib)
   else()
@@ -151,7 +151,7 @@ endif()
 ## nrlmsise00 library
 if(CYGWIN)
   SET (CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-  find_library(NRLMSISE00_LIB 
+  find_library(NRLMSISE00_LIB
     NAMES libnrlmsise00.a
     PATHS ${NRLMSISE00_DIR}/lib)
 elseif(UNIX)
@@ -167,11 +167,11 @@ elseif(UNIX)
 elseif(WIN32)
   SET (CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
   if(BUILD_64BIT)
-    find_library(NRLMSISE00_LIB 
+    find_library(NRLMSISE00_LIB
       NAMES libnrlmsise00.lib
       PATHS ${NRLMSISE00_DIR}/lib64)
   else()
-    find_library(NRLMSISE00_LIB 
+    find_library(NRLMSISE00_LIB
       NAMES libnrlmsise00.lib
       PATHS ${NRLMSISE00_DIR}/lib)
   endif()

diff --git a/src/components/real/cdh/on_board_computer_with_c2a.hpp b/src/components/real/cdh/on_board_computer_with_c2a.hpp
@@ -55,7 +55,7 @@ class ObcWithC2a : public OnBoardComputer {
    */
   int ConnectComPort(int port_id, int tx_buffer_size, int rx_buffer_size) override;
   /**
-   * @fn ConnectComPort
+   * @fn CloseComPort
    * @brief Close UART communication port between OnBoardComputer and a component
    * @param [in] port_id: Port ID
    * @return -1: error, 0: success

diff --git a/src/components/real/power/power_control_unit.hpp b/src/components/real/power/power_control_unit.hpp
@@ -61,7 +61,8 @@ class PowerControlUnit : public Component, public ILoggable {
    * @brief Return power port information
    * @param port_id: Power port ID
    */
-  inline PowerPort* GetPowerPort(const int port_id) { return power_ports_[port_id]; };
+  inline PowerPort* GetPowerPort(const int port_id) { return power_ports_.at(port_id); };
+  inline const PowerPort* GetPowerPort(const int port_id) const { return power_ports_.at(port_id); };
 
   // Port control functions
   /**