aboutsummaryrefslogtreecommitdiffstats
path: root/testhal
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-04-01 13:06:44 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-04-01 13:06:44 +0000
commitd8420eb83a4b843ad23d0fbe77fea36272adc525 (patch)
tree6f3b4576c53b3105a2bf800360c96212c8d476ac /testhal
parent875a7d8f4151039f4c47b05c0d4f196575b8d109 (diff)
downloadChibiOS-d8420eb83a4b843ad23d0fbe77fea36272adc525.tar.gz
ChibiOS-d8420eb83a4b843ad23d0fbe77fea36272adc525.tar.bz2
ChibiOS-d8420eb83a4b843ad23d0fbe77fea36272adc525.zip
Added advanced mode and BTRD handling to the STM32 PWM driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2861 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal')
-rw-r--r--testhal/STM32/ADC/mcuconf.h1
-rw-r--r--testhal/STM32/CAN/mcuconf.h1
-rw-r--r--testhal/STM32/GPT/mcuconf.h1
-rw-r--r--testhal/STM32/IRQ_STORM/mcuconf.h1
-rw-r--r--testhal/STM32/PWM-ICU/main.c3
-rw-r--r--testhal/STM32/PWM-ICU/mcuconf.h1
-rw-r--r--testhal/STM32/SPI/mcuconf.h1
-rw-r--r--testhal/STM32/UART/mcuconf.h1
-rw-r--r--testhal/STM32/USB_CDC/mcuconf.h1
-rw-r--r--testhal/STM32/USB_MSC/mcuconf.h1
10 files changed, 12 insertions, 0 deletions
diff --git a/testhal/STM32/ADC/mcuconf.h b/testhal/STM32/ADC/mcuconf.h
index bd96de17b..94e9c5d15 100644
--- a/testhal/STM32/ADC/mcuconf.h
+++ b/testhal/STM32/ADC/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 TRUE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/CAN/mcuconf.h b/testhal/STM32/CAN/mcuconf.h
index bd96de17b..94e9c5d15 100644
--- a/testhal/STM32/CAN/mcuconf.h
+++ b/testhal/STM32/CAN/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 TRUE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/GPT/mcuconf.h b/testhal/STM32/GPT/mcuconf.h
index 90a7e9fc7..c7dc8742c 100644
--- a/testhal/STM32/GPT/mcuconf.h
+++ b/testhal/STM32/GPT/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 FALSE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/IRQ_STORM/mcuconf.h b/testhal/STM32/IRQ_STORM/mcuconf.h
index 52ca1d806..d27660a12 100644
--- a/testhal/STM32/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/IRQ_STORM/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 FALSE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/PWM-ICU/main.c b/testhal/STM32/PWM-ICU/main.c
index c89b71988..3f7b6423e 100644
--- a/testhal/STM32/PWM-ICU/main.c
+++ b/testhal/STM32/PWM-ICU/main.c
@@ -43,7 +43,10 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL},
{PWM_OUTPUT_DISABLED, NULL}
},
+ 0,
+#if STM32_PWM_USE_ADVANCED
0
+#endif
};
icucnt_t last_width, last_period;
diff --git a/testhal/STM32/PWM-ICU/mcuconf.h b/testhal/STM32/PWM-ICU/mcuconf.h
index bd96de17b..94e9c5d15 100644
--- a/testhal/STM32/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/PWM-ICU/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 TRUE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/SPI/mcuconf.h b/testhal/STM32/SPI/mcuconf.h
index cd2052da7..d1f919486 100644
--- a/testhal/STM32/SPI/mcuconf.h
+++ b/testhal/STM32/SPI/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 TRUE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/UART/mcuconf.h b/testhal/STM32/UART/mcuconf.h
index bd96de17b..94e9c5d15 100644
--- a/testhal/STM32/UART/mcuconf.h
+++ b/testhal/STM32/UART/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 TRUE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/USB_CDC/mcuconf.h b/testhal/STM32/USB_CDC/mcuconf.h
index bd96de17b..94e9c5d15 100644
--- a/testhal/STM32/USB_CDC/mcuconf.h
+++ b/testhal/STM32/USB_CDC/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 TRUE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE
diff --git a/testhal/STM32/USB_MSC/mcuconf.h b/testhal/STM32/USB_MSC/mcuconf.h
index bd96de17b..94e9c5d15 100644
--- a/testhal/STM32/USB_MSC/mcuconf.h
+++ b/testhal/STM32/USB_MSC/mcuconf.h
@@ -91,6 +91,7 @@
/*
* PWM driver system settings.
*/
+#define STM32_PWM_USE_ADVANCED TRUE
#define STM32_PWM_USE_TIM1 TRUE
#define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 FALSE