Skip to content

Commit

Permalink
Merge branch 'tj-uav:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
IshanA2007 authored Jan 6, 2024
2 parents ca1f430 + a0e1026 commit 6e2155d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 23.10.0
rev: 23.12.1
hooks:
- id: black
args: [-l, '99']
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# GroundStation

[![wakatime](https://wakatime.com/badge/github/tj-uav/GroundStation.svg)](https://wakatime.com/badge/github/tj-uav/GroundStation)

TJUAV's Custom Ground Station

## Set Up Server
Expand Down Expand Up @@ -144,4 +146,4 @@ changes are made, how they are implemented, other notes, and add TJUAV programme

Commit messages should be helpful, and not silly. As a rule of thumb, programmers with knowledge of how the entire
Ground Station works should know what your commit does just by the message. Do not commit something that is incomplete,
unreviewed, or untested. Commits should represent a working self-contained block of your work.
unreviewed, or untested. Commits should represent a working self-contained block of your work.
6 changes: 6 additions & 0 deletions server/handlers/uav.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,12 @@ def load_commands(self):
except Exception as e:
raise GeneralError(str(e)) from e

def clear_commands(self):
try:
return {}
except Exception as e:
raise GeneralError(str(e)) from e

# Armed

def get_armed(self):
Expand Down

0 comments on commit 6e2155d

Please sign in to comment.