Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 16:55:36 +03:00
Code Issues Wiki Activity

Touch ups

Browse source 
- Renamed some variables
- Video system constants are now defined in vcd.h
- Removed video system default initializer from max7456.c
This commit is contained in:
jflyper 2016-11-17 02:48:01 +09:00
parent cfa3852495
commit 11128daaa6
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,10 +66,11 @@ volatile bool dmaTransactionInProgress = false;
static uint8_t spiBuff[MAX_CHARS2UPDATE*6];
static uint8_t videoSignalCfg = 0;
static uint8_t videoSignalReg = VIDEO_MODE_PAL | OSD_ENABLE; //PAL by default
static uint8_t hosValue;
static uint8_t vosValue;
static uint8_t videoSignalCfg;
static uint8_t videoSignalReg = OSD_ENABLE; // OSD_ENABLE required to trigger first ReInit
static uint8_t hosRegValue; // HOS (Horizontal offset register) value
static uint8_t vosRegValue; // VOS (Vertical offset register) value
static bool max7456Lock = false;
static bool fontIsLoading = false;
@ -195,10 +196,7 @@ void max7456_dma_irq_handler(dmaChannelDescriptor_t* descriptor)
uint8_t max7456GetRowsCount(void)
{
if (videoSignalReg & VIDEO_MODE_PAL)
return VIDEO_LINES_PAL;
return VIDEO_LINES_NTSC;
return (videoSignalReg & VIDEO_MODE_PAL) ? VIDEO_LINES_PAL : VIDEO_LINES_NTSC;
}
//because MAX7456 need some time to detect video system etc. we need to wait for a while to initialize it at startup
@ -217,21 +215,21 @@ void max7456ReInit(void)
ENABLE_MAX7456;
switch(videoSignalCfg) {
case PAL:
case VIDEO_SYSTEM_PAL:
videoSignalReg = VIDEO_MODE_PAL | OSD_ENABLE;
break;
case NTSC:
case VIDEO_SYSTEM_NTSC:
videoSignalReg = VIDEO_MODE_NTSC | OSD_ENABLE;
break;
default:
case VIDEO_SYSTEM_AUTO:
srdata = max7456Send(MAX7456ADD_STAT, 0x00);
if ((0x02 & srdata) == 0x02)
videoSignalReg = VIDEO_MODE_NTSC | OSD_ENABLE;
else
videoSignalReg = VIDEO_MODE_PAL | OSD_ENABLE;
break;
}
max7456Send(MAX7456ADD_HOS, hosValue);
max7456Send(MAX7456ADD_VOS, vosValue);
if (videoSignalReg & VIDEO_MODE_PAL) { //PAL
maxScreenSize = VIDEO_BUFFER_CHARS_PAL;
maxScreenRows = VIDEO_LINES_PAL;
@ -247,6 +245,9 @@ void max7456ReInit(void)
// make sure the Max7456 is enabled
max7456Send(VM0_REG, videoSignalReg);
max7456Send(MAX7456ADD_HOS, hosRegValue);
max7456Send(MAX7456ADD_VOS, vosRegValue);
max7456Send(DMM_REG, CLEAR_DISPLAY);
DISABLE_MAX7456;
@ -274,9 +275,11 @@ void max7456Init(vcdProfile_t *pVcdProfile)
ENABLE_MAX7456;
max7456Send(VM0_REG, MAX7456_RESET);
DISABLE_MAX7456;
// Setup values to write to registers
videoSignalCfg = pVcdProfile->video_system;
hosValue = 32 - pVcdProfile->h_offset;
vosValue = 16 - pVcdProfile->v_offset;
hosRegValue = 32 - pVcdProfile->h_offset;
vosRegValue = 16 - pVcdProfile->v_offset;
#ifdef MAX7456_DMA_CHANNEL_TX
dmaSetHandler(MAX7456_DMA_IRQ_HANDLER_ID, max7456_dma_irq_handler, NVIC_PRIO_MAX7456_DMA, 0);