eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-21 10:45:51 +01:00
commit a91e6b7dfe
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
11 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,8 +17,11 @@ change warranting a new major release:
# [unreleased] # [unreleased]
# [v1.28.1]
## Fixed ## Fixed
- Patch version which compiles for EM
- CFDP Funnel bugfix: CCSDS wrapping was buggy and works properly now. - 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. - CMakeLists.txt fix which broke CI/CD builds when server could not retrieve full git SHA.

2
CMakeLists.txt
View File

@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
set(OBSW_VERSION_MAJOR 1) set(OBSW_VERSION_MAJOR 1)
set(OBSW_VERSION_MINOR 28) set(OBSW_VERSION_MINOR 28)
set(OBSW_VERSION_REVISION 0) set(OBSW_VERSION_REVISION 1)
# set(CMAKE_VERBOSE TRUE) # set(CMAKE_VERBOSE TRUE)

2
bsp_hosted/fsfwconfig/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 257 translations. * @brief Auto-generated event translation file. Contains 257 translations.
* @details * @details
* Generated on: 2023-02-19 12:59:43 * Generated on: 2023-02-21 10:44:59
*/ */
#include "translateEvents.h" #include "translateEvents.h"

2
bsp_hosted/fsfwconfig/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file. * @brief Auto-generated object translation file.
* @details * @details
* Contains 148 translations. * Contains 148 translations.
* Generated on: 2023-02-19 12:59:43 * Generated on: 2023-02-21 10:44:59
*/ */
#include "translateObjects.h" #include "translateObjects.h"

3
bsp_q7s/em/emObjectFactory.cpp
View File

@ -28,8 +28,7 @@ void ObjectFactory::produce(void* args) {
SerialComIF* uartComIF = nullptr; SerialComIF* uartComIF = nullptr;
SpiComIF* spiMainComIF = nullptr; SpiComIF* spiMainComIF = nullptr;
I2cComIF* i2cComIF = nullptr; I2cComIF* i2cComIF = nullptr;
SpiComIF* spiRwComIF = nullptr; createCommunicationInterfaces(&gpioComIF, &uartComIF, &spiMainComIF, &i2cComIF);
createCommunicationInterfaces(&gpioComIF, &uartComIF, &spiMainComIF, &i2cComIF, &spiRwComIF);
/* Adding gpios for chip select decoding to the gpioComIf */ /* Adding gpios for chip select decoding to the gpioComIf */
q7s::gpioCallbacks::initSpiCsDecoder(gpioComIF); q7s::gpioCallbacks::initSpiCsDecoder(gpioComIF);
gpioCallbacks::disableAllDecoder(gpioComIF); gpioCallbacks::disableAllDecoder(gpioComIF);

2
fsfw

@ -1 +1 @@
Subproject commit c32798522283d89028b7c1ecd3bd33b8391e1a39 Subproject commit 2efff4d2c5ef82b5b62567ab1bb0ee53aeed6a5a

2
generators/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 257 translations. * @brief Auto-generated event translation file. Contains 257 translations.
* @details * @details
* Generated on: 2023-02-19 12:59:43 * Generated on: 2023-02-21 10:44:59
*/ */
#include "translateEvents.h" #include "translateEvents.h"

2
generators/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file. * @brief Auto-generated object translation file.
* @details * @details
* Contains 153 translations. * Contains 153 translations.
* Generated on: 2023-02-19 12:59:43 * Generated on: 2023-02-21 10:44:59
*/ */
#include "translateObjects.h" #include "translateObjects.h"

2
linux/fsfwconfig/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/** /**
* @brief Auto-generated event translation file. Contains 257 translations. * @brief Auto-generated event translation file. Contains 257 translations.
* @details * @details
* Generated on: 2023-02-19 12:59:43 * Generated on: 2023-02-21 10:44:59
*/ */
#include "translateEvents.h" #include "translateEvents.h"

2
linux/fsfwconfig/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file. * @brief Auto-generated object translation file.
* @details * @details
* Contains 153 translations. * Contains 153 translations.
* Generated on: 2023-02-19 12:59:43 * Generated on: 2023-02-21 10:44:59
*/ */
#include "translateObjects.h" #include "translateObjects.h"

2
tmtc

@ -1 +1 @@
Subproject commit 1bc38ea4b507ac0e395c52d0b142ad598bb0817c Subproject commit 5f082cd9fccdaa304f00d92c1f25cdd6a7d8ed0b