From cf2fb54cc16f7547ac2f267f1c40b4885cf96a9e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 22 Mar 2023 21:25:24 +0100 Subject: [PATCH 1/2] unfassbar --- bsp_q7s/core/ObjectFactory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index e6ff27fb..d2d7708a 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -780,7 +780,7 @@ ReturnValue_t ObjectFactory::createCcsdsComponents(CcsdsComponentArgs& args) { PtmeGpios gpios; 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; *args.ipCoreHandler = From 9b088a22b4810ae00cdbc19f87a7b74c6a51363d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 22 Mar 2023 21:33:35 +0100 Subject: [PATCH 2/2] prep v1.39.1 --- CHANGELOG.md | 3 +++ CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1c6de0..c387a4a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,10 +16,13 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +# [v1.39.1] 2023-03-22 + ## Fixed - Bugfix for STR: Some action commands wrongfully declined. - 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index eca97197..8a966ea9 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 39) -set(OBSW_VERSION_REVISION 0) +set(OBSW_VERSION_REVISION 1) # set(CMAKE_VERBOSE TRUE)