Merge with latest 2.3
This commit is contained in:
@@ -21,31 +21,32 @@
|
||||
#include "opentx.h"
|
||||
|
||||
const CrossfireSensor crossfireSensors[] = {
|
||||
{LINK_ID, 0, STR_SENSOR_RX_RSSI1, UNIT_DB, 0},
|
||||
{LINK_ID, 1, STR_SENSOR_RX_RSSI2, UNIT_DB, 0},
|
||||
{LINK_ID, 2, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0},
|
||||
{LINK_ID, 3, STR_SENSOR_RX_SNR, UNIT_DB, 0},
|
||||
{LINK_ID, 4, STR_SENSOR_ANTENNA, UNIT_RAW, 0},
|
||||
{LINK_ID, 5, STR_SENSOR_RF_MODE, UNIT_RAW, 0},
|
||||
{LINK_ID, 6, STR_SENSOR_TX_POWER, UNIT_MILLIWATTS, 0},
|
||||
{LINK_ID, 7, STR_SENSOR_TX_RSSI, UNIT_DB, 0},
|
||||
{LINK_ID, 8, STR_SENSOR_TX_QUALITY, UNIT_PERCENT, 0},
|
||||
{LINK_ID, 9, STR_SENSOR_TX_SNR, UNIT_DB, 0},
|
||||
{BATTERY_ID, 0, STR_SENSOR_BATT, UNIT_VOLTS, 1},
|
||||
{BATTERY_ID, 1, STR_SENSOR_CURR, UNIT_AMPS, 1},
|
||||
{BATTERY_ID, 2, STR_SENSOR_CAPACITY, UNIT_MAH, 0},
|
||||
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LATITUDE, 0},
|
||||
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LONGITUDE, 0},
|
||||
{GPS_ID, 2, STR_SENSOR_GSPD, UNIT_KMH, 1},
|
||||
{GPS_ID, 3, STR_SENSOR_HDG, UNIT_DEGREE, 3},
|
||||
{GPS_ID, 4, STR_SENSOR_ALT, UNIT_METERS, 0},
|
||||
{GPS_ID, 5, STR_SENSOR_SATELLITES, UNIT_RAW, 0},
|
||||
{ATTITUDE_ID, 0, STR_SENSOR_PITCH, UNIT_RADIANS, 3},
|
||||
{ATTITUDE_ID, 1, STR_SENSOR_ROLL, UNIT_RADIANS, 3},
|
||||
{ATTITUDE_ID, 2, STR_SENSOR_YAW, UNIT_RADIANS, 3},
|
||||
{FLIGHT_MODE_ID, 0, STR_SENSOR_FLIGHT_MODE, UNIT_TEXT, 0},
|
||||
{CF_VARIO_ID, 0, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2},
|
||||
{0, 0, "UNKNOWN", UNIT_RAW, 0},
|
||||
{LINK_ID, 0, STR_SENSOR_RX_RSSI1, UNIT_DB, 0},
|
||||
{LINK_ID, 1, STR_SENSOR_RX_RSSI2, UNIT_DB, 0},
|
||||
{LINK_ID, 2, STR_SENSOR_RX_QUALITY, UNIT_PERCENT, 0},
|
||||
{LINK_ID, 3, STR_SENSOR_RX_SNR, UNIT_DB, 0},
|
||||
{LINK_ID, 4, STR_SENSOR_ANTENNA, UNIT_RAW, 0},
|
||||
{LINK_ID, 5, STR_SENSOR_RF_MODE, UNIT_RAW, 0},
|
||||
{LINK_ID, 6, STR_SENSOR_TX_POWER, UNIT_MILLIWATTS, 0},
|
||||
{LINK_ID, 7, STR_SENSOR_TX_RSSI, UNIT_DB, 0},
|
||||
{LINK_ID, 8, STR_SENSOR_TX_QUALITY, UNIT_PERCENT, 0},
|
||||
{LINK_ID, 9, STR_SENSOR_TX_SNR, UNIT_DB, 0},
|
||||
{BATTERY_ID, 0, STR_SENSOR_BATT, UNIT_VOLTS, 1},
|
||||
{BATTERY_ID, 1, STR_SENSOR_CURR, UNIT_AMPS, 1},
|
||||
{BATTERY_ID, 2, STR_SENSOR_CAPACITY, UNIT_MAH, 0},
|
||||
{BATTERY_ID, 3, ZSTR_BATT_PERCENT, UNIT_PERCENT, 0},
|
||||
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LATITUDE, 0},
|
||||
{GPS_ID, 0, STR_SENSOR_GPS, UNIT_GPS_LONGITUDE, 0},
|
||||
{GPS_ID, 2, STR_SENSOR_GSPD, UNIT_KMH, 1},
|
||||
{GPS_ID, 3, STR_SENSOR_HDG, UNIT_DEGREE, 3},
|
||||
{GPS_ID, 4, STR_SENSOR_ALT, UNIT_METERS, 0},
|
||||
{GPS_ID, 5, STR_SENSOR_SATELLITES, UNIT_RAW, 0},
|
||||
{ATTITUDE_ID, 0, STR_SENSOR_PITCH, UNIT_RADIANS, 3},
|
||||
{ATTITUDE_ID, 1, STR_SENSOR_ROLL, UNIT_RADIANS, 3},
|
||||
{ATTITUDE_ID, 2, STR_SENSOR_YAW, UNIT_RADIANS, 3},
|
||||
{FLIGHT_MODE_ID, 0, STR_SENSOR_FLIGHT_MODE, UNIT_TEXT, 0},
|
||||
{CF_VARIO_ID, 0, STR_SENSOR_VSPD, UNIT_METERS_PER_SECOND, 2},
|
||||
{0, 0, "UNKNOWN", UNIT_RAW, 0},
|
||||
};
|
||||
|
||||
const CrossfireSensor & getCrossfireSensor(uint8_t id, uint8_t subId)
|
||||
@@ -157,6 +158,8 @@ void processCrossfireTelemetryFrame()
|
||||
processCrossfireTelemetryValue(BATT_CURRENT_INDEX, value);
|
||||
if (getCrossfireTelemetryValue<3>(7, value))
|
||||
processCrossfireTelemetryValue(BATT_CAPACITY_INDEX, value);
|
||||
if (getCrossfireTelemetryValue<1>(10, value))
|
||||
processCrossfireTelemetryValue(BATT_REMAINING_INDEX, value);
|
||||
break;
|
||||
|
||||
case ATTITUDE_ID:
|
||||
|
||||
@@ -64,6 +64,7 @@ enum CrossfireSensorIndexes {
|
||||
BATT_VOLTAGE_INDEX,
|
||||
BATT_CURRENT_INDEX,
|
||||
BATT_CAPACITY_INDEX,
|
||||
BATT_REMAINING_INDEX,
|
||||
GPS_LATITUDE_INDEX,
|
||||
GPS_LONGITUDE_INDEX,
|
||||
GPS_GROUND_SPEED_INDEX,
|
||||
@@ -81,7 +82,6 @@ enum CrossfireSensorIndexes {
|
||||
void processCrossfireTelemetryData(uint8_t data);
|
||||
void crossfireSetDefault(int index, uint8_t id, uint8_t subId);
|
||||
|
||||
#if SPORT_MAX_BAUDRATE < 400000
|
||||
const uint32_t CROSSFIRE_BAUDRATES[] = {
|
||||
400000,
|
||||
115200,
|
||||
@@ -90,6 +90,7 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
|
||||
4,
|
||||
16,
|
||||
};
|
||||
#if SPORT_MAX_BAUDRATE < 400000
|
||||
#define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
|
||||
#define CROSSFIRE_PERIOD CROSSFIRE_FRAME_PERIODS[g_eeGeneral.telemetryBaudrate]
|
||||
#else
|
||||
|
||||
@@ -282,16 +282,16 @@ inline bool isRasValueValid()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#elif defined(PCBX10)
|
||||
inline bool isRasValueValid()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#elif defined(PCBX9DP) || defined(PCBX9E)
|
||||
inline bool isRasValueValid()
|
||||
{
|
||||
return telemetryData.xjtVersion != 0x0000 && telemetryData.xjtVersion != 0x00FF;
|
||||
}
|
||||
#elif defined(PCBHORUS)
|
||||
inline bool isRasValueValid()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
inline bool isRasValueValid()
|
||||
{
|
||||
|
||||
@@ -316,6 +316,13 @@ static void processMultiTelemetryPaket(const uint8_t * packet, uint8_t module)
|
||||
uint8_t len = packet[1];
|
||||
const uint8_t * data = packet + 2;
|
||||
|
||||
#if defined(AUX_SERIAL)
|
||||
if (g_eeGeneral.auxSerialMode == UART_MODE_TELEMETRY_MIRROR) {
|
||||
for (uint8_t c=0; c < len; c++)
|
||||
auxSerialPutc(packet[c]);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Switch type
|
||||
switch (type) {
|
||||
case MultiStatus:
|
||||
|
||||
@@ -173,6 +173,7 @@ void logTelemetryWriteByte(uint8_t data);
|
||||
#define LOG_TELEMETRY_WRITE_START()
|
||||
#define LOG_TELEMETRY_WRITE_BYTE(data)
|
||||
#endif
|
||||
#define TELEMETRY_OUTPUT_BUFFER_SIZE 64
|
||||
|
||||
class OutputTelemetryBuffer {
|
||||
public:
|
||||
@@ -214,7 +215,8 @@ class OutputTelemetryBuffer {
|
||||
|
||||
void pushByte(uint8_t byte)
|
||||
{
|
||||
data[size++] = byte;
|
||||
if (size < TELEMETRY_OUTPUT_BUFFER_SIZE)
|
||||
data[size++] = byte;
|
||||
}
|
||||
|
||||
void pushByteWithBytestuffing(uint8_t byte)
|
||||
@@ -246,7 +248,7 @@ class OutputTelemetryBuffer {
|
||||
public:
|
||||
union {
|
||||
SportTelemetryPacket sport;
|
||||
uint8_t data[16];
|
||||
uint8_t data[TELEMETRY_OUTPUT_BUFFER_SIZE];
|
||||
};
|
||||
uint8_t size;
|
||||
uint8_t timeout;
|
||||
|
||||
Reference in New Issue
Block a user