Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

correction and formating updated

Browse source
This commit is contained in:
Thomas Miric 2018-01-25 17:38:19 +01:00
parent 8a1fd399bf
commit b965ffd389
1 changed files with 48 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main/telemetry/jetiexbus.c
View file

@ -93,7 +93,7 @@ enum exDataType_e {
EX_TYPE_DES = 255 // only for devicedescription EX_TYPE_DES = 255 // only for devicedescription
}; };
const uint8_t exDataTypeLen[]={ const uint8_t exDataTypeLen[] = {
[EX_TYPE_6b] = 1, [EX_TYPE_6b] = 1,
[EX_TYPE_14b] = 2, [EX_TYPE_14b] = 2,
[EX_TYPE_22b] = 3, [EX_TYPE_22b] = 3,
@ -102,7 +102,7 @@ const uint8_t exDataTypeLen[]={
[EX_TYPE_GPS] = 4 [EX_TYPE_GPS] = 4
}; };
typedef struct exBusSensor_s{ typedef struct exBusSensor_s {
const char *label; const char *label;
const char *unit; const char *unit;
const uint8_t exDataType; const uint8_t exDataType;
@ -212,16 +212,15 @@ void initJetiExBusTelemetry(void)
if (batteryConfig()->currentMeterSource != CURRENT_METER_NONE) jetiExSensors[EX_CURRENT].parameter = EX_TYPE_SENSOR_ENABLED; if (batteryConfig()->currentMeterSource != CURRENT_METER_NONE) jetiExSensors[EX_CURRENT].parameter = EX_TYPE_SENSOR_ENABLED;
if ((batteryConfig()->voltageMeterSource != VOLTAGE_METER_NONE) && (batteryConfig()->currentMeterSource != CURRENT_METER_NONE)) { if ((batteryConfig()->voltageMeterSource != VOLTAGE_METER_NONE) && (batteryConfig()->currentMeterSource != CURRENT_METER_NONE)) {
jetiExSensors[EX_POWER].parameter = EX_TYPE_SENSOR_ENABLED; jetiExSensors[EX_POWER].parameter = EX_TYPE_SENSOR_ENABLED;
} jetiExSensors[EX_CAPACITY].parameter = EX_TYPE_SENSOR_ENABLED; jetiExSensors[EX_CAPACITY].parameter = EX_TYPE_SENSOR_ENABLED;
}
if (sensors(SENSOR_BARO)) jetiExSensors[EX_ALTITUDE].parameter = EX_TYPE_SENSOR_ENABLED; if (sensors(SENSOR_BARO)) jetiExSensors[EX_ALTITUDE].parameter = EX_TYPE_SENSOR_ENABLED;
if (sensors(SENSOR_ACC)){ if (sensors(SENSOR_ACC)) {
jetiExSensors[EX_ROLL_ANGLE].parameter = EX_TYPE_SENSOR_ENABLED; jetiExSensors[EX_ROLL_ANGLE].parameter = EX_TYPE_SENSOR_ENABLED;
jetiExSensors[EX_PITCH_ANGLE].parameter = EX_TYPE_SENSOR_ENABLED; jetiExSensors[EX_PITCH_ANGLE].parameter = EX_TYPE_SENSOR_ENABLED;
} }
if (sensors(SENSOR_MAG)) jetiExSensors[EX_HEADING].parameter = EX_TYPE_SENSOR_ENABLED; if (sensors(SENSOR_MAG)) jetiExSensors[EX_HEADING].parameter = EX_TYPE_SENSOR_ENABLED;
for (uint8_t item = 0; item < JETI_EX_SENSOR_COUNT; item++ ) { for (uint8_t item = 0; item < JETI_EX_SENSOR_COUNT; item++ ) {
if (jetiExSensors[item].parameter == EX_TYPE_SENSOR_ENABLED) { if (jetiExSensors[item].parameter == EX_TYPE_SENSOR_ENABLED) {
activeSensorList[activeSensors] = item; activeSensorList[activeSensors] = item;
@ -248,9 +247,8 @@ void createExTelemetrieTextMessage(uint8_t *exMessage, uint8_t messageID, const
} }
int32_t getSensorValue(uint8_t sensor){ int32_t getSensorValue(uint8_t sensor) {
switch(sensor) switch(sensor) {
{
case EX_VOLTAGE: case EX_VOLTAGE:
return (getBatteryVoltageLatest()); return (getBatteryVoltageLatest());
break; break;
@ -312,12 +310,11 @@ uint8_t createExTelemetrieValueMessage(uint8_t *exMessage, uint8_t item)
*p++ = (sensorValue & 0x9F) | jetiExSensors[sensorItem].decimals; *p++ = (sensorValue & 0x9F) | jetiExSensors[sensorItem].decimals;
item++; item++;
if (item > activeSensors)
break; if (item > activeSensors) break;
sensorItem = activeSensorList[item]; sensorItem = activeSensorList[item];
if (EXTEL_MAX_PAYLOAD <= ((p-&exMessage[EXTEL_HEADER_ID]) + exDataTypeLen[jetiExSensors[sensorItem].exDataType]) + 1) if (EXTEL_MAX_PAYLOAD <= ((p-&exMessage[EXTEL_HEADER_ID]) + exDataTypeLen[jetiExSensors[sensorItem].exDataType]) + 1) break;
break;
} }
messageSize = (EXTEL_HEADER_LEN + (p-&exMessage[EXTEL_HEADER_ID])); messageSize = (EXTEL_HEADER_LEN + (p-&exMessage[EXTEL_HEADER_ID]));
@ -399,7 +396,7 @@ uint8_t sendJetiExBusTelemetry(uint8_t packetID, uint8_t item)
uint8_t *jetiExTelemetryFrame = &jetiExBusTelemetryFrame[EXBUS_HEADER_DATA]; uint8_t *jetiExTelemetryFrame = &jetiExBusTelemetryFrame[EXBUS_HEADER_DATA];
if (requestLoop < 0xFF) { if (requestLoop < 0xFF) {
while(1){ while(1) {
sensorDescriptionCounter++; sensorDescriptionCounter++;
if(jetiExSensors[sensorDescriptionCounter].parameter >= EX_TYPE_SENSOR_ENABLED) break; if(jetiExSensors[sensorDescriptionCounter].parameter >= EX_TYPE_SENSOR_ENABLED) break;
if (sensorDescriptionCounter == JETI_EX_SENSOR_COUNT ) { if (sensorDescriptionCounter == JETI_EX_SENSOR_COUNT ) {
@ -407,12 +404,9 @@ uint8_t sendJetiExBusTelemetry(uint8_t packetID, uint8_t item)
break; break;
} }
} }
createExTelemetrieTextMessage(jetiExTelemetryFrame, sensorDescriptionCounter, &jetiExSensors[sensorDescriptionCounter]); createExTelemetrieTextMessage(jetiExTelemetryFrame, sensorDescriptionCounter, &jetiExSensors[sensorDescriptionCounter]);
createExBusMessage(jetiExBusTelemetryFrame, jetiExTelemetryFrame, packetID); createExBusMessage(jetiExBusTelemetryFrame, jetiExTelemetryFrame, packetID);
requestLoop++; requestLoop++;
} else { } else {
if(item == activeSensors) item = 0; if(item == activeSensors) item = 0;
item = createExTelemetrieValueMessage(jetiExTelemetryFrame, item); item = createExTelemetrieValueMessage(jetiExTelemetryFrame, item);
@ -427,4 +421,3 @@ uint8_t sendJetiExBusTelemetry(uint8_t packetID, uint8_t item)
#endif // TELEMETRY #endif // TELEMETRY
#endif // SERIAL_RX #endif // SERIAL_RX