398 commits

Author	SHA1	Message	Date
borisbstyle	09d16bd0cb	Merge branch 'master' into development	2016-10-07 01:41:55 +02:00
Dan Nixon	9d4c240671	New OSD features (#1263) ... * Add max. alt to stats * Allow toggle of crosshair separate from AH	2016-10-04 22:50:59 -07:00
Martin Budden	3fa5669c7c	Removed rssi extern from .c files	2016-10-02 16:29:07 +01:00
borisbstyle	73e952ce16	Move PID relaxation to only D	2016-10-02 00:58:33 +02:00
Martin Budden	9889b1db9c	Move master_t required #includes into config_master.h	2016-10-01 14:10:09 +01:00
Martin Budden	ea4e7de729	Fixup after rebase	2016-09-26 19:29:46 +01:00
Martin Budden	a11d0bdb4d	Split escAndServoConfig into motor and servo parts	2016-09-26 19:24:52 +01:00
borisbstyle	3c4608d6fa	Merge branch 'master' into development	2016-09-26 00:51:27 +02:00
Marcin Baliniak	bae96d9595	Fixed ident style and compilation for targets with MAX on DMA	2016-09-25 17:51:27 +02:00
Dan Nixon	03f340fe14	Merge branch 'master' into development ... Conflicts: src/main/build/version.h src/main/drivers/max7456.c src/main/io/osd.c src/main/io/osd.h src/main/target/OMNIBUSF4/target.c	2016-09-25 11:31:44 +01:00
Marcin Baliniak	419547a2bf	Merge remote-tracking branch 'upstream/master'	2016-09-25 11:57:43 +02:00
Marcin Baliniak	2d83570923	Fixed problem with feature save via OSD, and better LED strip color display in menu	2016-09-25 11:49:08 +02:00
Marcin Baliniak	171b03bfb7	efactor MAX7456 driver code	2016-09-25 11:42:53 +02:00
Marcin Baliniak	0892c4786b	Merge remote-tracking branch 'upstream/master'	2016-09-25 11:24:51 +02:00
Dan Nixon	aa15dec809	Fix issues intriduced in #1218	2016-09-24 23:19:10 +01:00
Marcin Baliniak	d9774666da	fixed current value in statistics and some minor fixes	2016-09-24 22:31:24 +02:00
Dan Nixon	814c043d01	Correct switch indentation and function name	2016-09-24 16:26:21 +01:00
Dan Nixon	bd699f1353	Replace uint8_t with bool, refactor item display code ... Removes uplicate code from OSD element display	2016-09-24 15:01:01 +01:00
Dan Nixon	aea5666cfb	Refactor OSD code	2016-09-24 13:57:26 +01:00
Marcin Baliniak	a8a5b72f29	Fixed some small bugs and some new menu items	2016-09-23 00:56:27 +02:00
Marcin Baliniak	ad927edc16	Fixed problem for hidding Horizon in options	2016-09-20 20:13:53 +02:00
Marcin Baliniak	46ef430d44	Merge remote-tracking branch 'upstream/master'	2016-09-19 22:28:33 +02:00
borisbstyle	79ca006431	Merge pull request #1171 from DanNixon/osd_altitude ... Add barometric altitude to OSD	2016-09-19 11:58:28 +02:00
Dan Nixon	184bf12d3e	Add baro altitude to OSD	2016-09-18 22:46:56 +01:00
Marcin Baliniak	1e2a961bcd	New stack for OSD with full menus for PIDs etc. ... There is a lot of changes and fixes in driver also	2016-09-18 21:27:09 +02:00
Martin Budden	2f9ca4355c	currentTime passed in scheduler task call	2016-09-17 16:01:37 +01:00
Martin Budden	490f11c9ae	Split eeprom code into separate module	2016-08-11 09:54:56 +01:00
mikeller	f9354e53b3	Graft of 'cli_diff_command' into 'master'.	2016-08-10 00:03:53 +12:00
mikeller	31c3790a5d	Added CLI 'diff' command.	2016-08-09 07:26:32 +12:00
Martin Budden	541f4d4018	Directory rearrangement to reflect cleanflight changes	2016-08-07 13:44:00 +01:00
nathan	d66c9b3ee6	set the default position on craft name so that the preview is readable in the configurator	2016-08-02 01:25:06 -07:00
Evgeny Sychov	69955d7b07	display craft name, current mesurement on OSD	2016-08-01 02:14:40 -07:00
Evgeny Sychov	d6ce148ae6	Merge remote-tracking branch 'origin/development' into osd-improvement	2016-06-27 15:39:11 -07:00
Evgeny Sychov	6068d5daba	Fix blinking	2016-06-27 15:31:48 -07:00
Evgeny Sychov	224043be4e	MAX7456 driver - add support for SPI DMA	2016-06-27 10:55:41 -07:00
Martin Budden	4d238b27d5	Moved targetLooptime into gyro_t, tidied gyro_sync and gyro	2016-06-26 16:15:06 +01:00
Evgeny Sychov	135ffc1c92	cleanup config.c, Makefile, OSD, and VTX	2016-06-18 00:33:10 -07:00
Evgeny Sychov	ddf0fb5fda	Use io tags in vtx, move vtx initialization out of OSD init	2016-06-17 02:37:41 -07:00
nathan	8b581d945b	msp for display and layout	2016-06-16 23:49:15 -07:00
nathan	1a7ed10ef1	artificial horizon	2016-06-16 19:36:04 -07:00
nathan	e9868c4e37	namespace a few vars add some #defines for clarity	2016-06-16 19:36:00 -07:00
nathan	b95e540217	merge in savaga	2016-06-16 02:29:52 -07:00
Evgeny Sychov	d73f28fe94	Add support for VTX output power attenuation, Fix timerHardware definition	2016-06-16 01:34:01 -07:00
nathan	437ca5025b	use the mw/scarab-osd font symbols	2016-06-15 23:38:33 -07:00
nathan	e07808e2a8	it builds	2016-06-15 21:02:48 -07:00
Evgeny Sychov	067c02bbd6	remove sirinfpv related stuff from config.c, rename rtc6705 to soft_spi_rtc6705, fix some minor bugs	2016-06-14 01:05:51 -07:00
nathan	d1841df0d5	init cursor_x	2016-06-13 22:53:46 -07:00
nathan	0fd8774d50	takin' a look	2016-06-13 22:53:37 -07:00