Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

RAS refactoring

Browse source
This commit is contained in:
Bertrand Songis 2019-04-16 18:08:53 +02:00
parent 58f2295484
commit 6d34de7914
9 changed files with 194 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

22
radio/src/gui/128x64/radio_diaganas.cpp
View file

@ -67,26 +67,4 @@ void menuRadioDiagAnalogs(event_t event)
lcdDrawChar(lcdNextPos, y, '@');
lcdDrawNumber(x+10*FW-1, y, gyro.scaledY(), RIGHT);
#endif
// RAS
#if defined(PCBTARANIS)
if (isModuleXJT2(INTERNAL_MODULE) && IS_INTERNAL_MODULE_ON()) {
y += FH;
lcdDrawText(1, y, "RAS:");
lcdDrawNumber(1 + 4*FW, y, telemetryData.swr.value, LEFT);
}
else if (isModuleXJT(EXTERNAL_MODULE) && !IS_INTERNAL_MODULE_ON()) {
y += FH;
lcdDrawText(1, y, "RAS:");
lcdDrawNumber(1 + 4*FW, y, telemetryData.swr.value, LEFT);
}
#else
if (isModuleXJT(EXTERNAL_MODULE)) {
y += FH;
uint8_t x = ((NUM_STICKS+NUM_POTS+NUM_SLIDERS) & 1) ? (LCD_W/2)+FW : 0;
lcdDrawText(x, y, "RAS:");
lcdDrawNumber(x + 4*FW, y, telemetryData.swr.value, LEFT);
}
#endif
}

15
radio/src/gui/128x64/radio_hardware.cpp
View file

@ -138,6 +138,7 @@ enum MenuRadioHardwareItems {
ITEM_RADIO_HARDWARE_BLUETOOTH_NAME,
#endif
ITEM_RADIO_HARDWARE_JITTER_FILTER,
ITEM_RADIO_HARDWARE_RAS,
ITEM_RADIO_HARDWARE_DEBUG,
ITEM_RADIO_HARDWARE_MAX
};
@ -207,6 +208,7 @@ void menuRadioHardware(event_t event)
#endif
BLUETOOTH_ROWS
0 /* jitter filter */,
READONLY_ROW,
1 /* debugs */,
});
@ -397,6 +399,19 @@ void menuRadioHardware(event_t event)
g_eeGeneral.jitterFilter = 1 - editCheckBox(1 - g_eeGeneral.jitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event);
break;
case ITEM_RADIO_HARDWARE_RAS:
lcdDrawTextAlignedLeft(y, "RAS");
if (telemetryData.swrInternal.value)
lcdDrawNumber(HW_SETTINGS_COLUMN2, y, telemetryData.swrInternal.value);
else
lcdDrawText(HW_SETTINGS_COLUMN2, y, "---");
lcdDrawText(lcdNextPos, y, "/");
if (telemetryData.swrInternal.value)
lcdDrawNumber(lcdNextPos, y, telemetryData.swrInternal.value);
else
lcdDrawText(lcdNextPos, y, "---");
break;
case ITEM_RADIO_HARDWARE_DEBUG:
lcdDrawTextAlignedLeft(y, STR_DEBUG);
lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0);

4
radio/src/lua/api_general.cpp
View file

