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

Introduced frskyCellVoltage_t type and united code with frskyUpdateCells()

Browse Source
This commit is contained in:
Damjan Adamic
2014-07-02 12:57:36 +02:00
parent e6370ebb2a
commit 038365e639
4 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/frsky.cpp
+12 -6
View File
@@ -608,12 +608,7 @@ 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
void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts) {
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
@@ -628,3 +623,14 @@ void frskySetCellVoltage(uint8_t battnumber, uint8_t cellVolts) {
}
}
void frskyUpdateCells(void) {
// Voltage => Cell number + Cell voltage
uint8_t battnumber = ((frskyData.hub.volts & 0x00F0) >> 4);
if (battnumber < 12) {
if (frskyData.hub.cellsCount < battnumber+1) {
frskyData.hub.cellsCount = battnumber+1;
}
frskyCellVoltage_t cellVolts = (frskyCellVoltage_t) (((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / (5*TELEMETRY_CELL_VOLTAGE_MUTLIPLIER));
frskySetCellVoltage(battnumber, cellVolts);
}
}
radio/src/telemetry/frsky.h
+5 -2
View File
@@ -462,9 +462,12 @@ void telemetryInit(void);
void telemetryInterrupt10ms(void);
#if defined(CPUARM)
void frskySetCellVoltage(uint8_t battnumber, uint16_t cellVolts);
typedef uint16_t frskyCellVoltage_t;
#elif defined(FRSKY_HUB)
void frskySetCellVoltage(uint8_t battnumber, uint8_t cellVolts);
typedef uint16_t frskyCellVoltage_t;
#endif
void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts);
void frskyUpdateCells(void);
#endif
radio/src/telemetry/frsky_d.cpp
+1 -13
View File
@@ -216,19 +216,7 @@ void parseTelemHubByte(uint8_t byte)
case offsetof(FrskySerialData, volts):
{
// Voltage => Cell number + Cell voltage
uint8_t battnumber = ((frskyData.hub.volts & 0x00F0) >> 4);
if (battnumber < 12) {
if (frskyData.hub.cellsCount < battnumber+1) {
frskyData.hub.cellsCount = battnumber+1;
}
#if defined(CPUARM)
uint16_t cellVolts = (uint16_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 5);
#else
uint8_t cellVolts = (uint8_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 10);
#endif
frskySetCellVoltage(battnumber, cellVolts);
}
frskyUpdateCells();
break;
}
radio/src/telemetry/frsky_sport.cpp
+3 -15
View File
@@ -237,19 +237,7 @@ void processHubPacket(uint8_t id, uint16_t value)
case VOLTS_ID:
{
// Voltage => Cell number + Cell voltage
uint8_t battnumber = ((frskyData.hub.volts & 0x00F0) >> 4);
if (battnumber < 12) {
if (frskyData.hub.cellsCount < battnumber+1) {
frskyData.hub.cellsCount = battnumber+1;
}
#if defined(CPUARM)
uint16_t cellVolts = (uint16_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 5);
#else
uint8_t cellVolts = (uint8_t)(((((frskyData.hub.volts & 0xFF00) >> 8) + ((frskyData.hub.volts & 0x000F) << 8))) / 10);
#endif
frskySetCellVoltage(battnumber, cellVolts);
}
frskyUpdateCells();
break;
}
@@ -467,8 +455,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;
frskySetCellVoltage(battnumber, (uint16_t) ((cells & 0x000FFF00) >> 8) / 5);
frskySetCellVoltage(battnumber+1, (uint16_t) ((cells & 0xFFF00000) >> 20) / 5);
frskySetCellVoltage(battnumber, (frskyCellVoltage_t) ((cells & 0x000FFF00) >> 8) / 5);
frskySetCellVoltage(battnumber+1, (frskyCellVoltage_t) ((cells & 0xFFF00000) >> 20) / 5);
}
break;
}