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

Add displayPortProfile

Browse source
This commit is contained in:
jflyper 2017-01-16 19:37:40 +09:00
parent 7acaf05b15
commit d33977a506
9 changed files with 54 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/config/config_master.h
View file

@ -33,6 +33,7 @@
#include "drivers/vcd.h"
#include "drivers/light_led.h"
#include "drivers/flash.h"
#include "drivers/display.h"
#include "fc/rc_controls.h"
@ -105,7 +106,9 @@
#define servoProfile(x) (&masterConfig.servoProfile)
#define customMotorMixer(i) (&masterConfig.customMotorMixer[i])
#define customServoMixer(i) (&masterConfig.customServoMixer[i])
#define displayPortProfileMsp(x) (&masterConfig.displayPortProfileMsp)
#define displayPortProfileMax7456(x) (&masterConfig.displayPortProfileMax7456)
#define displayPortProfileOled(x) (&masterConfig.displayPortProfileOled)
// System-wide
typedef struct master_s {
@ -213,6 +216,13 @@ typedef struct master_s {
vcdProfile_t vcdProfile;
#endif
# ifdef USE_MSP_DISPLAYPORT
displayPortProfile_t displayPortProfileMsp;
# endif
# ifdef USE_MAX7456
displayPortProfile_t displayPortProfileMax7456;
# endif
#ifdef USE_SDCARD
sdcardConfig_t sdcardConfig;
#endif

5
src/main/drivers/display.h
View file

@ -43,6 +43,11 @@ typedef struct displayPortVTable_s {
uint32_t (*txBytesFree)(const displayPort_t *displayPort);
} displayPortVTable_t;
typedef struct displayPortProfile_s {
int8_t colAdjust;
int8_t rowAdjust;
} displayPortProfile_t;
void displayGrab(displayPort_t *instance);
void displayRelease(displayPort_t *instance);
void displayReleaseAll(displayPort_t *instance);

9
src/main/fc/cli.c
View file

@ -65,6 +65,7 @@ uint8_t cliMode = 0;
#include "drivers/system.h"
#include "drivers/timer.h"
#include "drivers/vcd.h"
#include "drivers/display.h"
#include "fc/config.h"
#include "fc/rc_controls.h"
@ -797,6 +798,14 @@ const clivalue_t valueTable[] = {
{ "vcd_h_offset", VAR_INT8 | MASTER_VALUE, &vcdProfile()->h_offset, .config.minmax = { -32, 31 } },
{ "vcd_v_offset", VAR_INT8 | MASTER_VALUE, &vcdProfile()->v_offset, .config.minmax = { -15, 16 } },
#endif
#ifdef USE_MSP_DISPLAYPORT
{ "displayport_msp_col_adjust", VAR_INT8 | MASTER_VALUE, &displayPortProfileMsp()->colAdjust, .config.minmax = { -6, 0 } },
{ "displayport_msp_row_adjust", VAR_INT8 | MASTER_VALUE, &displayPortProfileMsp()->rowAdjust, .config.minmax = { -3, 0 } },
#endif
#ifdef OSD
{ "displayport_max7456_col_adjust", VAR_INT8 | MASTER_VALUE, &displayPortProfileMax7456()->colAdjust, .config.minmax = { -6, 0 } },
{ "displayport_max7456_row_adjust", VAR_INT8 | MASTER_VALUE, &displayPortProfileMax7456()->rowAdjust, .config.minmax = { -3, 0 } },
#endif
};
#define VALUE_COUNT (sizeof(valueTable) / sizeof(clivalue_t))

13
src/main/fc/config.c
View file

@ -485,6 +485,12 @@ void resetMax7456Config(vcdProfile_t *pVcdProfile)
}
#endif
void resetDisplayPortProfile(displayPortProfile_t *pDisplayPortProfile)
{
pDisplayPortProfile->colAdjust = 0;
pDisplayPortProfile->rowAdjust = 0;
}
void resetStatusLedConfig(statusLedConfig_t *statusLedConfig)
{
for (int i = 0; i < LED_NUMBER; i++) {
@ -573,6 +579,13 @@ void createDefaultConfig(master_t *config)
intFeatureSet(DEFAULT_FEATURES, featuresPtr);
#endif
#ifdef USE_MSP_DISPLAYPORT
resetDisplayPortProfile(&config->displayPortProfileMsp);
#endif
#ifdef USE_MAX7456
resetDisplayPortProfile(&config->displayPortProfileMax7456);
#endif
#ifdef USE_MAX7456
resetMax7456Config(&config->vcdProfile);
#endif

6
src/main/fc/fc_init.c
View file

@ -392,9 +392,9 @@ 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(vcdProfile());
displayPort_t *osdDisplayPort = max7456DisplayPortInit(vcdProfile(), displayPortProfileMax7456());
#else
displayPort_t *osdDisplayPort = displayPortMspInit();
displayPort_t *osdDisplayPort = displayPortMspInit(displayPortProfileMax7456());
#endif
osdInit(osdDisplayPort);
}
@ -438,7 +438,7 @@ void init(void)
mspSerialInit();
#if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
cmsDisplayPortRegister(displayPortMspInit());
cmsDisplayPortRegister(displayPortMspInit(displayPortProfileMsp()));
#endif
#ifdef USE_CLI

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

@ -30,6 +30,7 @@
#include "drivers/max7456.h"
displayPort_t max7456DisplayPort; // Referenced from osd.c
displayPortProfile_t *max7456DisplayPortProfile;
extern uint16_t refreshTimeout;
@ -101,8 +102,8 @@ static void resync(displayPort_t *displayPort)
{
UNUSED(displayPort);
max7456RefreshAll();
displayPort->rows = max7456GetRowsCount();
displayPort->cols = 30;
displayPort->rows = max7456GetRowsCount() + max7456DisplayPortProfile->rowAdjust;
displayPort->cols = 30 + max7456DisplayPortProfile->colAdjust;
}
static int heartbeat(displayPort_t *displayPort)
@ -131,8 +132,9 @@ static const displayPortVTable_t max7456VTable = {
.txBytesFree = txBytesFree,
};
displayPort_t *max7456DisplayPortInit(const vcdProfile_t *vcdProfile)
displayPort_t *max7456DisplayPortInit(const vcdProfile_t *vcdProfile, displayPortProfile_t *displayPortProfileToUse)
{
max7456DisplayPortProfile = displayPortProfileToUse;
displayInit(&max7456DisplayPort, &max7456VTable);
max7456Init(vcdProfile);
resync(&max7456DisplayPort);

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

@ -18,4 +18,4 @@
#pragma once
struct vcdProfile_s;
displayPort_t *max7456DisplayPortInit(const struct vcdProfile_s *vcdProfile);
displayPort_t *max7456DisplayPortInit(const struct vcdProfile_s *vcdProfile, displayPortProfile_t *displayPortProfileToUse);

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

@ -36,6 +36,8 @@
static displayPort_t mspDisplayPort;
static displayPortProfile_t *mspDisplayPortProfile;
static int output(displayPort_t *displayPort, uint8_t cmd, const uint8_t *buf, int len)
{
UNUSED(displayPort);
@ -116,8 +118,8 @@ static bool isTransferInProgress(const displayPort_t *displayPort)
static void resync(displayPort_t *displayPort)
{
displayPort->rows = 13; // XXX Will reflect NTSC/PAL in the future
displayPort->cols = 30;
displayPort->rows = 13 + mspDisplayPortProfile->rowAdjust; // XXX Will reflect NTSC/PAL in the future
displayPort->cols = 30 + mspDisplayPortProfile->colAdjust;
}
static uint32_t txBytesFree(const displayPort_t *displayPort)
@ -140,8 +142,9 @@ static const displayPortVTable_t mspDisplayPortVTable = {
.txBytesFree = txBytesFree
};
displayPort_t *displayPortMspInit(void)
displayPort_t *displayPortMspInit(displayPortProfile_t *displayPortProfileToUse)
{
mspDisplayPortProfile = displayPortProfileToUse;
displayInit(&mspDisplayPort, &mspDisplayPortVTable);
resync(&mspDisplayPort);
return &mspDisplayPort;

2
src/main/io/displayport_msp.h
View file

@ -18,4 +18,4 @@
#pragma once
struct displayPort_s;
struct displayPort_s *displayPortMspInit(void);
struct displayPort_s *displayPortMspInit(displayPortProfile_t *displayPortProfileToUse);