diff --git a/CHANGELOG.md b/CHANGELOG.md index 0243569f..41b24103 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,11 @@ change warranting a new major release: # [unreleased] +# [v1.28.1] + ## Fixed +- Patch version which compiles for EM - CFDP Funnel bugfix: CCSDS wrapping was buggy and works properly now. - CMakeLists.txt fix which broke CI/CD builds when server could not retrieve full git SHA. diff --git a/CMakeLists.txt b/CMakeLists.txt index 49a072f0..259234a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 1) set(OBSW_VERSION_MINOR 28) -set(OBSW_VERSION_REVISION 0) +set(OBSW_VERSION_REVISION 1) # set(CMAKE_VERBOSE TRUE) diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index 5a487daf..71f28a31 100644 --- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp +++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 257 translations. * @details - * Generated on: 2023-02-19 12:59:43 + * Generated on: 2023-02-21 10:44:59 */ #include "translateEvents.h" diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index 1f73b99c..08b7ac62 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 148 translations. - * Generated on: 2023-02-19 12:59:43 + * Generated on: 2023-02-21 10:44:59 */ #include "translateObjects.h" diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp index 1f94e0d6..1ab86196 100644 --- a/bsp_q7s/em/emObjectFactory.cpp +++ b/bsp_q7s/em/emObjectFactory.cpp @@ -28,8 +28,7 @@ void ObjectFactory::produce(void* args) { SerialComIF* uartComIF = nullptr; SpiComIF* spiMainComIF = nullptr; I2cComIF* i2cComIF = nullptr; - SpiComIF* spiRwComIF = nullptr; - createCommunicationInterfaces(&gpioComIF, &uartComIF, &spiMainComIF, &i2cComIF, &spiRwComIF); + createCommunicationInterfaces(&gpioComIF, &uartComIF, &spiMainComIF, &i2cComIF); /* Adding gpios for chip select decoding to the gpioComIf */ q7s::gpioCallbacks::initSpiCsDecoder(gpioComIF); gpioCallbacks::disableAllDecoder(gpioComIF); diff --git a/fsfw b/fsfw index c3279852..2efff4d2 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit c32798522283d89028b7c1ecd3bd33b8391e1a39 +Subproject commit 2efff4d2c5ef82b5b62567ab1bb0ee53aeed6a5a diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 5a487daf..71f28a31 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 257 translations. * @details - * Generated on: 2023-02-19 12:59:43 + * Generated on: 2023-02-21 10:44:59 */ #include "translateEvents.h" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 6e9163d6..b8deca09 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 153 translations. - * Generated on: 2023-02-19 12:59:43 + * Generated on: 2023-02-21 10:44:59 */ #include "translateObjects.h" diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 5a487daf..71f28a31 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 257 translations. * @details - * Generated on: 2023-02-19 12:59:43 + * Generated on: 2023-02-21 10:44:59 */ #include "translateEvents.h" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 6e9163d6..b8deca09 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 153 translations. - * Generated on: 2023-02-19 12:59:43 + * Generated on: 2023-02-21 10:44:59 */ #include "translateObjects.h" diff --git a/tmtc b/tmtc index 1bc38ea4..5f082cd9 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 1bc38ea4b507ac0e395c52d0b142ad598bb0817c +Subproject commit 5f082cd9fccdaa304f00d92c1f25cdd6a7d8ed0b