From 53be05747a6f23dbad2e643d2accebed2e5a28da Mon Sep 17 00:00:00 2001 From: Riki Nakamura Date: Tue, 20 Aug 2024 11:14:10 +0900 Subject: [PATCH 1/3] Add const getter of PowerPort in PowerControlUnit --- src/components/real/power/power_control_unit.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/real/power/power_control_unit.hpp b/src/components/real/power/power_control_unit.hpp index efb75b98e..b35667763 100644 --- 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 /** From 2a548370fb6aa85b29190dc7349275971eabdabd Mon Sep 17 00:00:00 2001 From: Riki Nakamura Date: Thu, 22 Aug 2024 13:13:00 +0900 Subject: [PATCH 2/3] Update patch version to v7.2.8 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1c61b9a3..cb31f52dd 100644 --- 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 @@ -105,7 +105,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() @@ -147,7 +147,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) @@ -163,11 +163,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() From 854d7c2307a6f93497db0c6aee8fa61503562a25 Mon Sep 17 00:00:00 2001 From: Riki Nakamura Date: Fri, 23 Aug 2024 13:42:15 +0900 Subject: [PATCH 3/3] Fix typo in comment --- src/components/real/cdh/on_board_computer_with_c2a.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/real/cdh/on_board_computer_with_c2a.hpp b/src/components/real/cdh/on_board_computer_with_c2a.hpp index c194f70e4..5d6d4fcb4 100644 --- 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