piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

United setting of cell voltage in frskySetCellVoltage()

Browse Source
This commit is contained in:
Damjan Adamic
2014-07-02 12:24:19 +02:00
parent 1e25e368d2
commit e6370ebb2a
4 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/frsky.cpp
+21
View File
@@ -607,3 +607,24 @@ void telemetryInit(void)
// we don't reset the telemetry here as we would also reset the consumption after model load
}
#if defined(CPUARM)
void frskySetCellVoltage(uint8_t battnumber, uint16_t cellVolts) {
#elif defined(FRSKY_HUB)
void frskySetCellVoltage(uint8_t battnumber, uint8_t cellVolts) {
#endif
frskyData.hub.cellVolts[battnumber] = cellVolts;
if (!frskyData.hub.minCellVolts || cellVolts<frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) {
//update minimum cell voltage (Cell) and its cell number
frskyData.hub.minCellIdx = battnumber;
frskyData.hub.minCellVolts = cellVolts;
#if defined(CPUARM)
if (!frskyData.hub.minCell || frskyData.hub.minCellVolts<frskyData.hub.minCell) {
//update all time minimum cell voltage (Cell-)
frskyData.hub.minCell = frskyData.hub.minCellVolts;
}
#endif
}
}
radio/src/telemetry/frsky.h
+6
View File
@@ -461,4 +461,10 @@ void telemetryReset();
void telemetryInit(void);
void telemetryInterrupt10ms(void);
#if defined(CPUARM)
void frskySetCellVoltage(uint8_t battnumber, uint16_t cellVolts);
#elif defined(FRSKY_HUB)
void frskySetCellVoltage(uint8_t battnumber, uint8_t cellVolts);
#endif
#endif
radio/src/telemetry/frsky_d.cpp
+1 -9
View File
@@ -227,15 +227,7 @@ void parseTelemHubByte(uint8_t byte)
#else
uint8_t cellVolts = (uint8_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 10);
#endif
frskyData.hub.cellVolts[battnumber] = cellVolts;
if (!frskyData.hub.minCellVolts || cellVolts<frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) {
frskyData.hub.minCellIdx = battnumber;
frskyData.hub.minCellVolts = cellVolts;
#if defined(CPUARM)
if (!frskyData.hub.minCell || frskyData.hub.minCellVolts<frskyData.hub.minCell)
frskyData.hub.minCell = frskyData.hub.minCellVolts;
#endif
}
frskySetCellVoltage(battnumber, cellVolts);
}
break;
}
radio/src/telemetry/frsky_sport.cpp
+3 -33
View File
@@ -248,13 +248,7 @@ void processHubPacket(uint8_t id, uint16_t value)
#else
uint8_t cellVolts = (uint8_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 10);
#endif
frskyData.hub.cellVolts[battnumber] = cellVolts;
if (!frskyData.hub.minCellVolts || cellVolts<frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) {
frskyData.hub.minCellIdx = battnumber;
frskyData.hub.minCellVolts = cellVolts;
if (!frskyData.hub.minCell || frskyData.hub.minCellVolts<frskyData.hub.minCell)
frskyData.hub.minCell = frskyData.hub.minCellVolts;
}
frskySetCellVoltage(battnumber, cellVolts);
}
break;
}
@@ -473,32 +467,8 @@ void frskySportProcessPacket(uint8_t *packet)
else if (appId >= CELLS_FIRST_ID && appId <= CELLS_LAST_ID) {
uint32_t cells = SPORT_DATA_U32(packet);
uint8_t battnumber = cells & 0xF;
uint32_t minCell, minCellNum;
//TODO: Use reported total voltages (bits 4-7)?
frskyData.hub.cellVolts[battnumber] = ((cells & 0x000FFF00) >> 8) / 5;
frskyData.hub.cellVolts[battnumber+1] = ((cells & 0xFFF00000) >> 20) / 5;
if (frskyData.hub.cellsCount < battnumber+2)
frskyData.hub.cellsCount = battnumber+2;
if (frskyData.hub.cellVolts[battnumber+1] == 0)
frskyData.hub.cellsCount--;
if ((frskyData.hub.cellVolts[battnumber] < frskyData.hub.cellVolts[battnumber+1]) || (frskyData.hub.cellVolts[battnumber+1] == 0)) {
minCell = frskyData.hub.cellVolts[battnumber];
minCellNum = battnumber;
}
else {
minCell = frskyData.hub.cellVolts[battnumber+1];
minCellNum = battnumber+1;
}
if (!frskyData.hub.minCellVolts || minCell < frskyData.hub.minCellVolts || minCellNum==frskyData.hub.minCellIdx) {
frskyData.hub.minCellIdx = minCellNum;
frskyData.hub.minCellVolts = minCell;
if (!frskyData.hub.minCell || frskyData.hub.minCellVolts<frskyData.hub.minCell)
frskyData.hub.minCell = frskyData.hub.minCellVolts;
}
frskySetCellVoltage(battnumber, (uint16_t) ((cells & 0x000FFF00) >> 8) / 5);
frskySetCellVoltage(battnumber+1, (uint16_t) ((cells & 0xFFF00000) >> 20) / 5);
}
break;
}