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

[all] Issue 17 fixed (lowercase is now the default)

Browse Source 
[all] Issue 28 fixed (10 beeps on countdown during the last 10 seconds)
[all] Issue 37 fixed (Pwr+) added
[all] Issue 39 fixed (Potscroll too slow)
[Taranis] Bug with delays on 3 states switches
[Taranis/sky9x/gruvin9x] Date & Time not always saved
This commit is contained in:
bsongis@gmail.com
2013-05-26 20:48:26 +00:00
parent 33fff62c0c
commit 1aff10dc35
24 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/telemetry/frsky.cpp
+8 -10
View File
@@ -684,20 +684,18 @@ void telemetryInterrupt10ms()
}
#if defined(CPUARM)
frskyData.power = (current * voltage) / 100;
frskyData.hub.power = (current * voltage) / 100;
#else
frskyData.power = ((current>>1) * (voltage>>1)) / 25;
frskyData.hub.power = ((current>>1) * (voltage>>1)) / 25;
#endif
#if 0
if (frskyData.power > frskyData.maxPower)
frskyData.maxPower = frskyData.power;
#endif
if (frskyData.hub.power > frskyData.hub.maxPower)
frskyData.hub.maxPower = frskyData.hub.power;
frskyData.currentPrescale += current;
if (frskyData.currentPrescale >= 3600) {
frskyData.currentConsumption += 1;
frskyData.currentPrescale -= 3600;
frskyData.hub.currentPrescale += current;
if (frskyData.hub.currentPrescale >= 3600) {
frskyData.hub.currentConsumption += 1;
frskyData.hub.currentPrescale -= 3600;
}
}