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

v1.9.0 #175

Merged
muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00
Conversation 0 Commits 623 Files Changed 417 +3 -2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 18f7d3e3c9 - Show all commits

2
common/config/commonConfig.h.in
View File

@ -10,7 +10,7 @@
// CCSDS IP Cores. // CCSDS IP Cores.
#define OBSW_USE_CCSDS_IP_CORE 1 #define OBSW_USE_CCSDS_IP_CORE 1
// Set to 1 if all telemetry should be sent to the PTME IP Core // Set to 1 if all telemetry should be sent to the PTME IP Core
#define OBSW_TM_TO_PTME 0 #define OBSW_TM_TO_PTME 1
// Set to 1 if telecommands are received via the PDEC IP Core // Set to 1 if telecommands are received via the PDEC IP Core
#define OBSW_TC_FROM_PDEC 0 #define OBSW_TC_FROM_PDEC 0

2
linux/fsfwconfig/OBSWConfig.h.in
View File

@ -86,7 +86,7 @@ debugging. */
#define OBSW_TEST_TE7020_HEATER 0 #define OBSW_TEST_TE7020_HEATER 0
#define OBSW_TEST_GPIO_OPEN_BY_LABEL 0 #define OBSW_TEST_GPIO_OPEN_BY_LABEL 0
#define OBSW_TEST_GPIO_OPEN_BY_LINE_NAME 0 #define OBSW_TEST_GPIO_OPEN_BY_LINE_NAME 0
#define OBSW_LINK_IS_UP 0 #define OBSW_LINK_IS_UP 1
#define OBSW_DEBUG_P60DOCK 0 #define OBSW_DEBUG_P60DOCK 0
#define OBSW_DEBUG_PDU1 0 #define OBSW_DEBUG_PDU1 0

1
scripts/q7s-port.sh
View File

@ -7,5 +7,6 @@ echo "-L 1536:192.168.133.10:7301 for TMTC commanding"
ssh -L 1534:192.168.133.10:1534 \ ssh -L 1534:192.168.133.10:1534 \
-L 1535:192.168.133.10:22 \ -L 1535:192.168.133.10:22 \
-L 1536:192.168.133.10:7301 \ -L 1536:192.168.133.10:7301 \
-L 1537:192.168.133.10:7100 \
eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 \ eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 \
-t 'CONSOLE_PREFIX="[Q7S Tunnel]" /bin/bash' -t 'CONSOLE_PREFIX="[Q7S Tunnel]" /bin/bash'