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

Fixup after rebase

Browse source
This commit is contained in:
Martin Budden 2016-11-16 20:06:09 +00:00
parent 7c8d1967d0
commit e4cb051b13
7 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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));

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

@ -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);

4
src/main/io/displayport_max7456.c
View file

@ -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;
}

3
src/main/io/displayport_max7456.h
View file

@ -17,4 +17,5 @@
#pragma once
displayPort_t *max7456DisplayPortInit(uint8_t videoSystem);
struct vcdProfile_s;
displayPort_t *max7456DisplayPortInit(const struct vcdProfile_s *vcdProfile);

5
src/main/io/osd.c
View file

@ -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

2
src/main/main.c
View file

@ -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

3
src/test/unit/cms_unittest.cc
View file

@ -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;
}