Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Center logo and CMS display for HD OSD (#12056)

Browse source 
Center logo & CMS display
This commit is contained in:
Steve Evans 2022-12-17 02:02:46 +00:00 • committed by GitHub
parent 23cc2ca02d
commit 28c3f4c7e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/cms/cms.c
View file

@ -936,9 +936,9 @@ void cmsMenuOpen(void)
} else { } else {
smallScreen = false; smallScreen = false;
linesPerMenuItem = 1; linesPerMenuItem = 1;
leftMenuColumn = 2; leftMenuColumn = (pCurrentDisplay->cols / 2) - 13;
#ifdef CMS_OSD_RIGHT_ALIGNED_VALUES #ifdef CMS_OSD_RIGHT_ALIGNED_VALUES
rightMenuColumn = pCurrentDisplay->cols - 2; rightMenuColumn = (pCurrentDisplay->cols / 2) + 13;
#else #else
rightMenuColumn = pCurrentDisplay->cols - CMS_DRAW_BUFFER_LEN; rightMenuColumn = pCurrentDisplay->cols - CMS_DRAW_BUFFER_LEN;
#endif #endif

13
src/main/io/displayport_msp.c
View file

@ -40,6 +40,8 @@
#include "msp/msp_protocol.h" #include "msp/msp_protocol.h"
#include "msp/msp_serial.h" #include "msp/msp_serial.h"
#include "osd/osd.h"
#include "pg/vcd.h" #include "pg/vcd.h"
static displayPort_t mspDisplayPort; static displayPort_t mspDisplayPort;
@ -163,9 +165,14 @@ static bool isSynced(const displayPort_t *displayPort)
static void redraw(displayPort_t *displayPort) static void redraw(displayPort_t *displayPort)
{ {
const uint8_t displayRows = (vcdProfile()->video_system == VIDEO_SYSTEM_PAL) ? 16 : 13; if (vcdProfile()->video_system == VIDEO_SYSTEM_HD) {
displayPort->rows = displayRows + displayPortProfileMsp()->rowAdjust; displayPort->rows = osdConfig()->canvas_rows;
displayPort->cols = 30 + displayPortProfileMsp()->colAdjust; displayPort->cols = osdConfig()->canvas_cols;
} else {
const uint8_t displayRows = (vcdProfile()->video_system == VIDEO_SYSTEM_PAL) ? 16 : 13;
displayPort->rows = displayRows + displayPortProfileMsp()->rowAdjust;
displayPort->cols = 30 + displayPortProfileMsp()->colAdjust;
}
drawScreen(displayPort); drawScreen(displayPort);
} }

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

@ -113,6 +113,9 @@ const char * const osdTimerSourceNames[] = {
"ON/ARM " "ON/ARM "
}; };
#define OSD_LOGO_ROWS 4
#define OSD_LOGO_COLS 24
// Things in both OSD and CMS // Things in both OSD and CMS
#define IS_HI(X) (rcData[X] > 1750) #define IS_HI(X) (rcData[X] > 1750)
@ -429,8 +432,8 @@ static void osdDrawLogo(int x, int y)
{ {
// display logo and help // display logo and help
int fontOffset = 160; int fontOffset = 160;
for (int row = 0; row < 4; row++) { for (int row = 0; row < OSD_LOGO_ROWS; row++) {
for (int column = 0; column < 24; column++) { for (int column = 0; column < OSD_LOGO_COLS; column++) {
if (fontOffset <= SYM_END_OF_FONT) if (fontOffset <= SYM_END_OF_FONT)
displayWriteChar(osdDisplayPort, x + column, y + row, DISPLAYPORT_ATTR_NORMAL, fontOffset++); displayWriteChar(osdDisplayPort, x + column, y + row, DISPLAYPORT_ATTR_NORMAL, fontOffset++);
} }
@ -439,6 +442,9 @@ static void osdDrawLogo(int x, int y)
static void osdCompleteInitialization(void) static void osdCompleteInitialization(void)
{ {
uint8_t midRow = osdDisplayPort->rows / 2;
uint8_t midCol = osdDisplayPort->cols / 2;
armState = ARMING_FLAG(ARMED); armState = ARMING_FLAG(ARMED);
osdResetAlarms(); osdResetAlarms();
@ -449,21 +455,21 @@ static void osdCompleteInitialization(void)
displayBeginTransaction(osdDisplayPort, DISPLAY_TRANSACTION_OPT_RESET_DRAWING); displayBeginTransaction(osdDisplayPort, DISPLAY_TRANSACTION_OPT_RESET_DRAWING);
displayClearScreen(osdDisplayPort, DISPLAY_CLEAR_WAIT); displayClearScreen(osdDisplayPort, DISPLAY_CLEAR_WAIT);
osdDrawLogo(3, 1); osdDrawLogo(midCol - (OSD_LOGO_COLS) / 2, midRow - 7);
char string_buffer[30]; char string_buffer[30];
tfp_sprintf(string_buffer, "V%s", FC_VERSION_STRING); tfp_sprintf(string_buffer, "V%s", FC_VERSION_STRING);
displayWrite(osdDisplayPort, 20, 6, DISPLAYPORT_ATTR_NORMAL, string_buffer); displayWrite(osdDisplayPort, midCol + 5, midRow - 2, DISPLAYPORT_ATTR_NORMAL, string_buffer);
#ifdef USE_CMS #ifdef USE_CMS
displayWrite(osdDisplayPort, 7, 8, DISPLAYPORT_ATTR_NORMAL, CMS_STARTUP_HELP_TEXT1); displayWrite(osdDisplayPort, midCol - 8, midRow, DISPLAYPORT_ATTR_NORMAL, CMS_STARTUP_HELP_TEXT1);
displayWrite(osdDisplayPort, 11, 9, DISPLAYPORT_ATTR_NORMAL, CMS_STARTUP_HELP_TEXT2); displayWrite(osdDisplayPort, midCol - 4, midRow + 1, DISPLAYPORT_ATTR_NORMAL, CMS_STARTUP_HELP_TEXT2);
displayWrite(osdDisplayPort, 11, 10, DISPLAYPORT_ATTR_NORMAL, CMS_STARTUP_HELP_TEXT3); displayWrite(osdDisplayPort, midCol - 4, midRow + 2, DISPLAYPORT_ATTR_NORMAL, CMS_STARTUP_HELP_TEXT3);
#endif #endif
#ifdef USE_RTC_TIME #ifdef USE_RTC_TIME
char dateTimeBuffer[FORMATTED_DATE_TIME_BUFSIZE]; char dateTimeBuffer[FORMATTED_DATE_TIME_BUFSIZE];
if (osdFormatRtcDateTime(&dateTimeBuffer[0])) { if (osdFormatRtcDateTime(&dateTimeBuffer[0])) {
displayWrite(osdDisplayPort, 5, 12, DISPLAYPORT_ATTR_NORMAL, dateTimeBuffer); displayWrite(osdDisplayPort, midCol - 10, midRow + 6, DISPLAYPORT_ATTR_NORMAL, dateTimeBuffer);
} }
#endif #endif
@ -1063,7 +1069,9 @@ static timeDelta_t osdShowArmed(void)
displayClearScreen(osdDisplayPort, DISPLAY_CLEAR_WAIT); displayClearScreen(osdDisplayPort, DISPLAY_CLEAR_WAIT);
if ((osdConfig()->logo_on_arming == OSD_LOGO_ARMING_ON) || ((osdConfig()->logo_on_arming == OSD_LOGO_ARMING_FIRST) && !ARMING_FLAG(WAS_EVER_ARMED))) { if ((osdConfig()->logo_on_arming == OSD_LOGO_ARMING_ON) || ((osdConfig()->logo_on_arming == OSD_LOGO_ARMING_FIRST) && !ARMING_FLAG(WAS_EVER_ARMED))) {
osdDrawLogo(3, 1); uint8_t midRow = osdDisplayPort->rows / 2;
uint8_t midCol = osdDisplayPort->cols / 2;
osdDrawLogo(midCol - (OSD_LOGO_COLS) / 2, midRow - 5);
ret = osdConfig()->logo_on_arming_duration * 1e5; ret = osdConfig()->logo_on_arming_duration * 1e5;
} else { } else {
ret = (REFRESH_1S / 2); ret = (REFRESH_1S / 2);