Release v1.2.0 #47

Merged
meierj merged 229 commits from develop into master 2021-06-21 17:58:40 +02:00
5 changed files with 4 additions and 5 deletions
Showing only changes of commit e4a715e24c - Show all commits

View File

@ -45,7 +45,6 @@
#include <fsfw/tmtcservices/PusServiceBase.h> #include <fsfw/tmtcservices/PusServiceBase.h>
#include <fsfw/osal/linux/TmTcUnixUdpBridge.h> #include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
#include <fsfw/tmtcpacket/pus/TmPacketStored.h> #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
#include <fsfw/osal/linux/TcUnixUdpPollingTask.h>
#include <fsfw/datapoollocal/LocalDataPoolManager.h> #include <fsfw/datapoollocal/LocalDataPoolManager.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h> #include <fsfw/tmtcservices/CommandingServiceBase.h>

2
fsfw

@ -1 +1 @@
Subproject commit 42720e6f7d64bdd9a1ac0cea5846c9a8cedea0ff Subproject commit 18a9729c75875f8bee674f03dd93a5eeeb657a66

@ -1 +1 @@
Subproject commit 14fe32572d62db9d19707dc1f9bb6fecb1993b73 Subproject commit 7a3190e5b6980ad2addc5e8a76d21994b542f0e0

View File

@ -19,7 +19,7 @@ debugging. */
#define OBSW_ADD_TEST_CODE 1 #define OBSW_ADD_TEST_CODE 1
#define TEST_LIBGPIOD 0 #define TEST_LIBGPIOD 0
#define TE0720 1 #define TE0720 0
#define P60DOCK_DEBUG 0 #define P60DOCK_DEBUG 0
#define PDU1_DEBUG 0 #define PDU1_DEBUG 0

2
tmtc

@ -1 +1 @@
Subproject commit 73105138050b5661a6cff76e1d64af40981f9c7f Subproject commit 79e897b0353acacf0f986f22f57e9cd8cf30a0da