andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3484942. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@3935 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2012-02-07 19:00:57 +00:00
parent 0ca2ad0c4b
commit 3fa0c8a11e
9 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Doxyfile_chm
View File

@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 2.4.0 PROJECT_NUMBER = 2.4.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

2
docs/Doxyfile_html
View File

@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 2.4.0 PROJECT_NUMBER = 2.4.1
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

2
docs/rsc/header_chm.html
View File

@ -13,7 +13,7 @@
<tbody> <tbody>
<tr style="height: 56px;"> <tr style="height: 56px;">
<td style="padding-left: 0.5em;"> <td style="padding-left: 0.5em;">
<div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.4.0</span></div> <div id="projectname">ChibiOS/RT&#160;<span id="projectnumber">2.4.1</span></div>
</td> </td>
</tr> </tr>
</tbody> </tbody>

2
docs/rsc/header_html.html
View File

@ -20,7 +20,7 @@ $(document).ready(initResizable);
<tbody> <tbody>
<tr style="height: 92px;"> <tr style="height: 92px;">
<td style="padding-left: 0.5em;"> <td style="padding-left: 0.5em;">
<div id="projectname">ChibiOS/RT<br><span id="projectnumber">2.4.0</span></div> <div id="projectname">ChibiOS/RT<br><span id="projectnumber">2.4.1</span></div>
</td> </td>
<td style="padding-left: 3em;"> <td style="padding-left: 3em;">
<script type="text/javascript"><!-- <script type="text/javascript"><!--

9
os/hal/platforms/STM32F2xx/adc_lld.h
View File

@ -53,11 +53,8 @@
/** /**
* @brief Maximum HSE clock frequency. * @brief Maximum HSE clock frequency.
* @note This value is arbitrary defined, the current datasheet does not
* define a maximum value (it is TBD). A value of 36MHz is mentioned
* but without relationship to VDD ranges.
*/ */
#define STM32_ADCCLK_MAX 42000000 #define STM32_ADCCLK_MAX 30000000
/** @} */ /** @} */
/** /**
@ -130,9 +127,9 @@
/** /**
* @brief ADC common clock divider. * @brief ADC common clock divider.
* @note This setting is influenced by the VDDA voltage and other * @note This setting is influenced by the VDDA voltage and other
* external conditions, please refer to the STM32L15x datasheet * external conditions, please refer to the STM32F2xx datasheet
* for more info.<br> * for more info.<br>
* See section 6.3.15 "12-bit ADC characteristics". * See section 5.3.20 "12-bit ADC characteristics".
*/ */
#if !defined(STM32_ADC_ADCPRE) || defined(__DOXYGEN__) #if !defined(STM32_ADC_ADCPRE) || defined(__DOXYGEN__)
#define STM32_ADC_ADCPRE ADC_CCR_ADCPRE_DIV2 #define STM32_ADC_ADCPRE ADC_CCR_ADCPRE_DIV2

4
os/hal/platforms/STM32F2xx/hal_lld.c
View File

@ -26,8 +26,8 @@
*/ */
/** /**
* @file STM32F4xx/hal_lld.c * @file STM32F2xx/hal_lld.c
* @brief STM32F4xx HAL subsystem low level driver source. * @brief STM32F2xx HAL subsystem low level driver source.
* *
* @addtogroup HAL * @addtogroup HAL
* @{ * @{

9
os/hal/platforms/STM32F4xx/adc_lld.h
View File

@ -53,11 +53,8 @@
/** /**
* @brief Maximum HSE clock frequency. * @brief Maximum HSE clock frequency.
* @note This value is arbitrary defined, the current datasheet does not
* define a maximum value (it is TBD). A value of 36MHz is mentioned
* but without relationship to VDD ranges.
*/ */
#define STM32_ADCCLK_MAX 42000000 #define STM32_ADCCLK_MAX 36000000
/** @} */ /** @} */
/** /**
@ -130,9 +127,9 @@
/** /**
* @brief ADC common clock divider. * @brief ADC common clock divider.
* @note This setting is influenced by the VDDA voltage and other * @note This setting is influenced by the VDDA voltage and other
* external conditions, please refer to the STM32L15x datasheet * external conditions, please refer to the STM32F4xx datasheet
* for more info.<br> * for more info.<br>
* See section 6.3.15 "12-bit ADC characteristics". * See section 5.3.20 "12-bit ADC characteristics".
*/ */
#if !defined(STM32_ADC_ADCPRE) || defined(__DOXYGEN__) #if !defined(STM32_ADC_ADCPRE) || defined(__DOXYGEN__)
#define STM32_ADC_ADCPRE ADC_CCR_ADCPRE_DIV2 #define STM32_ADC_ADCPRE ADC_CCR_ADCPRE_DIV2

4
os/kernel/include/ch.h
View File

@ -47,7 +47,7 @@
/** /**
* @brief Kernel version string. * @brief Kernel version string.
*/ */
#define CH_KERNEL_VERSION "2.4.0" #define CH_KERNEL_VERSION "2.4.1"
/** /**
* @name Kernel version * @name Kernel version
@ -66,7 +66,7 @@
/** /**
* @brief Kernel version patch number. * @brief Kernel version patch number.
*/ */
#define CH_KERNEL_PATCH 0 #define CH_KERNEL_PATCH 1
/** @} */ /** @} */
/* /*

4
readme.txt
View File

@ -78,6 +78,10 @@
*** Releases *** *** Releases ***
***************************************************************************** *****************************************************************************
*** 2.4.1 ***
- FIX: Fixed various minor documentation errors and fixed ADC maximum
frequency limit in STM32F2/F4 ADC drivers (bug 3484942).
*** 2.4.0 *** *** 2.4.0 ***
- NEW: Implemented new makefile system for ARM GCC ports, now objects, - NEW: Implemented new makefile system for ARM GCC ports, now objects,
listings and output files are generated into a "build" directory and not listings and output files are generated into a "build" directory and not