Skip to content

Commit

Permalink
Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
crnicholson committed Nov 29, 2024
1 parent be2370f commit 7a713a7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Code/.DS_Store
Binary file not shown.
8 changes: 4 additions & 4 deletions Code/groundStation/uploader/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,13 @@ def input_thread():
)


# Main WebSocket server coroutine
# Main WebSocket server coroutine.
async def main():
print(f"Starting server on ws://0.0.0.0:{PORT}")
async with websockets.serve(handle_connection, "0.0.0.0", PORT):
await asyncio.Future() # Run forever
await asyncio.Future() # Run forever.


# Run the server
if __name__ == "__main__":
asyncio.run(main())
threading.Thread(target=input_thread).start()
asyncio.run(main())
7 changes: 7 additions & 0 deletions Code/groundStation/websockets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ void websocketsSetup() {
Serial.print("Got Message: ");
Serial.println(message.data());
#endif
JsonDocument doc;
deserializeJson(doc, message.data());

const char *sensor = doc["sensor"];
long time = doc["time"];
double latitude = doc["data"][0];
double longitude = doc["data"][1];
});
}

Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ Do you have any questions? Are the docs incomplete and you want to ask anything?

Reach out to me at [charlienicholsonr@gmail.com](mailto:charlienicholsonr@gmail.com).

## Flights

# Mid August

The glider was realeased from 5,000 feet. You can see the launch video [here](https://www.youtube.com/watch?v=DZU_8TDUlJg). You can find data on the release [here](https://www.youtube.com/watch?v=TiqkcGWG4g8).

Check failure on line 239 in README.md

View workflow job for this annotation

GitHub Actions / spellcheck

realeased ==> released

## License

Both the software and documentation are under the [GNU GPL v3 license](https://choosealicense.com/licenses/gpl-3.0/). The hardware and the 3D files are under the [CERN Open Hardware Licence Version 2 - Strongly Reciprocal](https://choosealicense.com/licenses/cern-ohl-s-2.0/). The media is under the [CC BY 4.0 DEED](https://creativecommons.org/licenses/by/4.0/).

0 comments on commit 7a713a7

Please sign in to comment.