Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Preparation for conversion to parameter groups

Browse source
This commit is contained in:
Martin Budden 2017-01-24 19:42:29 +00:00
parent 6f872ba899
commit 79d4b2146d
90 changed files with 1150 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/telemetry/telemetry.c
View file

@ -25,6 +25,9 @@
#include "common/utils.h"
#include "config/parameter_group.h"
#include "config/parameter_group_ids.h"
#include "drivers/timer.h"
#include "drivers/serial.h"
#include "drivers/serial_softserial.h"
@ -50,29 +53,35 @@
#include "telemetry/srxl.h"
#include "telemetry/ibus.h"
#ifndef USE_PARAMETER_GROUPS
static telemetryConfig_t *telemetryConfig;
#endif
void telemetryUseConfig(telemetryConfig_t *telemetryConfigToUse)
{
#ifdef USE_PARAMETER_GROUPS
UNUSED(telemetryConfigToUse);
#else
telemetryConfig = telemetryConfigToUse;
#endif
}
void telemetryInit(void)
{
#ifdef TELEMETRY_FRSKY
initFrSkyTelemetry(telemetryConfig);
initFrSkyTelemetry(telemetryConfig());
#endif
#ifdef TELEMETRY_HOTT
initHoTTTelemetry(telemetryConfig);
initHoTTTelemetry(telemetryConfig());
#endif
#ifdef TELEMETRY_SMARTPORT
initSmartPortTelemetry(telemetryConfig);
initSmartPortTelemetry(telemetryConfig());
#endif
#ifdef TELEMETRY_LTM
initLtmTelemetry(telemetryConfig);
initLtmTelemetry(telemetryConfig());
#endif
#ifdef TELEMETRY_JETIEXBUS
initJetiExBusTelemetry(telemetryConfig);
initJetiExBusTelemetry(telemetryConfig());
#endif
#ifdef TELEMETRY_MAVLINK
initMAVLinkTelemetry();
@ -95,7 +104,7 @@ bool telemetryDetermineEnabledState(portSharing_e portSharing)
bool enabled = portSharing == PORTSHARING_NOT_SHARED;
if (portSharing == PORTSHARING_SHARED) {
if (telemetryConfig->telemetry_switch)
if (telemetryConfig()->telemetry_switch)
enabled = IS_RC_MODE_ACTIVE(BOXTELEMETRY);
else
enabled = ARMING_FLAG(ARMED);
@ -142,7 +151,7 @@ void telemetryCheckState(void)
#endif
}
void telemetryProcess(uint32_t currentTime, rxConfig_t *rxConfig, uint16_t deadband3d_throttle)
void telemetryProcess(uint32_t currentTime, const rxConfig_t *rxConfig, uint16_t deadband3d_throttle)
{
#ifdef TELEMETRY_FRSKY
handleFrSkyTelemetry(rxConfig, deadband3d_throttle);