From b70ff10d231ee0cc1636a3b8f15becd495928ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Fri, 28 Jun 2019 17:33:04 +0200
Subject: [PATCH] hw_config: add KakuteF7 target

---
 .gitignore      |  1 +
 Makefile        | 13 +++++++++----
 board_types.txt |  2 +-
 hw_config.h     | 50 ++++++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf99a21fd1..260b4d5b04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.d
 *.elf
 *.bin
+*.hex
 Bootloader.zip
 Bootloader.sublime-workspace
 .gdbinit
diff --git a/Makefile b/Makefile
index b7facbd5e5..1e8c5a16dc 100644
--- a/Makefile
+++ b/Makefile
@@ -53,11 +53,15 @@ export ARCH_SRCS	 = cdcacm.c  usart.c
 # string
 #
 TARGETS	= \
-	fmuk66v3_bl \
 	aerofcv1_bl \
 	auavx2v1_bl \
+	avx_v1_bl \
 	crazyflie_bl \
+	cube_f4_bl \
+	fmuk66v3_bl \
+	kakutef7_bl \
 	mindpxv2_bl \
+	nxphlitev3_bl \
 	omnibusf4sd_bl \
 	px4aerocore_bl \
 	px4discovery_bl \
@@ -70,9 +74,7 @@ TARGETS	= \
 	px4fmuv5_bl \
 	px4io_bl \
 	px4iov3_bl \
-	tapv1_bl \
-	cube_f4_bl \
-	avx_v1_bl
+	tapv1_bl
 
 all:	$(TARGETS) sizes
 
@@ -91,6 +93,9 @@ fmuk66v3_bl: $(MAKEFILE_LIST) $(LIBKINETIS)
 auavx2v1_bl: $(MAKEFILE_LIST) $(LIBOPENCM3)
 	${MAKE} ${MKFLAGS} -f  Makefile.f4 TARGET_HW=AUAV_X2V1  LINKER_FILE=stm32f4.ld TARGET_FILE_NAME=$@
 
+kakutef7_bl: $(MAKEFILE_LIST) $(LIBOPENCM3)
+	${MAKE} ${MKFLAGS} -f  Makefile.f7 TARGET_HW=KAKUTEF7 LINKER_FILE=stm32f7.ld TARGET_FILE_NAME=$@
+
 px4fmu_bl: $(MAKEFILE_LIST) $(LIBOPENCM3)
 	${MAKE} ${MKFLAGS} -f  Makefile.f4 TARGET_HW=PX4_FMU_V1 LINKER_FILE=stm32f4.ld TARGET_FILE_NAME=$@
 
diff --git a/board_types.txt b/board_types.txt
index a963d8a3ee..c55449bd37 100644
--- a/board_types.txt
+++ b/board_types.txt
@@ -24,6 +24,7 @@ TARGET_HW_AUAV_X2V1                    33
 TARGET_HW_AEROFC_V1                    65
 TARGET_HW_CUBE_F4                       9
 TARGET_HW_AV_V1                        29
+TARGET_HW_KAKUTEF7                    123
 
 # values from external vendors
 EXT_HW_RADIOLINK_MINI_PIX               3
@@ -35,7 +36,6 @@ EXT_HW_RADIOLINK_MINI_PIX               3
 AP_HW_CUBE_ORANGE                     120
 AP_HW_OMNIBUSF7V2                     121
 AP_HW_KAKUTEF4                        122
-AP_HW_KAKUTEF7                        123
 AP_HW_REVOLUTION                      124
 AP_HW_MATEKF405                       125
 AP_HW_NUCLEOF767ZI                    126
diff --git a/hw_config.h b/hw_config.h
index ffa99839b3..273cd4a7e6 100644
--- a/hw_config.h
+++ b/hw_config.h
@@ -710,7 +710,6 @@
 
 # define APP_LOAD_ADDRESS               0x08008000
 # define BOOTLOADER_DELAY               5000
-# define BOARD_OMNIBUSF4SD
 # define INTERFACE_USB                  1
 # define INTERFACE_USART                0
 # define USBDEVICESTRING                "PX4 OmnibusF4SD"
@@ -732,11 +731,56 @@
 # define BOARD_LED_OFF                  gpio_set
 
 # define BOARD_USB_VBUS_SENSE_DISABLED
-//# define BOARD_PIN_VBUS                 GPIO5
-//# define BOARD_PORT_VBUS                GPIOC
 
 # define USBMFGSTRING                   "Vertile"
 
+/****************************************************************************
+ * TARGET_HW_KAKUTEF7
+ ****************************************************************************/
+
+#elif  defined(TARGET_HW_KAKUTEF7)
+
+# define APP_LOAD_ADDRESS               0x08018000
+# define BOOTLOADER_DELAY               5000
+# define INTERFACE_USB                  1
+# define INTERFACE_USART                0
+# define USBDEVICESTRING                "PX4 KakuteF7"
+# define USBPRODUCTID                   0x0016
+# define BOOT_DELAY_ADDRESS             0x000001a0
+
+# define BOARD_TYPE                     123
+# define BOARD_FLASH_SECTORS            7
+# define BOARD_FLASH_SIZE               (1024 * 1024)
+# define BOARD_FIRST_FLASH_SECTOR_TO_ERASE	2
+# define APP_RESERVATION_SIZE			(2 * 32 * 1024) /* 2 32 Kib Sectors */
+
+# define OSC_FREQ                       8
+
+# define BOARD_PIN_LED_ACTIVITY         0
+# define BOARD_PIN_LED_BOOTLOADER       GPIO2 // BLUE
+# define BOARD_PORT_LEDS                GPIOA
+# define BOARD_CLOCK_LEDS               RCC_AHB1ENR_GPIOAEN
+# define BOARD_LED_ON                   gpio_clear
+# define BOARD_LED_OFF                  gpio_set
+
+# define USBMFGSTRING                   "Holybro"
+
+// VBUS sense is connected to PA8 instead of PA9
+# define BOARD_USB_VBUS_SENSE_DISABLED
+# define BOARD_PORT_VBUS                GPIOA
+# define BOARD_PIN_VBUS                 GPIO8
+
+# define BOARD_USART  					USART3 // labeled as UART3
+# define BOARD_USART_CLOCK_REGISTER     RCC_APB1ENR
+# define BOARD_USART_CLOCK_BIT          RCC_APB1ENR_USART3EN
+# define BOARD_PORT_USART               GPIOB
+# define BOARD_PORT_USART_AF            GPIO_AF7
+# define BOARD_PIN_TX                   GPIO10
+# define BOARD_PIN_RX                   GPIO11
+# define BOARD_USART_PIN_CLOCK_REGISTER RCC_AHB1ENR
+# define BOARD_USART_PIN_CLOCK_BIT      RCC_AHB1ENR_GPIOBEN
+# define SERIAL_BREAK_DETECT_DISABLED   1
+
 /****************************************************************************
  * TARGET_HW_AUAV_X2V1
  ****************************************************************************/