diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-13 11:45:07 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-13 11:45:07 +0000 |
| commit | 4fab7c06d1b0c9e61f6106b5b2a5c2c0b5694c34 (patch) | |
| tree | e7fdadc85d78aa2143d0082d26351da49f7f2d53 /os/hal/src/adc.c | |
| parent | ec7455babe131ee0b8a4c228ed00a02396619a7d (diff) | |
| download | ChibiOS-4fab7c06d1b0c9e61f6106b5b2a5c2c0b5694c34.tar.gz ChibiOS-4fab7c06d1b0c9e61f6106b5b2a5c2c0b5694c34.tar.bz2 ChibiOS-4fab7c06d1b0c9e61f6106b5b2a5c2c0b5694c34.zip | |
ADC, SPI, PWM driver enhancements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2254 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/src/adc.c')
| -rw-r--r-- | os/hal/src/adc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c index c6968f11b..e18995089 100644 --- a/os/hal/src/adc.c +++ b/os/hal/src/adc.c @@ -176,7 +176,8 @@ void adcStartConversionI(ADCDriver *adcp, ((depth == 1) || ((depth & 1) == 0)),
"adcStartConversionI");
- chDbgAssert(adcp->ad_state == ADC_READY,
+ chDbgAssert((adcp->ad_state == ADC_READY) ||
+ (adcp->ad_state == ADC_COMPLETE),
"adcStartConversionI(), #1", "not ready");
adcp->ad_samples = samples;
adcp->ad_depth = depth;
@@ -201,8 +202,7 @@ void adcStopConversion(ADCDriver *adcp) { chSysLock();
chDbgAssert((adcp->ad_state == ADC_READY) ||
- (adcp->ad_state == ADC_ACTIVE) ||
- (adcp->ad_state == ADC_COMPLETE),
+ (adcp->ad_state == ADC_ACTIVE),
"adcStopConversion(), #1", "invalid state");
if (adcp->ad_state != ADC_READY) {
adc_lld_stop_conversion(adcp);
|