rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add default telemetry for iBus (#5570) 

The "standard" telemetry is RPM, temperature and external voltage.
This commit is contained in:
Míguel Ángel Mulero Martínez 2018-03-30 06:41:50 +02:00 committed by Michael Keller
parent 59dbe0e4e3
commit 39904a3065
3 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/telemetry/ibus_shared.c
View File

@ -69,50 +69,6 @@ typedef enum {
IBUS_COMMAND_MEASUREMENT = 0xA0
} ibusCommand_e;
typedef enum {
IBUS_SENSOR_TYPE_NONE = 0x00,
IBUS_SENSOR_TYPE_TEMPERATURE = 0x01,
IBUS_SENSOR_TYPE_RPM_FLYSKY = 0x02,
IBUS_SENSOR_TYPE_EXTERNAL_VOLTAGE = 0x03,
IBUS_SENSOR_TYPE_CELL = 0x04, // Avg Cell voltage
IBUS_SENSOR_TYPE_BAT_CURR = 0x05, // battery current A * 100
IBUS_SENSOR_TYPE_FUEL = 0x06, // remaining battery percentage / mah drawn otherwise or fuel level no unit!
IBUS_SENSOR_TYPE_RPM = 0x07, // throttle value / battery capacity
IBUS_SENSOR_TYPE_CMP_HEAD = 0x08, //Heading 0..360 deg, 0=north 2bytes
IBUS_SENSOR_TYPE_CLIMB_RATE = 0x09, //2 bytes m/s *100
IBUS_SENSOR_TYPE_COG = 0x0a, //2 bytes Course over ground(NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. unknown max uint
IBUS_SENSOR_TYPE_GPS_STATUS = 0x0b, //2 bytes
IBUS_SENSOR_TYPE_ACC_X = 0x0c, //2 bytes m/s *100 signed
IBUS_SENSOR_TYPE_ACC_Y = 0x0d, //2 bytes m/s *100 signed
IBUS_SENSOR_TYPE_ACC_Z = 0x0e, //2 bytes m/s *100 signed
IBUS_SENSOR_TYPE_ROLL = 0x0f, //2 bytes deg *100 signed
IBUS_SENSOR_TYPE_PITCH = 0x10, //2 bytes deg *100 signed
IBUS_SENSOR_TYPE_YAW = 0x11, //2 bytes deg *100 signed
IBUS_SENSOR_TYPE_VERTICAL_SPEED = 0x12, //2 bytes m/s *100
IBUS_SENSOR_TYPE_GROUND_SPEED = 0x13, //2 bytes m/s *100 different unit than build-in sensor
IBUS_SENSOR_TYPE_GPS_DIST = 0x14, //2 bytes dist from home m unsigned
IBUS_SENSOR_TYPE_ARMED = 0x15, //2 bytes
IBUS_SENSOR_TYPE_FLIGHT_MODE = 0x16, //2 bytes
IBUS_SENSOR_TYPE_PRES = 0x41, // Pressure
IBUS_SENSOR_TYPE_ODO1 = 0x7c, // Odometer1
IBUS_SENSOR_TYPE_ODO2 = 0x7d, // Odometer2
IBUS_SENSOR_TYPE_SPE = 0x7e, // Speed 2bytes km/h
IBUS_SENSOR_TYPE_GPS_LAT = 0x80, //4bytes signed WGS84 in degrees * 1E7
IBUS_SENSOR_TYPE_GPS_LON = 0x81, //4bytes signed WGS84 in degrees * 1E7
IBUS_SENSOR_TYPE_GPS_ALT = 0x82, //4bytes signed!!! GPS alt m*100
IBUS_SENSOR_TYPE_ALT = 0x83, //4bytes signed!!! Alt m*100
IBUS_SENSOR_TYPE_ALT_MAX = 0x84, //4bytes signed MaxAlt m*100
IBUS_SENSOR_TYPE_ALT_FLYSKY = 0xf9, // Altitude 2 bytes signed in m
#if defined(USE_TELEMETRY_IBUS_EXTENDED)
IBUS_SENSOR_TYPE_GPS_FULL = 0xfd,
IBUS_SENSOR_TYPE_VOLT_FULL = 0xf0,
IBUS_SENSOR_TYPE_ACC_FULL = 0xef,
#endif //defined(TELEMETRY_IBUS_EXTENDED)
IBUS_SENSOR_TYPE_UNKNOWN = 0xff
} ibusSensorType_e;
typedef union ibusTelemetry {
uint16_t uint16;
uint32_t uint32;

45
src/main/telemetry/ibus_shared.h
View File

@ -30,6 +30,51 @@
#define IBUS_CHECKSUM_SIZE (2)
#define IBUS_SENSOR_COUNT 15
typedef enum {
IBUS_SENSOR_TYPE_NONE = 0x00,
IBUS_SENSOR_TYPE_TEMPERATURE = 0x01,
IBUS_SENSOR_TYPE_RPM_FLYSKY = 0x02,
IBUS_SENSOR_TYPE_EXTERNAL_VOLTAGE = 0x03,
IBUS_SENSOR_TYPE_CELL = 0x04, // Avg Cell voltage
IBUS_SENSOR_TYPE_BAT_CURR = 0x05, // battery current A * 100
IBUS_SENSOR_TYPE_FUEL = 0x06, // remaining battery percentage / mah drawn otherwise or fuel level no unit!
IBUS_SENSOR_TYPE_RPM = 0x07, // throttle value / battery capacity
IBUS_SENSOR_TYPE_CMP_HEAD = 0x08, //Heading 0..360 deg, 0=north 2bytes
IBUS_SENSOR_TYPE_CLIMB_RATE = 0x09, //2 bytes m/s *100
IBUS_SENSOR_TYPE_COG = 0x0a, //2 bytes Course over ground(NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. unknown max uint
IBUS_SENSOR_TYPE_GPS_STATUS = 0x0b, //2 bytes
IBUS_SENSOR_TYPE_ACC_X = 0x0c, //2 bytes m/s *100 signed
IBUS_SENSOR_TYPE_ACC_Y = 0x0d, //2 bytes m/s *100 signed
IBUS_SENSOR_TYPE_ACC_Z = 0x0e, //2 bytes m/s *100 signed
IBUS_SENSOR_TYPE_ROLL = 0x0f, //2 bytes deg *100 signed
IBUS_SENSOR_TYPE_PITCH = 0x10, //2 bytes deg *100 signed
IBUS_SENSOR_TYPE_YAW = 0x11, //2 bytes deg *100 signed
IBUS_SENSOR_TYPE_VERTICAL_SPEED = 0x12, //2 bytes m/s *100
IBUS_SENSOR_TYPE_GROUND_SPEED = 0x13, //2 bytes m/s *100 different unit than build-in sensor
IBUS_SENSOR_TYPE_GPS_DIST = 0x14, //2 bytes dist from home m unsigned
IBUS_SENSOR_TYPE_ARMED = 0x15, //2 bytes
IBUS_SENSOR_TYPE_FLIGHT_MODE = 0x16, //2 bytes
IBUS_SENSOR_TYPE_PRES = 0x41, // Pressure
IBUS_SENSOR_TYPE_ODO1 = 0x7c, // Odometer1
IBUS_SENSOR_TYPE_ODO2 = 0x7d, // Odometer2
IBUS_SENSOR_TYPE_SPE = 0x7e, // Speed 2bytes km/h
IBUS_SENSOR_TYPE_GPS_LAT = 0x80, //4bytes signed WGS84 in degrees * 1E7
IBUS_SENSOR_TYPE_GPS_LON = 0x81, //4bytes signed WGS84 in degrees * 1E7
IBUS_SENSOR_TYPE_GPS_ALT = 0x82, //4bytes signed!!! GPS alt m*100
IBUS_SENSOR_TYPE_ALT = 0x83, //4bytes signed!!! Alt m*100
IBUS_SENSOR_TYPE_ALT_MAX = 0x84, //4bytes signed MaxAlt m*100
IBUS_SENSOR_TYPE_ALT_FLYSKY = 0xf9, // Altitude 2 bytes signed in m
#if defined(USE_TELEMETRY_IBUS_EXTENDED)
IBUS_SENSOR_TYPE_GPS_FULL = 0xfd,
IBUS_SENSOR_TYPE_VOLT_FULL = 0xf0,
IBUS_SENSOR_TYPE_ACC_FULL = 0xef,
#endif //defined(TELEMETRY_IBUS_EXTENDED)
IBUS_SENSOR_TYPE_UNKNOWN = 0xff
} ibusSensorType_e;
#if defined(USE_TELEMETRY) && defined(USE_TELEMETRY_IBUS)
uint8_t respondToIbusRequest(uint8_t const * const ibusPacket);

7
src/main/telemetry/telemetry.c
View File

@ -67,7 +67,12 @@ PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig,
.frsky_vfas_precision = 0,
.hottAlarmSoundInterval = 5,
.pidValuesAsTelemetry = 0,
.report_cell_voltage = false
.report_cell_voltage = false,
.flysky_sensors = {
IBUS_SENSOR_TYPE_TEMPERATURE,
IBUS_SENSOR_TYPE_RPM_FLYSKY,
IBUS_SENSOR_TYPE_EXTERNAL_VOLTAGE
}
);
void telemetryInit(void)