Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/main/rx/crsf.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ enum {
CRSF_FRAME_VARIO_SENSOR_PAYLOAD_SIZE = 2,
CRSF_FRAME_BATTERY_SENSOR_PAYLOAD_SIZE = 8,
CRSF_FRAME_BAROMETER_ALTITUDE_PAYLOAD_SIZE = 2,
CRSF_FRAME_AIRSPEED_PAYLOAD_SIZE = 2,
CRSF_FRAME_LINK_STATISTICS_PAYLOAD_SIZE = 10,
CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE = 22, // 11 bits per channel * 16 channels = 22 bytes.
CRSF_FRAME_ATTITUDE_PAYLOAD_SIZE = 6,
Expand Down Expand Up @@ -88,6 +89,7 @@ typedef enum {
CRSF_FRAMETYPE_VARIO_SENSOR = 0x07,
CRSF_FRAMETYPE_BATTERY_SENSOR = 0x08,
CRSF_FRAMETYPE_BAROMETER_ALTITUDE = 0x09,
CRSF_FRAMETYPE_AIRSPEED = 0x0A,
CRSF_FRAMETYPE_LINK_STATISTICS = 0x14,
CRSF_FRAMETYPE_RC_CHANNELS_PACKED = 0x16,
CRSF_FRAMETYPE_ATTITUDE = 0x1E,
Expand Down
33 changes: 33 additions & 0 deletions src/main/telemetry/crsf.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@

#include "sensors/battery.h"
#include "sensors/sensors.h"
#include "sensors/pitotmeter.h"

#include "telemetry/crsf.h"
#include "telemetry/telemetry.h"
Expand Down Expand Up @@ -296,6 +297,26 @@ static void crsfBarometerAltitude(sbuf_t *dst)
crsfSerialize16(dst, altitude_packed);
}

/*
0x0A Airspeed
Payload:
uint16_t Airspeed ( km/h / 10 )
*/
static void crsfFrameAirspeed(sbuf_t *dst)
{
sbufWriteU8(dst, CRSF_FRAME_AIRSPEED_PAYLOAD_SIZE + CRSF_FRAME_LENGTH_TYPE_CRC);
crsfSerialize8(dst, CRSF_FRAMETYPE_AIRSPEED);

// INAV airspeed is in cm/s
// CRSF airspeed wants 0.1 km/h
// 1 cm/s = 0.036 km/h = 0.36 (0.1 km/h)
// so airspeed_kmh_x10 = cm/s * 36 / 100, rounded
const float airspeedCms = getAirspeedEstimate();
const uint16_t airspeedKmhX10 = (uint16_t)(airspeedCms * 0.36f + 0.5f);

crsfSerialize16(dst, airspeedKmhX10);
}

typedef enum {
CRSF_ACTIVE_ANTENNA1 = 0,
CRSF_ACTIVE_ANTENNA2 = 1
Expand Down Expand Up @@ -465,6 +486,7 @@ typedef enum {
CRSF_FRAME_GPS_INDEX,
CRSF_FRAME_VARIO_SENSOR_INDEX,
CRSF_FRAME_BAROMETER_ALTITUDE_INDEX,
CRSF_FRAME_AIRSPEED_INDEX,
CRSF_SCHEDULE_COUNT_MAX
} crsfFrameTypeIndex_e;

Expand Down Expand Up @@ -545,6 +567,11 @@ static void processCrsf(void)
crsfFinalize(dst);
}
#endif
if (currentSchedule & BV(CRSF_FRAME_AIRSPEED_INDEX)) {
crsfInitializeFrame(dst);
crsfFrameAirspeed(dst);
crsfFinalize(dst);
}
crsfScheduleIndex = (crsfScheduleIndex + 1) % crsfScheduleCount;
}

Expand Down Expand Up @@ -583,6 +610,9 @@ void initCrsfTelemetry(void)
crsfSchedule[index++] = BV(CRSF_FRAME_BAROMETER_ALTITUDE_INDEX);
}
#endif
if (sensors(SENSOR_PITOT)) {
crsfSchedule[index++] = BV(CRSF_FRAME_AIRSPEED_INDEX);
}
crsfScheduleCount = (uint8_t)index;
}

Expand Down Expand Up @@ -659,6 +689,9 @@ int getCrsfFrame(uint8_t *frame, crsfFrameType_e frameType)
case CRSF_FRAMETYPE_VARIO_SENSOR:
crsfFrameVarioSensor(sbuf);
break;
case CRSF_FRAMETYPE_AIRSPEED:
crsfFrameAirspeed(sbuf);
break;
}
const int frameSize = crsfFinalizeBuf(sbuf, frame);
return frameSize;
Expand Down