From ffbf7df55792738c10666b0e0ebe43406d6b3980 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 11:05:19 +0100 Subject: [PATCH 01/11] rename ploc supv and i2c dev symlinks --- bsp_q7s/boardconfig/busConf.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bsp_q7s/boardconfig/busConf.h b/bsp_q7s/boardconfig/busConf.h index 7b50af4e..a094c029 100644 --- a/bsp_q7s/boardconfig/busConf.h +++ b/bsp_q7s/boardconfig/busConf.h @@ -8,12 +8,14 @@ static constexpr uint32_t SPI_MAIN_BUS_LOCK_TIMEOUT = 50; static constexpr char SPI_RW_DEV[] = "/dev/spi_rw"; -static constexpr char I2C_PL_EIVE[] = "/dev/i2c_eive"; -static constexpr char I2C_PS_EIVE[] = "/dev/i2c-2"; +//! I2C bus using an I2C IP core in the programmable logic (PL) +static constexpr char I2C_PL_EIVE[] = "/dev/i2c_pl"; +//! I2C bus using the I2C peripheral of the ARM processing system (PS) +static constexpr char I2C_PS_EIVE[] = "/dev/i2c_ps"; static constexpr char UART_GNSS_DEV[] = "/dev/gps0"; static constexpr char UART_PLOC_MPSOC_DEV[] = "/dev/ul_plmpsoc"; -static constexpr char UART_PLOC_SUPERVSIOR_DEV[] = "/dev/ul_plsv"; +static constexpr char UART_PLOC_SUPERVSIOR_DEV[] = "/dev/ploc_supv"; static constexpr char UART_SYRLINKS_DEV[] = "/dev/ul_syrlinks"; static constexpr char UART_STAR_TRACKER_DEV[] = "/dev/ul_str"; static constexpr char UART_SCEX_DEV[] = "/dev/scex"; From d4acdb67bb4a7464a9479fa27a0bd41fa6c2b4ad Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 11:07:02 +0100 Subject: [PATCH 02/11] bump changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52b2d1a0..b9675d21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ list yields a list of all related PRs for each release. ## Changed - PLOC Supervisor: Changes baudrate to 921600 +- Renamed `/dev/ul-plsv` to `/dev/ploc_supv`, is not a UART lite anymore +- Renamed `/dev/i2c_eive` to `/dev/i2c_pl` and `/dev/i2c-2` to `/dev/i2c_ps`. # [v1.17.0] 28.11.2022 From a1c9fece1e1887305b4f28e42adc3a0454580dcc Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 11:08:34 +0100 Subject: [PATCH 03/11] bump changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9675d21..a4df75d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ list yields a list of all related PRs for each release. - PLOC Supervisor: Changes baudrate to 921600 - Renamed `/dev/ul-plsv` to `/dev/ploc_supv`, is not a UART lite anymore - Renamed `/dev/i2c_eive` to `/dev/i2c_pl` and `/dev/i2c-2` to `/dev/i2c_ps`. - + PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/328 # [v1.17.0] 28.11.2022 ## Added From fbf8f5ef6cdded72548fe6bac45b503d24dc1fd5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 16:55:55 +0100 Subject: [PATCH 04/11] bump tmtc --- generators/events/event_parser.py | 2 +- generators/objects/objects.py | 2 +- generators/returnvalues/returnvalues_parser.py | 2 +- tmtc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/events/event_parser.py b/generators/events/event_parser.py index 8ab88a1b..8c5ab35b 100644 --- a/generators/events/event_parser.py +++ b/generators/events/event_parser.py @@ -46,7 +46,7 @@ BSP_DIR_NAME = BSP_SELECT.value # Store this file in the root of the generators folder CSV_FILENAME = Path(f"{ROOT_DIR}/{BSP_SELECT.value}_events.csv") -CSV_COPY_DEST = Path(f"{OBSW_ROOT_DIR}/tmtc/config/events.csv") +CSV_COPY_DEST = Path(f"{OBSW_ROOT_DIR}/tmtc/eive_tmtc/config/events.csv") if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD: FSFW_CONFIG_ROOT = Path(f"{OBSW_ROOT_DIR}/linux/fsfwconfig") diff --git a/generators/objects/objects.py b/generators/objects/objects.py index c64a61ed..af8fec4b 100644 --- a/generators/objects/objects.py +++ b/generators/objects/objects.py @@ -43,7 +43,7 @@ CPP_COPY_DESTINATION = f"{FSFW_CONFIG_ROOT}/objects/" CPP_FILENAME = f"{os.path.dirname(os.path.realpath(__file__))}//translateObjects.cpp" CPP_H_FILENAME = f"{os.path.dirname(os.path.realpath(__file__))}//translateObjects.h" CSV_OBJECT_FILENAME = f"{ROOT_DIR}/{BSP_SELECT.value}_objects.csv" -CSV_COPY_DEST = f"{OBSW_ROOT_DIR}/tmtc/config/objects.csv" +CSV_COPY_DEST = f"{OBSW_ROOT_DIR}/tmtc/eive_tmtc/config/objects.csv" FILE_SEPARATOR = ";" diff --git a/generators/returnvalues/returnvalues_parser.py b/generators/returnvalues/returnvalues_parser.py index e79f79de..4f6f30e1 100644 --- a/generators/returnvalues/returnvalues_parser.py +++ b/generators/returnvalues/returnvalues_parser.py @@ -31,7 +31,7 @@ MAX_STRING_LENGTH = 32 BSP_SELECT = BspType.BSP_Q7S BSP_DIR_NAME = BSP_SELECT.value CSV_RETVAL_FILENAME = Path(f"{ROOT_DIR}/{BSP_SELECT.value}_returnvalues.csv") -CSV_COPY_DEST = Path(f"{OBSW_ROOT_DIR}/tmtc/config/returnvalues.csv") +CSV_COPY_DEST = Path(f"{OBSW_ROOT_DIR}/tmtc/eive_tmtc/config/returnvalues.csv") ADD_LINUX_FOLDER = False if BSP_SELECT == BspType.BSP_Q7S or BSP_SELECT == BspType.BSP_LINUX_BOARD: diff --git a/tmtc b/tmtc index 12f7b5bb..1483dc4d 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 12f7b5bb258f183b62a2ed27776d2385a728306e +Subproject commit 1483dc4d93898826b1cee645148f88995bbdc7a5 From 2b327bf3a7f6a12867ef565271f56d16eb4bea76 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 23:09:55 +0100 Subject: [PATCH 05/11] initialize a variable --- linux/devices/ploc/PlocSupvUartMan.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp index ee232f47..a246d97c 100644 --- a/linux/devices/ploc/PlocSupvUartMan.cpp +++ b/linux/devices/ploc/PlocSupvUartMan.cpp @@ -1132,7 +1132,7 @@ int PlocSupvUartManager::removeHdlcFramingWithCrcCheck(const uint8_t* src, size_ } // calc crc16 uint16_t calcCrc = calc_crc16_buff_reflected(dst, tlen - 2); - uint16_t crc; + uint16_t crc = 0; size_t dummy; SerializeAdapter::deSerialize(&crc, dst + tlen - 2, &dummy, SerializeIF::Endianness::LITTLE); if (calcCrc != crc) { From 84a3466b4d6dafa1b5526bc2f653df16ada91de5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 23:24:45 +0100 Subject: [PATCH 06/11] fixed array list min len 1 --- fsfw | 2 +- mission/system/tree/acsModeTree.cpp | 2 +- mission/system/tree/payloadModeTree.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsfw b/fsfw index 8eb869e0..5b0ea912 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 8eb869e073d99e257c6cc62dbf26b4d99422e9b8 +Subproject commit 5b0ea91222a6b8efb2f4562cfecbcb735dfeedd5 diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/tree/acsModeTree.cpp index 4e390985..d91c59fc 100644 --- a/mission/system/tree/acsModeTree.cpp +++ b/mission/system/tree/acsModeTree.cpp @@ -30,7 +30,7 @@ static const auto NML = DeviceHandlerIF::MODE_NORMAL; auto ACS_SEQUENCE_OFF = std::make_pair(acs::CtrlModes::OFF << 24, FixedArrayList()); auto ACS_TABLE_OFF_TGT = - std::make_pair((acs::CtrlModes::OFF << 24) | 1, FixedArrayList()); + std::make_pair((acs::CtrlModes::OFF << 24) | 1, FixedArrayList()); auto ACS_TABLE_OFF_TRANS = std::make_pair((acs::CtrlModes::OFF << 24) | 2, FixedArrayList()); diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp index 6cbc4004..0396cfc6 100644 --- a/mission/system/tree/payloadModeTree.cpp +++ b/mission/system/tree/payloadModeTree.cpp @@ -28,7 +28,7 @@ static const auto ON = HasModesIF::MODE_ON; static const auto NML = DeviceHandlerIF::MODE_NORMAL; auto PL_SEQUENCE_OFF = std::make_pair(OFF << 24, FixedArrayList()); -auto PL_TABLE_OFF_TGT = std::make_pair((OFF << 24) | 1, FixedArrayList()); +auto PL_TABLE_OFF_TGT = std::make_pair((OFF << 24) | 1, FixedArrayList()); auto PL_TABLE_OFF_TRANS_0 = std::make_pair((OFF << 24) | 2, FixedArrayList()); auto PL_TABLE_OFF_TRANS_1 = std::make_pair((OFF << 24) | 3, FixedArrayList()); From 5f929f6cf805fff498a5d4d49ef4c65f765a1059 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Nov 2022 17:26:33 +0100 Subject: [PATCH 07/11] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 1483dc4d..c421f3f5 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 1483dc4d93898826b1cee645148f88995bbdc7a5 +Subproject commit c421f3f5d78d77d23e42d1ccae79d7c6fc308431 From f73d293cdd72653bef7b3ffe82bb815f9ff3676a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Nov 2022 18:08:16 +0100 Subject: [PATCH 08/11] schedule PL task --- bsp_q7s/core/scheduling.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp_q7s/core/scheduling.cpp b/bsp_q7s/core/scheduling.cpp index f07eda32..5a8c3827 100644 --- a/bsp_q7s/core/scheduling.cpp +++ b/bsp_q7s/core/scheduling.cpp @@ -365,6 +365,7 @@ void scheduling::initTasks() { #if OBSW_ADD_PLOC_SUPERVISOR == 1 supvHelperTask->startTask(); #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */ + plTask->startTask(); #if OBSW_ADD_TEST_CODE == 1 taskStarter(testTasks, "Test task vector"); From d3252434aa88fe5d0aead95acee7bfcf9e799e8a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 1 Dec 2022 14:47:21 +0100 Subject: [PATCH 09/11] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 1483dc4d..6308bbb3 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 1483dc4d93898826b1cee645148f88995bbdc7a5 +Subproject commit 6308bbb3f0e4387508371bd3d18c52f404c4e18b From a726f7535def0e8e82480b190b3b650619f79500 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 1 Dec 2022 16:21:29 +0100 Subject: [PATCH 10/11] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 6308bbb3..6e152818 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 6308bbb3f0e4387508371bd3d18c52f404c4e18b +Subproject commit 6e152818707c7a12be8900bc239a0073053c0bec From 7d99d8e80507ad3e26d884d27ea5d331ef0f9b86 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 1 Dec 2022 16:30:39 +0100 Subject: [PATCH 11/11] bump minor version and changelog --- CHANGELOG.md | 3 ++- CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4df75d5..b52806a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). The [milestone](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestones) list yields a list of all related PRs for each release. -# [unreleased] +# [v1.18.0] 01.12.2022 ## Changed @@ -16,6 +16,7 @@ list yields a list of all related PRs for each release. - Renamed `/dev/ul-plsv` to `/dev/ploc_supv`, is not a UART lite anymore - Renamed `/dev/i2c_eive` to `/dev/i2c_pl` and `/dev/i2c-2` to `/dev/i2c_ps`. PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/328 + # [v1.17.0] 28.11.2022 ## Added diff --git a/CMakeLists.txt b/CMakeLists.txt index 5111b9ed..d87c2695 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1) -set(OBSW_VERSION_MINOR_IF_GIT_FAILS 17) +set(OBSW_VERSION_MINOR_IF_GIT_FAILS 18) set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0) # set(CMAKE_VERBOSE TRUE)