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

Merge pull request #11169 from SteveCEvans/f411_osd

Browse source 
Reduce number of OSD bytes transferred in polled mode
This commit is contained in:
haslinghuis 2021-12-28 22:07:22 +01:00 • committed by GitHub
commit 3d9b7cf490
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/drivers/max7456.c
View file

@ -205,7 +205,7 @@ static uint8_t shadowBuffer[VIDEO_BUFFER_CHARS_PAL];
//Max bytes to update in one call to max7456DrawScreen() //Max bytes to update in one call to max7456DrawScreen()
#define MAX_BYTES2SEND 250 #define MAX_BYTES2SEND 250
#define MAX_BYTES2SEND_POLLED 25 #define MAX_BYTES2SEND_POLLED 20
static DMA_DATA uint8_t spiBuf[MAX_BYTES2SEND]; static DMA_DATA uint8_t spiBuf[MAX_BYTES2SEND];

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

@ -1151,7 +1151,7 @@ void osdUpdate(timeUs_t currentTimeUs)
osdUpdateAlarms(); osdUpdateAlarms();
if (resumeRefreshAt) { if (resumeRefreshAt) {
osdState = OSD_STATE_IDLE; osdState = OSD_STATE_TRANSFER;
} else { } else {
osdState = OSD_STATE_UPDATE_CANVAS; osdState = OSD_STATE_UPDATE_CANVAS;
} }

8
src/test/unit/osd_unittest.cc
View file

@ -709,7 +709,7 @@ TEST_F(OsdTest, TestAlarms)
// elements showing values in alarm range should flash // elements showing values in alarm range should flash
simulationTime += 1000000; simulationTime += 1000000;
simulationTime -= simulationTime % 1000000; simulationTime -= simulationTime % 1000000;
timeUs_t startTime = simulationTime; timeUs_t startTime = simulationTime + 0.25e6;
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
// Blinking should happen at 2Hz // Blinking should happen at 2Hz
simulationTime = startTime + i*0.25e6; simulationTime = startTime + i*0.25e6;
@ -1083,7 +1083,6 @@ TEST_F(OsdTest, TestElementWarningsBattery)
// Delay as the warnings are flashing // Delay as the warnings are flashing
simulationTime += 1000000; simulationTime += 1000000;
simulationTime -= simulationTime % 1000000; simulationTime -= simulationTime % 1000000;
simulationTime += 0.25e6;
osdRefresh(); osdRefresh();
// then // then
@ -1099,7 +1098,6 @@ TEST_F(OsdTest, TestElementWarningsBattery)
// Delay as the warnings are flashing // Delay as the warnings are flashing
simulationTime += 1000000; simulationTime += 1000000;
simulationTime -= simulationTime % 1000000; simulationTime -= simulationTime % 1000000;
simulationTime += 0.25e6;
osdRefresh(); osdRefresh();
// then // then
@ -1206,7 +1204,7 @@ TEST_F(OsdTest, TestGpsElements)
// Sat indicator should blink and show "NC" // Sat indicator should blink and show "NC"
simulationTime += 1000000; simulationTime += 1000000;
simulationTime -= simulationTime % 1000000; simulationTime -= simulationTime % 1000000;
timeUs_t startTime = simulationTime; timeUs_t startTime = simulationTime + 0.25e6;
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
// Blinking should happen at 2Hz // Blinking should happen at 2Hz
simulationTime = startTime + i*0.25e6; simulationTime = startTime + i*0.25e6;
@ -1230,7 +1228,7 @@ TEST_F(OsdTest, TestGpsElements)
// Sat indicator should blink and show "0" // Sat indicator should blink and show "0"
simulationTime += 1000000; simulationTime += 1000000;
simulationTime -= simulationTime % 1000000; simulationTime -= simulationTime % 1000000;
startTime = simulationTime; startTime = simulationTime + 0.25e6;
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
// Blinking should happen at 2Hz // Blinking should happen at 2Hz
simulationTime = startTime + i*0.25e6; simulationTime = startTime + i*0.25e6;