Skip to content

Commit 4e1b17c

Browse files
committed
Merge branch 'charles/ground-station-cli-sideview' of github.com:UWOrbital/OBC-firmware into charles/ground-station-cli-sideview
2 parents 7ea5da0 + d090c66 commit 4e1b17c

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ endif()
6565
add_subdirectory(libs)
6666

6767
# Build interface libs
68-
add_subdirectory(interfaces)
68+
add_subdirectory(interfaces)

gs/backend/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ elseif(WIN32)
4343
CSerialPort
4444
setupapi
4545
)
46-
endif()
46+
endif()

gs/backend/tmux_cli.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66

77
def main() -> None:
8+
"""
9+
Set up a tmux session with two panes: one for logs, one for the CLI.
10+
"""
811
if len(argv) != 2:
912
print("One argument needed: Com Port")
1013
return
@@ -23,7 +26,9 @@ def main() -> None:
2326

2427
# Initialize gs cli
2528
pane2.send_keys(
26-
f"source .venv/bin/activate && tmux source-file .tmux.conf && python3.11 gs/backend/ground_station_cli.py {com_port}"
29+
"source .venv/bin/activate && "
30+
"tmux source-file .tmux.conf && "
31+
f"python3.11 gs/backend/ground_station_cli.py {com_port}"
2732
)
2833

2934
# Sleep to allow appropriate time for cli setup

0 commit comments

Comments
 (0)