Wrong type corrected and cosmetic fixes

This commit is contained in:
Damjan Adamic
2014-07-02 16:08:31 +02:00
parent 038365e639
commit 7e758ce7ad
2 changed files with 5 additions and 3 deletions
+4 -2
View File
@@ -608,7 +608,8 @@ void telemetryInit(void)
// we don't reset the telemetry here as we would also reset the consumption after model load // we don't reset the telemetry here as we would also reset the consumption after model load
} }
void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts) { void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts)
{
frskyData.hub.cellVolts[battnumber] = cellVolts; frskyData.hub.cellVolts[battnumber] = cellVolts;
if (!frskyData.hub.minCellVolts || cellVolts<frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) { if (!frskyData.hub.minCellVolts || cellVolts<frskyData.hub.minCellVolts || battnumber==frskyData.hub.minCellIdx) {
//update minimum cell voltage (Cell) and its cell number //update minimum cell voltage (Cell) and its cell number
@@ -623,7 +624,8 @@ void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts) {
} }
} }
void frskyUpdateCells(void) { void frskyUpdateCells(void)
{
// Voltage => Cell number + Cell voltage // Voltage => Cell number + Cell voltage
uint8_t battnumber = ((frskyData.hub.volts & 0x00F0) >> 4); uint8_t battnumber = ((frskyData.hub.volts & 0x00F0) >> 4);
if (battnumber < 12) { if (battnumber < 12) {
+1 -1
View File
@@ -464,7 +464,7 @@ void telemetryInterrupt10ms(void);
#if defined(CPUARM) #if defined(CPUARM)
typedef uint16_t frskyCellVoltage_t; typedef uint16_t frskyCellVoltage_t;
#elif defined(FRSKY_HUB) #elif defined(FRSKY_HUB)
typedef uint16_t frskyCellVoltage_t; typedef uint8_t frskyCellVoltage_t;
#endif #endif
void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts); void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts);