From e8579e7e8e4faf6b7d73af20fea552d466f45a33 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Wed, 26 Dec 2018 22:17:51 -0500
Subject: [PATCH] reviving stm32f1

---
 firmware/.project                             |  9 ---------
 firmware/Makefile                             | 11 ++++++++++-
 firmware/config/stm32f1egt/!compile-f1egt.bat |  9 +++++++++
 firmware/hw_layer/hw_layer.mk                 |  8 +++++++-
 4 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 firmware/config/stm32f1egt/!compile-f1egt.bat

diff --git a/firmware/.project b/firmware/.project
index 598adca5c8..0fd19fa37f 100644
--- a/firmware/.project
+++ b/firmware/.project
@@ -25,15 +25,6 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<filteredResources>
-		<filter>
-			<id>1491445130159</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-stm32f1egt</arguments>
-			</matcher>
-		</filter>
 		<filter>
 			<id>1491445130166</id>
 			<name></name>
diff --git a/firmware/Makefile b/firmware/Makefile
index 582018e448..8dbc361078 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -150,6 +150,10 @@ ifeq ($(LDSCRIPT),)
   LDSCRIPT= config/stm32f4ems/STM32F407xG.ld
 endif
 
+ifeq ($(PROJECT_CPU),)
+  PROJECT_CPU=ST_STM32F4
+endif                 
+
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CSRC = $(STARTUPSRC) \
@@ -223,6 +227,11 @@ TCPPSRC =
 # List ASM source files here
 ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
 
+ifeq ($(CONFIGPATH),)
+  CONFIGPATH=config/stm32f4ems
+endif
+
+
 INCDIR = $(CHIBIOS)/os/license \
         $(PORTINC) \
 	$(OSALINC) \
@@ -237,7 +246,7 @@ INCDIR = $(CHIBIOS)/os/license \
 	$(CHIBIOS)/os/hal/lib/streams \
 	$(CHIBIOS)/os/various \
 	$(CHIBIOS)/os/various/devices_lib/accel \
-	config/stm32f4ems \
+	$(CONFIGPATH) \
 	config/engines \
 	config \
 	ext \
diff --git a/firmware/config/stm32f1egt/!compile-f1egt.bat b/firmware/config/stm32f1egt/!compile-f1egt.bat
new file mode 100644
index 0000000000..da7e9b6758
--- /dev/null
+++ b/firmware/config/stm32f1egt/!compile-f1egt.bat
@@ -0,0 +1,9 @@
+rem 
+rem STM32F469 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215
+rem
+
+cd ../../..
+set EXTRA_PARAMS="-DSTM32F469xx"
+set PROJECT_CPU=ST_STM32F1
+set LDSCRIPT=config/stm32f1egt/STM32F103xB.ld
+call compile_and_program.bat -r
diff --git a/firmware/hw_layer/hw_layer.mk b/firmware/hw_layer/hw_layer.mk
index 6590fa91e8..f508f395b1 100644
--- a/firmware/hw_layer/hw_layer.mk
+++ b/firmware/hw_layer/hw_layer.mk
@@ -35,9 +35,15 @@ ifeq ($(PROJECT_CPU),ST_STM32F7)
 HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/stm32f7/stm32f7xx_hal_flash.c \
 				$(PROJECT_DIR)/hw_layer/stm32f7/stm32f7xx_hal_flash_ex.c
 HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/stm32f7/mpu_util.cpp
-else
+endif
+
+ifeq ($(PROJECT_CPU),ST_STM32F4)
 HW_LAYER_EMS += $(PROJECT_DIR)/hw_layer/stm32f4/stm32f4xx_hal_flash.c \
 				$(PROJECT_DIR)/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
 HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/stm32f4/mpu_util.cpp
 endif
+	
+ifeq ($(PROJECT_CPU),ST_STM32F1)
+HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/stm32f1/mpu_util.cpp
+endif
 	
\ No newline at end of file