diff options
| author | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2016-06-25 14:51:10 +0000 |
|---|---|---|
| committer | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2016-06-25 14:51:10 +0000 |
| commit | fe86aae1bf97d96ba38e9424d60593c4e7a5f252 (patch) | |
| tree | 3a96a532b2c96065e47ddbdde93eb8b43ae50fd7 /testhal/STM32 | |
| parent | f7c23bcc06574b91f5ece441cd0449f7e553feca (diff) | |
| download | ChibiOS-fe86aae1bf97d96ba38e9424d60593c4e7a5f252.tar.gz ChibiOS-fe86aae1bf97d96ba38e9424d60593c4e7a5f252.tar.bz2 ChibiOS-fe86aae1bf97d96ba38e9424d60593c4e7a5f252.zip | |
Edits to USB_CDC demo. Added USB voltage validation in hal_lld.c (still not backported)
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9663 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32')
3 files changed, 16 insertions, 16 deletions
diff --git a/testhal/STM32/STM32L4xx/USB_CDC/debug/STM32L4xx-USB_CDC (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32L4xx/USB_CDC/debug/STM32L4xx-USB_CDC (OpenOCD, Flash and Run).launch index d9478c988..352186e82 100644 --- a/testhal/STM32/STM32L4xx/USB_CDC/debug/STM32L4xx-USB_CDC (OpenOCD, Flash and Run).launch +++ b/testhal/STM32/STM32L4xx/USB_CDC/debug/STM32L4xx-USB_CDC (OpenOCD, Flash and Run).launch @@ -35,7 +35,7 @@ <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?><contentList/>"/>
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <globalVariableList/> "/>
-<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList> <memoryBlockExpressionItem> <expression text="0x50000058"/> </memoryBlockExpressionItem> <memoryBlockExpressionItem> <expression text="0x50000058"/> </memoryBlockExpressionItem> </memoryBlockExpressionList> "/>
+<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList> <memoryBlockExpressionItem> <expression text="0x40021004"/> </memoryBlockExpressionItem> </memoryBlockExpressionList> "/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32L4xx-USB_CDC"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
diff --git a/testhal/STM32/STM32L4xx/USB_CDC/halconf.h b/testhal/STM32/STM32L4xx/USB_CDC/halconf.h index f2e2b4f47..63c29ccef 100644 --- a/testhal/STM32/STM32L4xx/USB_CDC/halconf.h +++ b/testhal/STM32/STM32L4xx/USB_CDC/halconf.h @@ -41,7 +41,7 @@ * @brief Enables the ADC subsystem.
*/
#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC TRUE
+#define HAL_USE_ADC FALSE
#endif
/**
diff --git a/testhal/STM32/STM32L4xx/USB_CDC/mcuconf.h b/testhal/STM32/STM32L4xx/USB_CDC/mcuconf.h index e78811e11..713bc0e85 100644 --- a/testhal/STM32/STM32L4xx/USB_CDC/mcuconf.h +++ b/testhal/STM32/STM32L4xx/USB_CDC/mcuconf.h @@ -40,7 +40,7 @@ #define STM32_VOS STM32_VOS_RANGE1
#define STM32_PVD_ENABLE FALSE
#define STM32_PLS STM32_PLS_LEV0
-#define STM32_HSI16_ENABLED FALSE
+#define STM32_HSI16_ENABLED TRUE
#define STM32_LSI_ENABLED TRUE
#define STM32_HSE_ENABLED FALSE
#define STM32_LSE_ENABLED TRUE
@@ -49,12 +49,12 @@ #define STM32_USB_CLOCK_ENABLED TRUE
#define STM32_SAI1_CLOCK_ENABLED TRUE
#define STM32_SAI2_CLOCK_ENABLED TRUE
-#define STM32_MSIRANGE STM32_MSIRANGE_4M
+#define STM32_MSIRANGE STM32_MSIRANGE_48M
#define STM32_MSISRANGE STM32_MSISRANGE_4M
#define STM32_SW STM32_SW_PLL
-#define STM32_PLLSRC STM32_PLLSRC_MSI
-#define STM32_PLLM_VALUE 1
-#define STM32_PLLN_VALUE 72
+#define STM32_PLLSRC STM32_PLLSRC_HSI16
+#define STM32_PLLM_VALUE 4
+#define STM32_PLLN_VALUE 80
#define STM32_PLLP_VALUE 7
#define STM32_PLLQ_VALUE 6
#define STM32_PLLR_VALUE 4
@@ -85,7 +85,7 @@ #define STM32_LPTIM2SEL STM32_LPTIM2SEL_PCLK1
#define STM32_SAI1SEL STM32_SAI1SEL_OFF
#define STM32_SAI2SEL STM32_SAI2SEL_OFF
-#define STM32_CLK48SEL STM32_CLK48SEL_PLL
+#define STM32_CLK48SEL STM32_CLK48SEL_MSI
#define STM32_ADCSEL STM32_ADCSEL_SYSCLK
#define STM32_SWPMI1SEL STM32_SWPMI1SEL_PCLK1
#define STM32_DFSDMSEL STM32_DFSDMSEL_PCLK1
@@ -96,9 +96,9 @@ */
#define STM32_ADC_DUAL_MODE FALSE
#define STM32_ADC_COMPACT_SAMPLES FALSE
-#define STM32_ADC_USE_ADC1 TRUE
-#define STM32_ADC_USE_ADC2 TRUE
-#define STM32_ADC_USE_ADC3 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
+#define STM32_ADC_USE_ADC2 FALSE
+#define STM32_ADC_USE_ADC3 FALSE
#define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
#define STM32_ADC_ADC2_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
#define STM32_ADC_ADC3_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
@@ -239,8 +239,8 @@ */
#define STM32_SDC_USE_SDMMC1 FALSE
#define STM32_SDC_SDMMC_UNALIGNED_SUPPORT TRUE
-#define STM32_SDC_SDMMC_WRITE_TIMEOUT 250
-#define STM32_SDC_SDMMC_READ_TIMEOUT 25
+#define STM32_SDC_SDMMC_WRITE_TIMEOUT 1000
+#define STM32_SDC_SDMMC_READ_TIMEOUT 1000
#define STM32_SDC_SDMMC_CLOCK_DELAY 10
#define STM32_SDC_SDMMC1_DMA_PRIORITY 3
#define STM32_SDC_SDMMC1_IRQ_PRIORITY 9
@@ -279,7 +279,7 @@ #define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure")
/*
- * ST driver system settings.
+ * ST driver system settings.+++
*/
#define STM32_ST_IRQ_PRIORITY 8
#define STM32_ST_USE_TIMER 2
@@ -288,7 +288,7 @@ * UART driver system settings.
*/
#define STM32_UART_USE_USART1 FALSE
-#define STM32_UART_USE_USART2 TRUE
+#define STM32_UART_USE_USART2 FALSE
#define STM32_UART_USE_USART3 FALSE
#define STM32_UART_USE_UART4 FALSE
#define STM32_UART_USE_UART5 FALSE
@@ -329,7 +329,7 @@ #define STM32_USB_OTGFIFO_FILL_BASEPRI 0
/*
- * WDG driver system settings.
+ * WDG driver system settings.+++
*/
#define STM32_WDG_USE_IWDG FALSE
|