Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 06:45:16 +03:00
Code Issues Wiki Activity

Simplified the OSD blink frequency calculation.

Browse source
This commit is contained in:
Michael Keller 2021-01-01 23:50:23 +01:00
parent 932d6dc153
commit a702ee1a5b
5 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/osd/osd.c
View file

@ -250,7 +250,7 @@ void osdAnalyzeActiveElements(void)
osdDrawActiveElementsBackground(osdDisplayPort);
}
static void osdDrawElements(timeUs_t currentTimeUs)
static void osdDrawElements(void)
{
// Hide OSD when OSDSW mode is active
if (IS_RC_MODE_ACTIVE(BOXOSD)) {
@ -268,7 +268,7 @@ static void osdDrawElements(timeUs_t currentTimeUs)
displayClearScreen(osdDisplayPort);
}
osdDrawActiveElements(osdDisplayPort, currentTimeUs);
osdDrawActiveElements(osdDisplayPort);
}
const uint16_t osdTimerDefault[OSD_TIMER_COUNT] = {
@ -982,7 +982,7 @@ STATIC_UNIT_TESTED void osdRefresh(timeUs_t currentTimeUs)
#endif
{
osdUpdateAlarms();
osdDrawElements(currentTimeUs);
osdDrawElements();
displayHeartbeat(osdDisplayPort);
}
displayCommitTransaction(osdDisplayPort);
@ -1024,13 +1024,7 @@ void osdUpdate(timeUs_t currentTimeUs)
#endif
// redraw values in buffer
#ifdef USE_MAX7456
#define DRAW_FREQ_DENOM 5
#else
#define DRAW_FREQ_DENOM 10 // MWOSD @ 115200 baud (
#endif
if (counter % DRAW_FREQ_DENOM == 0) {
if (counter % OSD_DRAW_FREQ_DENOM == 0) {
osdRefresh(currentTimeUs);
showVisualBeeper = false;
} else {
@ -1039,7 +1033,7 @@ void osdUpdate(timeUs_t currentTimeUs)
// For the MSP displayPort device only do the drawScreen once per
// logical OSD cycle as there is no output buffering needing to be flushed.
if (osdDisplayPortDeviceType == OSD_DISPLAYPORT_DEVICE_MSP) {
doDrawScreen = (counter % DRAW_FREQ_DENOM == 1);
doDrawScreen = (counter % OSD_DRAW_FREQ_DENOM == 1);
}
#endif
// Redraw a portion of the chars per idle to spread out the load and SPI bus utilization