Report Page Functionality

.github/workflows/linter.yml

@@ -13,23 +13,10 @@ jobs:
     name: Lint Backend
     runs-on: ubuntu-latest
     steps:
-      - name: Install Go
-        uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
           go-version: 1.19
-
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-          token: ${{ secrets.SSH_TOKEN }}
-
-      - name: Install dependencies
-        run: make install-dependencies
-
-      - name: Build Protos
-        run: make build-protos
-
+      - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

.github/workflows/test.yml

@@ -25,15 +25,10 @@ jobs:
       - name: Install dependencies
         run: make install-dependencies
 
-      - name: Build Protos
-        run: make build-protos
-
       - name: Test
         run: |
           go test -race ./...
 
-  # TODO: include protobuf installation and compilation steps here, once we actually start
-  # writing tests that need to run on the frontend.
   Jest:
     name: Test Frontend
     runs-on: ubuntu-latest

.gitignore

@@ -8,6 +8,4 @@ influx_token.key
 *.mp3
 
 **/*.pb.go
-**/*.pb.ts
-flight-logs
-
+**/*.pb.ts

Makefile

@@ -6,11 +6,7 @@ all: build run
 
 # Dependencies
 # --------------------------------------------------------------------
-.PHONY: install-dependencies install-linter install-protos install-fmter
-
-install-dependencies: install-linter install-protos install-fmter
-	cd houston && npm install
-
+.PHONY: install-linter
 install-linter:
 	# TODO: might as well just move this all to an install-linter script
 	$(info Installing golangci-lint for $(OS))
@@ -22,16 +18,17 @@ install-linter:
 	fi;\
 
 install-protos:
-	sudo apt install protobuf-compiler
-	go install google.golang.org/protobuf/cmd/[email protected]
-	echo "You will need to set your PATH variable to include go installations, if you have not already done so."
+	git submodule init && git submodule update
 
 install-fmter:
 	go install golang.org/x/tools/cmd/goimports@latest
 
+install-assets:
+	./scripts/pull-large-assets.sh
+
 # Build
 # --------------------------------------------------------------------
-.PHONY: pre-build build configure-git build-go build-react build-docker build-protos build-backend-protos build-frontend-protos
+.PHONY: pre-build build install-dependencies configure-git build-go build-react build-docker build-protos build-backend-protos build-frontend-protos
 pre-build: configure-git 
 
 build: build-go build-react build-protos
@@ -58,14 +55,11 @@ internal/protos/houston.pb.go: protos/houston.proto
 internal/protos/obc.pb.go: protos/obc.proto
 	protoc -I=./protos/ --go_out=./internal/protos/ --go_opt=paths=source_relative ./protos/obc.proto
 
-build-frontend-protos: houston/src/protos/houston.pb.ts houston/src/protos/obc.pb.ts
+build-frontend-protos: houston/src/protos/houston.pb.ts
 
 houston/src/protos/houston.pb.ts: protos/houston.proto
 	protoc --plugin=houston/node_modules/.bin/protoc-gen-ts_proto --ts_proto_opt=fileSuffix=.pb --ts_proto_out=./houston/src/ ./protos/houston.proto
 
-houston/src/protos/obc.pb.ts: protos/obc.proto
-	protoc --plugin=houston/node_modules/.bin/protoc-gen-ts_proto --ts_proto_opt=fileSuffix=.pb --ts_proto_out=./houston/src/ ./protos/obc.proto
-
 
 # Run
 # --------------------------------------------------------------------
@@ -85,12 +79,6 @@ run-compose:
 stop-compose:
 	docker compose -f deployments/docker-compose.yml down
 
-run-compose-mac:
-	docker-compose -f deployments/docker-compose-mac.yml up -d
-
-stop-compose-mac:
-	docker-compose -f deployments/docker-compose-mac.yml down
-
 run-broach-compose:
 	docker compose -f deployments/broach-docker-compose.yml up -d
 

build/package/Dockerfile

@@ -26,7 +26,6 @@ RUN --mount=target=. \
 
 COPY ./houston/dist/ /build/houston/
 
-RUN mkdir /CSV
 # go build mounts code read-only without copying to container,
 # so you have to put binary in another folder
 CMD ["/output/gcs"]

deployments/broach-docker-compose.yml

@@ -22,7 +22,6 @@ services:
       - HUB_PATH=/go/src/github.com/tritonuas/gcs
     volumes:
       - missions:/go/src/github.com/tritonuas/gcs/missions
-      - ../flight-logs:/CSV
     devices:
       - /dev/ttyUSB0:/dev/ttyUSB0
     extra_hosts:

deployments/docker-compose.yml

@@ -3,12 +3,12 @@ version: "3"
 services:
   gcs:
     image: tritonuas/gcs
-    network_mode: "host"
-    # ports:
-    #   - 5000:5000
+    # network_mode: "host"
+    ports:
+       - 5000:5000
     environment:
       - DEBUG_MODE=true
-      - OBC_ADDR=localhost:5010
+      - OBC_ADDR=192.168.1.51:5010
       - ANTENNA_TRACKER_IP=192.168.1.36
       - ANTENNA_TRACKER_PORT=4000
       - MAV_DEVICE=tcp:localhost:5760
@@ -21,7 +21,6 @@ services:
       - HUB_PATH=/go/src/github.com/tritonuas/gcs
     volumes:
       - missions:/go/src/github.com/tritonuas/gcs/missions
-      - ../flight-logs:/CSV
     extra_hosts:
       - host.docker.internal:host-gateway