Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main into develop for hotfix #670 #671

Merged
merged 6 commits into from
Aug 23, 2024
Merged

Merge main into develop for hotfix #670 #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53be057
Add const getter of PowerPort in PowerControlUnit
conjikidow Aug 20, 2024
0f09a51
Merge pull request #670 from ut-issl/hotfix/add-const-powerport-getter
conjikidow Aug 22, 2024
2a54837
Update patch version to v7.2.8
conjikidow Aug 22, 2024
854d7c2
Fix typo in comment
conjikidow Aug 23, 2024
299169c
Merge pull request #673 from ut-issl/hotfix/fix-typo
conjikidow Aug 23, 2024
518e9a9
Merge pull request #672 from ut-issl/hotfix/update-patch-version-v7.2.8
conjikidow Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/components/real/cdh/on_board_computer_with_c2a.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/components/real/power/power_control_unit.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
/**
Expand Down
Loading