GS USB Streaming #374
Merged
GS USB Streaming #374
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbinz
force-pushed
the
gs-usb-streaming
branch
from
aabab82 to
c8b71b9
Compare
jbinz
requested review from
stojadin2701 and
l-jost
and removed request for
stojadin2701
jbinz
force-pushed
the
gs-usb-streaming
branch
from
496ce34 to
4954d9d
Compare
ground_station/src/main.cpp
Outdated
| @@ -67,29 +68,51 @@ void loop() { | |||
|
|
|||
| // In single mode, both antennas track the same rocket | |||
| if (systemConfig.config.receiverMode == SINGLE) { | |||
| const bool link1DataValid = (link1.data.lat() != 0) && (link1.data.lon() != 0); | |||
| const bool link2DataValid = (link2.data.lat() != 0) && (link2.data.lon() != 0); | |||
| const bool link1GPSValid = (link1.data.lat() != 0) && (link1.data.lon() != 0); | |||
There was a problem hiding this comment.
Correct naming: link1GpsValid, also link2GpsValid
| @@ -83,5 +82,5 @@ void Parser::cmdGNSSTime(uint8_t *args, uint32_t length) { | |||
|
|
|||
| // NOLINTNEXTLINE(readability-convert-member-functions-to-static) function ptr doesn't work if it's static | |||
| void Parser::cmdGNSSInfo(uint8_t *args [[maybe_unused]], uint32_t length [[maybe_unused]]) { | |||
| console.log.println("GNSS Info Received"); | |||
| // To Do: Do Something | |||
| const auto voltage_prec = static_cast<int32_t>((link->data.voltage() - static_cast<float>(voltage_int)) * 10.0F); | ||
|
|
||
| std::snprintf(print_char, 150, | ||
| "Link %d: Ts: %ld.%ld, State: %d, Lat: %ld.%05ld, Lon: %ld.%05ld, Alt: %ld, Vel: %d, V: %ld.%ld", |
There was a problem hiding this comment.
can you paste some sample output
| @@ -43,6 +41,9 @@ void setup() { | |||
|
|
|||
| void loop() { | |||
| static bool ini{false}; | |||
| static uint16_t link1LastTs{0}; | |||
There was a problem hiding this comment.
we have 16-bit timestamps?
There was a problem hiding this comment.
Yeah, the telemetry sends down 16 bit timestamps
ground_station/src/utils.hpp
Outdated
| @@ -8,6 +8,8 @@ | |||
|
|
|||
| #pragma once | |||
|
|
|||
| #include "telemetry/telemetry.hpp" | |||
There was a problem hiding this comment.
just forward-declare the telemetry struct/class
below all includes:
struct Telemetry; (if struct)
class Telemetry; (if class)
| @@ -25,9 +25,14 @@ void setup() { | |||
| pinMode(21, INPUT); | |||
|
|
|||
| console.begin(); | |||
| #ifdef CATS_DEBUG | |||
| console.setLevel(Console::ConsoleLevel::LEVEL_OK); | |||
There was a problem hiding this comment.
"OK" level is warning level? 😅
stojadin2701
reviewed
Apr 2, 2024
| navigation.setPointB(link1.data.lat(), link1.data.lon()); | ||
| } | ||
| } | ||
| } else { | ||
| // Stream both Links as they track different FC's |
In single mode, stream whichever link updated faster. In dual mode, stream both links.
…put if in debug mode.
stojadin2701
force-pushed
the
gs-usb-streaming
branch
from
48ad0a8 to
c76ae53
Compare
stojadin2701
approved these changes
Jun 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This patch implements a USB streaming interface to the ground station.
The data Interface looks as follows:
Link Num [1,2] Timestamp in s, Flight state, Latitude, Longitude, Altitude, Velocity, Battery Voltage
and is updated with 10 Hz if data is received with 10 Hz.
Checklist for changes
#pragma oncedirective for new header filesChecklist for Releases
Related issues
#347