From 91dcea80536f43178ac23b3eae8c5672a3eb379e Mon Sep 17 00:00:00 2001 From: Kenneth Mitchell Date: Sun, 16 Sep 2018 19:19:40 -0400 Subject: [PATCH] Relocate G-force calculation. --- src/main/io/osd.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/io/osd.c b/src/main/io/osd.c index 8cecdaa410..1b18fbb0d3 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -738,16 +738,8 @@ static bool osdDrawSingleElement(uint8_t item) } case OSD_G_FORCE: - { - osdGForce = 0.0f; - for (int axis = 0; axis < XYZ_AXIS_COUNT; axis++) { - const float a = accAverage[axis]; - osdGForce += a * a; - } - osdGForce = sqrtf(osdGForce) * acc.dev.acc_1G_rec; - tfp_sprintf(buff, "%01d.%01dG", (int)osdGForce, (int)(osdGForce * 10) % 10); - break; - } + tfp_sprintf(buff, "%01d.%01dG", (int)osdGForce, (int)(osdGForce * 10) % 10); + break; case OSD_ROLL_PIDS: osdFormatPID(buff, "ROL", ¤tPidProfile->pid[PID_ROLL]); @@ -1050,6 +1042,12 @@ static void osdDrawElements(void) } if (sensors(SENSOR_ACC)) { + osdGForce = 0.0f; + for (int axis = 0; axis < XYZ_AXIS_COUNT; axis++) { + const float a = accAverage[axis]; + osdGForce += a * a; + } + osdGForce = sqrtf(osdGForce) * acc.dev.acc_1G_rec; osdDrawSingleElement(OSD_ARTIFICIAL_HORIZON); osdDrawSingleElement(OSD_G_FORCE); }