mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-23 00:05:33 +03:00
Fixup after rebase
This commit is contained in:
parent
7c8d1967d0
commit
e4cb051b13
7 changed files with 8 additions and 13 deletions
|
@ -378,7 +378,7 @@ void max7456ReInit(void)
|
|||
|
||||
|
||||
//here we init only CS and try to init MAX for first time
|
||||
void max7456Init(vcdProfile_t *pVcdProfile)
|
||||
void max7456Init(const vcdProfile_t *pVcdProfile)
|
||||
{
|
||||
#ifdef MAX7456_SPI_CS_PIN
|
||||
max7456CsPin = IOGetByTag(IO_TAG(MAX7456_SPI_CS_PIN));
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
extern uint16_t maxScreenSize;
|
||||
|
||||
void max7456Init(vcdProfile_t *vcdProfile);
|
||||
void max7456Init(const vcdProfile_t *vcdProfile);
|
||||
void max7456DrawScreen(void);
|
||||
void max7456WriteNvm(uint8_t char_address, const uint8_t *font_data);
|
||||
uint8_t max7456GetRowsCount(void);
|
||||
|
|
|
@ -131,10 +131,10 @@ static const displayPortVTable_t max7456VTable = {
|
|||
.txBytesFree = txBytesFree,
|
||||
};
|
||||
|
||||
displayPort_t *max7456DisplayPortInit(uint8_t system)
|
||||
displayPort_t *max7456DisplayPortInit(const vcdProfile_t *vcdProfile)
|
||||
{
|
||||
displayInit(&max7456DisplayPort, &max7456VTable);
|
||||
max7456Init(system);
|
||||
max7456Init(vcdProfile);
|
||||
resync(&max7456DisplayPort);
|
||||
return &max7456DisplayPort;
|
||||
}
|
||||
|
|
|
@ -17,4 +17,5 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
displayPort_t *max7456DisplayPortInit(uint8_t videoSystem);
|
||||
struct vcdProfile_s;
|
||||
displayPort_t *max7456DisplayPortInit(const struct vcdProfile_s *vcdProfile);
|
||||
|
|
|
@ -419,11 +419,6 @@ void osdInit(displayPort_t *osdDisplayPortToUse)
|
|||
|
||||
armState = ARMING_FLAG(ARMED);
|
||||
|
||||
// This will eventually go away when moving to a full displayPort
|
||||
// oriented implementation, or replaced with hal.
|
||||
|
||||
max7456Init(&masterConfig.vcdProfile);
|
||||
|
||||
displayClearScreen(osdDisplayPort);
|
||||
|
||||
// display logo and help
|
||||
|
|
|
@ -409,7 +409,7 @@ void init(void)
|
|||
if (feature(FEATURE_OSD)) {
|
||||
#ifdef USE_MAX7456
|
||||
// if there is a max7456 chip for the OSD then use it, otherwise use MSP
|
||||
displayPort_t *osdDisplayPort = max7456DisplayPortInit(masterConfig.osdProfile.video_system);
|
||||
displayPort_t *osdDisplayPort = max7456DisplayPortInit(&masterConfig.vcdProfile);
|
||||
#else
|
||||
displayPort_t *osdDisplayPort = displayPortMspInit();
|
||||
#endif
|
||||
|
|
|
@ -96,10 +96,9 @@ static const displayPortVTable_t testDisplayPortVTable = {
|
|||
|
||||
displayPort_t *displayPortTestInit(void)
|
||||
{
|
||||
testDisplayPort.vTable = &testDisplayPortVTable;
|
||||
displayInit(&testDisplayPort, &testDisplayPortVTable);
|
||||
testDisplayPort.rows = 10;
|
||||
testDisplayPort.cols = 40;
|
||||
testDisplayPort.isGrabbed = false;
|
||||
return &testDisplayPort;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue