Skip to content

Update Downlink Scaling Values #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AarC10 merged 2 commits into from
Jun 16, 2026
Merged

Update Downlink Scaling Values #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e868a8
Update scaling
AarC10 Jun 16, 2026
61e3ba5
Fix not sending lora rxstats over UDP
AarC10 Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/backplane/power_module/src/c_sensing_tenant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ void CSensingTenant::Notify(void* ctx) {

void CSensingTenant::sendDownlinkData(const NTypes::SensorData& data) {
NTypes::LoRaBroadcastSensorData downlinkData{
.RailBattery = {.Voltage = static_cast<int16_t>(data.RailBattery.Voltage),
.RailBattery = {.Voltage = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.RailBattery.Voltage)),
.Current = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.RailBattery.Current)),
.Power = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.RailBattery.Power))},
.Rail3v3 = {.Voltage = static_cast<int16_t>(data.Rail3v3.Voltage),
.Rail3v3 = {.Voltage = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.Rail3v3.Voltage)),
.Current = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.Rail3v3.Current)),
.Power = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.Rail3v3.Power))}};

Expand Down
10 changes: 6 additions & 4 deletions app/backplane/sensor_module/src/c_sensing_tenant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,16 @@ void CSensingTenant::sendDownlinkData(const NTypes::SensorData& data) {
NTypes::LoRaBroadcastSensorData downlinkData{
.Barometer =
{
.Pressure = static_cast<int16_t>(data.PrimaryBarometer.Pressure),
// x10: 0.1 kPa resolution, covers 0-3276 kPa (int16_t max)
.Pressure = static_cast<int16_t>(data.PrimaryBarometer.Pressure * 10.0f),
.Temperature = static_cast<int16_t>(data.PrimaryBarometer.Temperature),
},
.Acceleration =
{
.X = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.Acceleration.X)),
.Y = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.Acceleration.Y)),
.Z = static_cast<int16_t>(CSensorDevice::ToMilliUnits(data.Acceleration.Z)),
// x10: 0.1 m/s² resolution, covers ±3276 m/s² (~±334g) — safe for ADXL375 200g range
.X = static_cast<int16_t>(data.Acceleration.X * 10.0f),
.Y = static_cast<int16_t>(data.Acceleration.Y * 10.0f),
.Z = static_cast<int16_t>(data.Acceleration.Z * 10.0f),
},
.Gyroscope =
{
Expand Down
3 changes: 2 additions & 1 deletion app/ground/receiver_module/include/c_receiver_module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ class CReceiverModule : public CProjectConfiguration {
CUdpListenerTenant dataRequestListenerTenant{"Radio Module Data Request Listener Tenant", ipAddrStr.c_str(),
radioModuleDataRequestPort, &loraBroadcastMessagePort};

CLoraFrameToUdpHandler loraToUdpHandler{ipAddrStr.c_str(), radioModuleSourcePort};
CLoraFrameToUdpHandler loraToUdpHandler{ipAddrStr.c_str(), radioModuleSourcePort,
NNetworkDefs::RADIO_MODULE_LORA_RX_STATS_PORT};

// Tasks
CTask networkingTask{"UDP Listener Task", 15, 4096, 0};
Expand Down
6 changes: 4 additions & 2 deletions include/f_core/radio/frame_handlers/c_lora_frame_to_udp_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ class CLoraFrameToUdpHandler : public CLoraFrameHandler {
public:
/**
* @brief Constructor
* @param ip IP address instance to bind to
* @param ip IP address to bind to
* @param srcPort Source port to bind to
* @param statsPort Port to emit LoRa receive stats (RSSI/SNR) on; 0 disables
*/
explicit CLoraFrameToUdpHandler(const char* ip, uint16_t srcPort);
explicit CLoraFrameToUdpHandler(const char* ip, uint16_t srcPort, uint16_t statsPort = 0);

/**
* See parent docs
Expand All @@ -19,4 +20,5 @@ class CLoraFrameToUdpHandler : public CLoraFrameHandler {

private:
CUdpSocket sock;
uint16_t statsPort;
};
11 changes: 10 additions & 1 deletion lib/f_core/radio/frame_handlers/c_lora_frame_to_udp_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@

#include "f_core/net/network/c_ipv4.h"

CLoraFrameToUdpHandler::CLoraFrameToUdpHandler(const char* ip, uint16_t srcPort) : sock(CIPv4(ip), srcPort, 0) {}
CLoraFrameToUdpHandler::CLoraFrameToUdpHandler(const char* ip, uint16_t srcPort, uint16_t statsPort)
: sock(CIPv4(ip), srcPort, 0), statsPort(statsPort) {}

void CLoraFrameToUdpHandler::HandleFrame(const ReceivedLaunchLoraFrame& rxFrame) {
const LaunchLoraFrame& frame = rxFrame.Frame;
sock.TransmitAsynchronous(&frame.Payload, frame.Size, frame.Port);

if (statsPort != 0) {
struct __attribute__((packed)) {
int16_t ReceivedSignalStrength;
int8_t SignalToNoise;
} stats{rxFrame.ReceivedSignalStrength, rxFrame.SignalToNoise};
sock.TransmitAsynchronous(&stats, sizeof(stats), statsPort);
}
}
Loading