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

unfassbar #513

Merged
muellerr merged 2 commits from unfassbar into develop 2023-03-22 20:33:42 +01:00
Conversation 0 Commits 2 Files Changed 3 +5 -2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -16,10 +16,13 @@ will consitute of a breaking change warranting a new major release:
# [unreleased] # [unreleased]
# [v1.39.1] 2023-03-22
## Fixed ## Fixed
- Bugfix for STR: Some action commands wrongfully declined. - Bugfix for STR: Some action commands wrongfully declined.
- STR: No normal command handling while a special request like an image upload is active. - STR: No normal command handling while a special request like an image upload is active.
- RS485 data line was not enabled when the transmitter was switched on.
# [v1.39.0] 2023-03-21 # [v1.39.0] 2023-03-21

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 39) set(OBSW_VERSION_MINOR 39)
set(OBSW_VERSION_REVISION 0) set(OBSW_VERSION_REVISION 1)
# set(CMAKE_VERBOSE TRUE) # set(CMAKE_VERBOSE TRUE)

2
bsp_q7s/core/ObjectFactory.cpp
View File

@ -780,7 +780,7 @@ ReturnValue_t ObjectFactory::createCcsdsComponents(CcsdsComponentArgs& args) {
PtmeGpios gpios; PtmeGpios gpios;
gpios.enableTxClock = gpioIds::RS485_EN_TX_CLOCK; gpios.enableTxClock = gpioIds::RS485_EN_TX_CLOCK;
gpios.enableTxData = gpioIds::RS485_EN_TX_CLOCK; gpios.enableTxData = gpioIds::RS485_EN_TX_DATA;
gpios.ptmeResetn = gpioIds::PTME_RESETN; gpios.ptmeResetn = gpioIds::PTME_RESETN;
*args.ipCoreHandler = *args.ipCoreHandler =