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

CF/BF - Further reduce osd slave dependencies on FC code.

Browse source
This commit is contained in:
Hydra 2017-04-09 21:28:33 +01:00 • committed by Dominic Clifton
parent a140aea013
commit cb34c5b1d7
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/sensors/battery.c
View file

@ -290,11 +290,15 @@ void batteryInit(void)
break; break;
case CURRENT_METER_VIRTUAL: case CURRENT_METER_VIRTUAL:
#ifdef USE_FC
currentMeterVirtualInit(); currentMeterVirtualInit();
#endif
break; break;
case CURRENT_METER_ESC: case CURRENT_METER_ESC:
#ifdef ESC_SENSOR
currentMeterESCInit(); currentMeterESCInit();
#endif
break; break;
default: default:

34
src/main/sensors/current.c
View file

@ -38,7 +38,9 @@
const uint8_t currentMeterIds[] = { const uint8_t currentMeterIds[] = {
CURRENT_METER_ID_BATTERY_1, CURRENT_METER_ID_BATTERY_1,
#ifdef USE_FC
CURRENT_METER_ID_VIRTUAL_1, CURRENT_METER_ID_VIRTUAL_1,
#endif
#ifdef USE_ESC_SENSOR #ifdef USE_ESC_SENSOR
CURRENT_METER_ID_ESC_COMBINED_1, CURRENT_METER_ID_ESC_COMBINED_1,
CURRENT_METER_ID_ESC_MOTOR_1, CURRENT_METER_ID_ESC_MOTOR_1,
@ -144,6 +146,7 @@ void currentMeterADCRead(currentMeter_t *meter)
// VIRTUAL // VIRTUAL
// //
#ifdef USE_FC
currentSensorVirtualState_t currentMeterVirtualState; currentSensorVirtualState_t currentMeterVirtualState;
void currentMeterVirtualInit(void) void currentMeterVirtualInit(void)
@ -171,6 +174,7 @@ void currentMeterVirtualRead(currentMeter_t *meter)
meter->amperage = currentMeterVirtualState.amperage; meter->amperage = currentMeterVirtualState.amperage;
meter->mAhDrawn = currentMeterVirtualState.mahDrawnState.mAhDrawn; meter->mAhDrawn = currentMeterVirtualState.mahDrawnState.mAhDrawn;
} }
#endif
// //
// ESC // ESC
@ -178,19 +182,16 @@ void currentMeterVirtualRead(currentMeter_t *meter)
#ifdef USE_ESC_SENSOR #ifdef USE_ESC_SENSOR
currentMeterESCState_t currentMeterESCState; currentMeterESCState_t currentMeterESCState;
#endif
void currentMeterESCInit(void) void currentMeterESCInit(void)
{ {
#ifdef USE_ESC_SENSOR
memset(&currentMeterESCState, 0, sizeof(currentMeterESCState_t)); memset(&currentMeterESCState, 0, sizeof(currentMeterESCState_t));
#endif
} }
void currentMeterESCRefresh(int32_t lastUpdateAt) void currentMeterESCRefresh(int32_t lastUpdateAt)
{ {
UNUSED(lastUpdateAt); UNUSED(lastUpdateAt);
#ifdef USE_ESC_SENSOR
escSensorData_t *escData = getEscSensorData(ESC_SENSOR_COMBINED); escSensorData_t *escData = getEscSensorData(ESC_SENSOR_COMBINED);
if (escData->dataAge <= ESC_BATTERY_AGE_MAX) { if (escData->dataAge <= ESC_BATTERY_AGE_MAX) {
currentMeterESCState.amperage = escData->current; currentMeterESCState.amperage = escData->current;
@ -199,26 +200,18 @@ void currentMeterESCRefresh(int32_t lastUpdateAt)
currentMeterESCState.amperage = 0; currentMeterESCState.amperage = 0;
currentMeterESCState.mAhDrawn = 0; currentMeterESCState.mAhDrawn = 0;
} }
#endif
} }
void currentMeterESCReadCombined(currentMeter_t *meter) void currentMeterESCReadCombined(currentMeter_t *meter)
{ {
#ifdef USE_ESC_SENSOR
meter->amperageLatest = currentMeterESCState.amperage; meter->amperageLatest = currentMeterESCState.amperage;
meter->amperage = currentMeterESCState.amperage; meter->amperage = currentMeterESCState.amperage;
meter->mAhDrawn = currentMeterESCState.mAhDrawn; meter->mAhDrawn = currentMeterESCState.mAhDrawn;
#else
currentMeterReset(meter); currentMeterReset(meter);
#endif
} }
void currentMeterESCReadMotor(uint8_t motorNumber, currentMeter_t *meter) void currentMeterESCReadMotor(uint8_t motorNumber, currentMeter_t *meter)
{ {
#ifndef USE_ESC_SENSOR
UNUSED(motorNumber);
currentMeterReset(meter);
#else
escSensorData_t *escData = getEscSensorData(motorNumber); escSensorData_t *escData = getEscSensorData(motorNumber);
if (escData && escData->dataAge <= ESC_BATTERY_AGE_MAX) { if (escData && escData->dataAge <= ESC_BATTERY_AGE_MAX) {
meter->amperage = escData->current; meter->amperage = escData->current;
@ -227,8 +220,8 @@ void currentMeterESCReadMotor(uint8_t motorNumber, currentMeter_t *meter)
} else { } else {
currentMeterReset(meter); currentMeterReset(meter);
} }
#endif
} }
#endif
// //
// API for current meters using IDs // API for current meters using IDs
@ -240,19 +233,22 @@ void currentMeterRead(currentMeterId_e id, currentMeter_t *meter)
{ {
if (id == CURRENT_METER_ID_BATTERY_1) { if (id == CURRENT_METER_ID_BATTERY_1) {
currentMeterADCRead(meter); currentMeterADCRead(meter);
} else if (id == CURRENT_METER_ID_VIRTUAL_1) { }
#ifdef USE_FC
else if (id == CURRENT_METER_ID_VIRTUAL_1) {
currentMeterVirtualRead(meter); currentMeterVirtualRead(meter);
} }
#endif
#ifdef USE_ESC_SENSOR #ifdef USE_ESC_SENSOR
if (id == CURRENT_METER_ID_ESC_COMBINED_1) { else if (id == CURRENT_METER_ID_ESC_COMBINED_1) {
currentMeterESCReadCombined(meter); currentMeterESCReadCombined(meter);
} else }
if (id >= CURRENT_METER_ID_ESC_MOTOR_1 && id <= CURRENT_METER_ID_ESC_MOTOR_20 ) { else if (id >= CURRENT_METER_ID_ESC_MOTOR_1 && id <= CURRENT_METER_ID_ESC_MOTOR_20 ) {
int motor = id - CURRENT_METER_ID_ESC_MOTOR_1; int motor = id - CURRENT_METER_ID_ESC_MOTOR_1;
currentMeterESCReadMotor(motor, meter); currentMeterESCReadMotor(motor, meter);
} else }
#endif #endif
{ else {
currentMeterReset(meter); currentMeterReset(meter);
} }
} }