aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/STM32/multi
diff options
context:
space:
mode:
Diffstat (limited to 'testhal/STM32/multi')
-rw-r--r--testhal/STM32/multi/PAL/.cproject5
-rw-r--r--testhal/STM32/multi/PAL/Makefile6
-rw-r--r--testhal/STM32/multi/PAL/Makefile-stm32f407_discovery2
-rw-r--r--testhal/STM32/multi/PAL/cfg-stm32f407_discovery/halconf.h4
-rw-r--r--testhal/STM32/multi/PAL/cfg-stm32f407_discovery/mcuconf.h36
-rw-r--r--testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.h4
6 files changed, 33 insertions, 24 deletions
diff --git a/testhal/STM32/multi/PAL/.cproject b/testhal/STM32/multi/PAL/.cproject
index 09c151162..5538eef94 100644
--- a/testhal/STM32/multi/PAL/.cproject
+++ b/testhal/STM32/multi/PAL/.cproject
@@ -120,7 +120,7 @@
<folderInfo id="0.1093754934.1834762588." name="/" resourcePath="">
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1623555534" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1623555534.771003082" name=""/>
- <builder arguments="-f Makefile-stm32f303_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1947457853" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+ <builder arguments="-f Makefile-stm32f407_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1947457853" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.427593883" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.942176940" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.740420435" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
@@ -148,6 +148,9 @@
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="refreshScope" versionNumber="2">
+ <configuration configurationName="Build for STM32F407-Discovery">
+ <resource resourceType="PROJECT" workspacePath="/STM32-PAL"/>
+ </configuration>
<configuration configurationName="Build for STM32F303-Discovery"/>
<configuration configurationName="Default">
<resource resourceType="PROJECT" workspacePath="/STM32-PAL"/>
diff --git a/testhal/STM32/multi/PAL/Makefile b/testhal/STM32/multi/PAL/Makefile
index c6221fcae..cbb7f62a7 100644
--- a/testhal/STM32/multi/PAL/Makefile
+++ b/testhal/STM32/multi/PAL/Makefile
@@ -12,6 +12,10 @@ all:
@make --no-print-directory -f Makefile-stm32f303_discovery all
@echo ====================================================================
@echo
+ @echo === Building for STM32F407-Discovery ===============================
+ @make --no-print-directory -f Makefile-stm32f407_discovery all
+ @echo ====================================================================
+ @echo
clean:
@echo
@@ -19,6 +23,8 @@ clean:
@echo
-@make --no-print-directory -f Makefile-stm32f303_discovery clean
@echo
+ -@make --no-print-directory -f Makefile-stm32f407_discovery clean
+ @echo
#
##############################################################################
diff --git a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery b/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
index 8252630c6..be76e94fc 100644
--- a/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
+++ b/testhal/STM32/multi/PAL/Makefile-stm32f407_discovery
@@ -86,7 +86,7 @@ endif
PROJECT = ch
# Imported source files and paths
-CHIBIOS = ../../..
+CHIBIOS = ../../../..
CONFDIR := ./cfg-stm32f407_discovery
BUILDDIR := ./build-stm32f407_discovery
DEPDIR := ./.dep-stm32f407_discovery
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/halconf.h b/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/halconf.h
index 63c29ccef..63edfac75 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/halconf.h
+++ b/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/halconf.h
@@ -146,7 +146,7 @@
* @brief Enables the SERIAL over USB subsystem.
*/
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
-#define HAL_USE_SERIAL_USB TRUE
+#define HAL_USE_SERIAL_USB FALSE
#endif
/**
@@ -167,7 +167,7 @@
* @brief Enables the USB subsystem.
*/
#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
-#define HAL_USE_USB TRUE
+#define HAL_USE_USB FALSE
#endif
/**
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/mcuconf.h
index 8173f018b..6cd1b89d3 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/mcuconf.h
+++ b/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/mcuconf.h
@@ -65,6 +65,24 @@
#define STM32_BKPRAM_ENABLE FALSE
/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY 6
+#define STM32_IRQ_EXTI1_PRIORITY 6
+#define STM32_IRQ_EXTI2_PRIORITY 6
+#define STM32_IRQ_EXTI3_PRIORITY 6
+#define STM32_IRQ_EXTI4_PRIORITY 6
+#define STM32_IRQ_EXTI5_9_PRIORITY 6
+#define STM32_IRQ_EXTI10_15_PRIORITY 6
+#define STM32_IRQ_EXTI16_PRIORITY 6
+#define STM32_IRQ_EXTI17_PRIORITY 15
+#define STM32_IRQ_EXTI18_PRIORITY 6
+#define STM32_IRQ_EXTI19_PRIORITY 6
+#define STM32_IRQ_EXTI20_PRIORITY 6
+#define STM32_IRQ_EXTI21_PRIORITY 15
+#define STM32_IRQ_EXTI22_PRIORITY 15
+
+/*
* ADC driver system settings.
*/
#define STM32_ADC_ADCPRE ADC_CCR_ADCPRE_DIV4
@@ -104,24 +122,6 @@
#define STM32_DAC_DAC1_CH2_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
/*
- * EXT driver system settings.
- */
-#define STM32_EXT_EXTI0_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI1_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI2_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI3_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI4_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI16_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI17_IRQ_PRIORITY 15
-#define STM32_EXT_EXTI18_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI19_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI20_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI21_IRQ_PRIORITY 15
-#define STM32_EXT_EXTI22_IRQ_PRIORITY 15
-
-/*
* GPT driver system settings.
*/
#define STM32_GPT_USE_TIM1 FALSE
diff --git a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.h b/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.h
index 0fbe3f9d1..39dd2e553 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.h
+++ b/testhal/STM32/multi/PAL/cfg-stm32f407_discovery/portab.h
@@ -29,8 +29,8 @@
/* Module constants. */
/*===========================================================================*/
-#define PORTAB_LINE_LED1 LINE_LED4_BLUE
-#define PORTAB_LINE_LED2 LINE_LED3_RED
+#define PORTAB_LINE_LED1 LINE_LED3
+#define PORTAB_LINE_LED2 LINE_LED4
#define PORTAB_LEN_OFF PAL_LOW
#define PORTAB_LEN_ON PAL_HIGH
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 12:56:39 +0000