@ -672,8 +672,8 @@ This is just a hardware pass/fail measure and does not represent the quality of
*/
static int luaGetRAS(lua_State * L)
{
if (IS_RAS_VALUE_VALID()) {
lua_pushinteger(L, telemetryData.swr.value);
if (!IS_RAS_VALUE_VALID(telemetryData.xjtVersion)) {
lua_pushinteger(L, telemetryData.swrInternal.value);
}
else {
lua_pushnil(L);

1
radio/src/targets/common/arm/CMakeLists.txt
View file

@ -141,7 +141,6 @@ set(SRC
tasks.cpp
audio.cpp
telemetry/telemetry.cpp
telemetry/telemetry_holders.cpp
telemetry/telemetry_sensors.cpp
telemetry/frsky.cpp
telemetry/frsky_d.cpp

37
radio/src/telemetry/frsky.h
View file

@ -205,16 +205,6 @@ enum FrSkyDataState {
#define DATA_ID_SP2UH 0x45 // 5
#define DATA_ID_SP2UR 0xC6 // 6
#if defined(NO_RAS)
#define IS_RAS_VALUE_VALID() (false)
#elif defined(PCBX10)
#define IS_RAS_VALUE_VALID() (false)
#elif defined(PCBX9DP) || defined(PCBX9E)
#define IS_RAS_VALUE_VALID() (telemetryData.xjtVersion != 0 && telemetryData.xjtVersion != 0xff)
#else
#define IS_RAS_VALUE_VALID() (true)
#endif
#define IS_HIDDEN_TELEMETRY_VALUE(id) ((id == SP2UART_A_ID) || (id == SP2UART_B_ID) || (id == XJT_VERSION_ID) || (id == RAS_ID) || (id == FACT_TEST_ID))
#define ALARM_GREATER(channel, alarm) ((g_model.frsky.channels[channel].alarms_greater >> alarm) & 1)
@ -262,12 +252,10 @@ enum FrSkyDataState {
#define TELEMETRY_CELL_VOLTAGE(k) (telemetryData.hub.cellVolts[k] * TELEMETRY_CELL_VOLTAGE_MUTLIPLIER)
#define TELEMETRY_MIN_CELL_VOLTAGE (telemetryData.hub.minCellVolts * TELEMETRY_CELL_VOLTAGE_MUTLIPLIER)
#define START_STOP 0x7e
#define BYTESTUFF 0x7d
#define START_STOP 0x7E
#define BYTESTUFF 0x7D
#define STUFF_MASK 0x20
#define frskySendAlarms()
typedef enum {
TS_IDLE = 0, // waiting for 0x5e frame marker
TS_DATA_ID, // waiting for dataID
@ -292,11 +280,21 @@ void telemetryInit(uint8_t protocol);
void telemetryInterrupt10ms();
struct TelemetryData {
TelemetryValue swr;
FilteredTelemetryValue rssi;
class TelemetryData {
public:
TelemetryExpiringDecorator<TelemetryValue> swrInternal;
TelemetryExpiringDecorator<TelemetryValue> swrExternal;
TelemetryFilterDecorator<TelemetryValue> rssi;
uint16_t xjtVersion;
bool varioHighPrecision;
void setSwr(uint8_t origin, uint8_t value)
{
if (origin & 0x80)
swrExternal.set(0x00);
else
swrInternal.set(0x00);
}
};
extern TelemetryData telemetryData;
@ -304,4 +302,9 @@ extern TelemetryData telemetryData;
bool pushFrskyTelemetryData(uint8_t data); // returns true when end of frame detected
void processFrskyTelemetryData(uint8_t data);
inline bool IS_RAS_VALUE_VALID(uint16_t version)
{
return version != 0x0000 && version != 0x00ff;
}
#endif // _FRSKY_H_

11
radio/src/telemetry/frsky_sport.cpp
View file

@ -184,15 +184,14 @@ void sportProcessTelemetryPacketWithoutCrc(uint8_t origin, const uint8_t * packe
}
else if (dataId == XJT_VERSION_ID) {
telemetryData.xjtVersion = HUB_DATA_U16(packet);
if (!IS_RAS_VALUE_VALID()) {
telemetryData.swr.set(0x00);
if (!IS_RAS_VALUE_VALID(telemetryData.xjtVersion)) {
telemetryData.setSwr(origin, 0);
}
}
else if (dataId == RAS_ID) {
if (IS_RAS_VALUE_VALID())
telemetryData.swr.set(SPORT_DATA_U8(packet));
else
telemetryData.swr.set(0x00);
if (!IS_RAS_VALUE_VALID(telemetryData.xjtVersion)) {
telemetryData.setSwr(origin, SPORT_DATA_U8(packet));
}
}
if (TELEMETRY_STREAMING()/* because when Rx is OFF it happens that some old A1/A2 values are sent from the XJT module*/) {

67
radio/src/telemetry/telemetry.cpp
View file

@ -66,6 +66,69 @@ void processTelemetryData(uint8_t data)
processFrskyTelemetryData(data);
}
#if defined(NO_RAS)
inline bool IS_INTERNAL_RAS_VALUE_VALID()
{
return false;
}
inline bool IS_EXTERNAL_RAS_VALUE_VALID()
{
return false;
}
#elif defined(PXX2)
inline bool IS_INTERNAL_RAS_VALUE_VALID()
{
return get_tmr10ms() < telemetryData.swrInternal.expirationTime;
}
inline bool IS_EXTERNAL_RAS_VALUE_VALID()
{
return get_tmr10ms() < telemetryData.swrExternal.expirationTime;
}
#elif defined(PCBX10)
inline bool IS_INTERNAL_RAS_VALUE_VALID()
{
return false;
}
inline bool IS_EXTERNAL_RAS_VALUE_VALID()
{
return false;
}
#elif defined(PCBX9DP) || defined(PCBX9E)
inline bool IS_INTERNAL_RAS_VALUE_VALID()
{
return IS_RAS_VALUE_VALID(telemetryData.xjtVersion);
}
inline bool IS_EXTERNAL_RAS_VALUE_VALID()
{
return IS_RAS_VALUE_VALID(telemetryData.xjtVersion);
}
#else
inline bool IS_INTERNAL_RAS_VALUE_VALID()
{
return false;
}
inline bool IS_EXTERNAL_RAS_VALUE_VALID()
{
return false;
}
#endif
inline bool isBadAntennaDetected()
{
if (IS_INTERNAL_RAS_VALUE_VALID() && telemetryData.swrInternal.value > 0x33)
return true;
if (IS_EXTERNAL_RAS_VALUE_VALID() && telemetryData.swrExternal.value > 0x33)
return true;
return false;
}
void telemetryWakeup()
{
uint8_t requiredTelemetryProtocol = modelTelemetryProtocol();
@ -133,8 +196,6 @@ void telemetryWakeup()
}
#endif
#define FRSKY_BAD_ANTENNA() (IS_RAS_VALUE_VALID() && telemetryData.swr.value > 0x33)
static tmr10ms_t alarmsCheckTime = 0;
#define SCHEDULE_NEXT_ALARMS_CHECK(seconds) alarmsCheckTime = get_tmr10ms() + (100*(seconds))
if (int32_t(get_tmr10ms() - alarmsCheckTime) > 0) {
@ -159,7 +220,7 @@ void telemetryWakeup()
}
#if defined(PCBTARANIS) || defined(PCBHORUS)
if ((/*isModulePXX2(INTERNAL_MODULE) || */isModulePXX(INTERNAL_MODULE)/* || isModulePXX2(EXTERNAL_MODULE)*/ || isModulePXX(EXTERNAL_MODULE)) && FRSKY_BAD_ANTENNA()) {
if (isBadAntennaDetected()) {
AUDIO_RAS_RED();
POPUP_WARNING(STR_WARNING);
const char * w = STR_ANTENNAPROBLEM;

60
radio/src/telemetry/telemetry_holders.cpp
View file

@ -1,60 +0,0 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "opentx.h"
void FilteredTelemetryValue::reset()
{
memclear(this, sizeof(*this));
}
void FilteredTelemetryValue::set(uint8_t value)
{
if (this->value == 0) {
memset(values, value, TELEMETRY_AVERAGE_COUNT);
this->value = value;
}
else {
//calculate the average from values[] and value
//also shift readings in values [] array
unsigned int sum = values[0];
for (int i=0; i<TELEMETRY_AVERAGE_COUNT-1; i++) {
uint8_t tmp = values[i+1];
values[i] = tmp;
sum += tmp;
}
values[TELEMETRY_AVERAGE_COUNT-1] = value;
sum += value;
this->value = sum/(TELEMETRY_AVERAGE_COUNT+1);
}
}
void TelemetryValueWithMin::reset()
{
memclear(this, sizeof(*this));
}
void TelemetryValueWithMin::set(uint8_t value)
{
FilteredTelemetryValue::set(value);
if (!min || value < min) {
min = value;
}
}

63
radio/src/telemetry/telemetry_holders.h
View file

@ -36,23 +36,70 @@ class TelemetryValue {
void reset()
{
this->value = 0;
set(0);
};
};
class FilteredTelemetryValue: public TelemetryValue {
template <class T>
class TelemetryFilterDecorator: public T {
public:
uint8_t value; // filtered value (average of last TELEMETRY_AVERAGE_COUNT+1 values)
uint8_t values[TELEMETRY_AVERAGE_COUNT];
void set(uint8_t value);
void reset();
void set(uint8_t value)
{
if (this->value == 0) {
memset(values, value, TELEMETRY_AVERAGE_COUNT);
this->value = value;
}
else {
//calculate the average from values[] and value
//also shift readings in values [] array
unsigned int sum = values[0];
for (int i=0; i<TELEMETRY_AVERAGE_COUNT-1; i++) {
uint8_t tmp = values[i+1];
values[i] = tmp;
sum += tmp;
}
values[TELEMETRY_AVERAGE_COUNT-1] = value;
sum += value;
this->value = sum / (TELEMETRY_AVERAGE_COUNT+1);
}
}
void reset()
{
memclear(this, sizeof(*this));
};
};
class TelemetryValueWithMin: public FilteredTelemetryValue {
template <class T>
class TelemetryExpiringDecorator: public T {
public:
tmr10ms_t expirationTime;
void set(uint8_t value)
{
T::set(value);
expirationTime = get_tmr10ms();
}
void reset()
{
memclear(this, sizeof(*this));
}
};
template <class T>
class TelemetryMinDecorator: public T {
public:
uint8_t min;
void set(uint8_t value);
void reset();
void set(uint8_t value)
{
T::set(value);
if (!min || value < min) {
min = value;
}
}
void reset()
{
memclear(this, sizeof(*this));
}
};
#endif // _TELEMETRY_HOLDERS_H_