rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix constatnt names, move vtx_channel config variable out of OSD ifdef

This commit is contained in:
Evgeny Sychov 2016-06-15 23:54:31 -07:00
parent e57ed066bc
commit 74ec4a0337
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/config/config_master.h
View File

@ -125,8 +125,11 @@ typedef struct master_t {
uint8_t transponderData[6];
#endif
#ifdef OSD
#ifdef USE_RTC6705
uint8_t vtx_channel;
#endif
#ifdef OSD
osd_profile osdProfile;
#endif

10
src/main/drivers/max7456.c
View File

@ -35,14 +35,14 @@
#define ENABLE_MAX7456 GPIO_ResetBits(MAX7456_CS_GPIO, MAX7456_CS_PIN)
/** PAL or NTSC, value is number of chars total */
#define VIDEO_MODE_PIXELS_NTSC 390
#define VIDEO_MODE_PIXELS_PAL 480
#define VIDEO_BUFFER_CHARS_NTSC 390
#define VIDEO_BUFFER_CHARS_PAL 480
uint16_t max_screen_size;
uint8_t video_signal_type = 0;
uint8_t max7456_lock = 0;
char screen[VIDEO_MODE_PIXELS_PAL];
char screen[VIDEO_BUFFER_CHARS_PAL];
uint8_t max7456_send(uint8_t add, uint8_t data) {
@ -85,10 +85,10 @@ void max7456_init(uint8_t system) {
}
if (video_signal_type) { //PAL
max_screen_size = VIDEO_MODE_PIXELS_PAL;
max_screen_size = VIDEO_BUFFER_CHARS_PAL;
max_screen_rows = 16;
} else { // NTSC
max_screen_size = VIDEO_MODE_PIXELS_NTSC;
max_screen_size = VIDEO_BUFFER_CHARS_NTSC;
max_screen_rows = 13;
}