From edad1486be8839955dea50249c0007ccaca9c530 Mon Sep 17 00:00:00 2001 From: jamming Date: Tue, 22 Nov 2016 20:29:35 +0800 Subject: [PATCH 1/5] changes log --- src/main/target/KAKUTEF4/target.h | 9 +++++++++ src/main/target/KAKUTEF4/target.mk | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index a23d58a37..0a7891461 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -59,6 +59,15 @@ #define USE_BARO_MS5611 //#define USE_BARO_BMP280 +#define OSD +#define USE_MAX7456 +#define MAX7456_SPI_INSTANCE SPI3 +#define MAX7456_SPI_CS_PIN PB14 + +#define MAX7456_DMA_CHANNEL_TX DMA1_Stream5 +#define MAX7456_DMA_CHANNEL_RX DMA1_Stream0 +#define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER + #define M25P16_CS_PIN PB3 #define M25P16_SPI_INSTANCE SPI3 diff --git a/src/main/target/KAKUTEF4/target.mk b/src/main/target/KAKUTEF4/target.mk index b334aa90f..36ff91768 100644 --- a/src/main/target/KAKUTEF4/target.mk +++ b/src/main/target/KAKUTEF4/target.mk @@ -6,4 +6,6 @@ TARGET_SRC = \ drivers/barometer_bmp280.c \ drivers/barometer_ms5611.c \ drivers/compass_ak8963.c \ - drivers/compass_hmc5883l.c \ No newline at end of file + drivers/compass_hmc5883l.c \ + drivers/max7456.c \ + io/osd.c \ No newline at end of file From 874588fbce933d1ebf15b6914d940473400491e1 Mon Sep 17 00:00:00 2001 From: jamming Date: Wed, 23 Nov 2016 09:04:16 +0800 Subject: [PATCH 2/5] changes log --- src/main/target/KAKUTEF4/target.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/target/KAKUTEF4/target.mk b/src/main/target/KAKUTEF4/target.mk index 36ff91768..4b0fbb669 100644 --- a/src/main/target/KAKUTEF4/target.mk +++ b/src/main/target/KAKUTEF4/target.mk @@ -7,5 +7,4 @@ TARGET_SRC = \ drivers/barometer_ms5611.c \ drivers/compass_ak8963.c \ drivers/compass_hmc5883l.c \ - drivers/max7456.c \ - io/osd.c \ No newline at end of file + drivers/max7456.c \ No newline at end of file From 6a7feb3615f0e4817c9f2d5570dfe99bd16bfa11 Mon Sep 17 00:00:00 2001 From: jamming Date: Wed, 23 Nov 2016 13:19:25 +0800 Subject: [PATCH 3/5] changes log --- src/main/target/KAKUTEF4/target.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/target/KAKUTEF4/target.mk b/src/main/target/KAKUTEF4/target.mk index 4b0fbb669..ee640c0f1 100644 --- a/src/main/target/KAKUTEF4/target.mk +++ b/src/main/target/KAKUTEF4/target.mk @@ -7,4 +7,5 @@ TARGET_SRC = \ drivers/barometer_ms5611.c \ drivers/compass_ak8963.c \ drivers/compass_hmc5883l.c \ - drivers/max7456.c \ No newline at end of file + drivers/max7456.c + \ No newline at end of file From 0459775db99af572104fddf7eea9eeb782b87752 Mon Sep 17 00:00:00 2001 From: jamming Date: Fri, 25 Nov 2016 09:24:16 +0800 Subject: [PATCH 4/5] changes log --- src/main/target/KAKUTEF4/target.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/target/KAKUTEF4/target.mk b/src/main/target/KAKUTEF4/target.mk index ee640c0f1..1013bda91 100644 --- a/src/main/target/KAKUTEF4/target.mk +++ b/src/main/target/KAKUTEF4/target.mk @@ -8,4 +8,6 @@ TARGET_SRC = \ drivers/compass_ak8963.c \ drivers/compass_hmc5883l.c \ drivers/max7456.c + + \ No newline at end of file From 2956df5ba1bb06154aace7681db6ff1744d59ec9 Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Fri, 25 Nov 2016 08:17:59 +0000 Subject: [PATCH 5/5] Update target.mk --- src/main/target/KAKUTEF4/target.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/target/KAKUTEF4/target.mk b/src/main/target/KAKUTEF4/target.mk index 1013bda91..10665d163 100644 --- a/src/main/target/KAKUTEF4/target.mk +++ b/src/main/target/KAKUTEF4/target.mk @@ -7,7 +7,4 @@ TARGET_SRC = \ drivers/barometer_ms5611.c \ drivers/compass_ak8963.c \ drivers/compass_hmc5883l.c \ - drivers/max7456.c - - - \ No newline at end of file + drivers/max7456.c