Mbed Library with modified HSE_Startup timeout
Fork of mbed-src by
common/Timer.cpp@358:9d7ef901f004, 2014-10-20 (annotated)
- Committer:
- mbed_official
- Date:
- Mon Oct 20 08:45:07 2014 +0100
- Revision:
- 358:9d7ef901f004
- Parent:
- 212:34d62c0b2af6
- Child:
- 525:c320967f86b9
Synchronized with git revision 996e49964cd2c762ffd47bdce32ff3211f997782
Full URL: https://github.com/mbedmicro/mbed/commit/996e49964cd2c762ffd47bdce32ff3211f997782/
API: Timer - start() behavior (bug)fix
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
bogdanm | 13:0645d8841f51 | 1 | /* mbed Microcontroller Library |
bogdanm | 13:0645d8841f51 | 2 | * Copyright (c) 2006-2013 ARM Limited |
bogdanm | 13:0645d8841f51 | 3 | * |
bogdanm | 13:0645d8841f51 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
bogdanm | 13:0645d8841f51 | 5 | * you may not use this file except in compliance with the License. |
bogdanm | 13:0645d8841f51 | 6 | * You may obtain a copy of the License at |
bogdanm | 13:0645d8841f51 | 7 | * |
bogdanm | 13:0645d8841f51 | 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
bogdanm | 13:0645d8841f51 | 9 | * |
bogdanm | 13:0645d8841f51 | 10 | * Unless required by applicable law or agreed to in writing, software |
bogdanm | 13:0645d8841f51 | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
bogdanm | 13:0645d8841f51 | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
bogdanm | 13:0645d8841f51 | 13 | * See the License for the specific language governing permissions and |
bogdanm | 13:0645d8841f51 | 14 | * limitations under the License. |
bogdanm | 13:0645d8841f51 | 15 | */ |
bogdanm | 13:0645d8841f51 | 16 | #include "Timer.h" |
bogdanm | 13:0645d8841f51 | 17 | #include "us_ticker_api.h" |
bogdanm | 13:0645d8841f51 | 18 | |
bogdanm | 13:0645d8841f51 | 19 | namespace mbed { |
bogdanm | 13:0645d8841f51 | 20 | |
mbed_official | 212:34d62c0b2af6 | 21 | Timer::Timer() : _running(), _start(), _time() { |
bogdanm | 13:0645d8841f51 | 22 | reset(); |
bogdanm | 13:0645d8841f51 | 23 | } |
bogdanm | 13:0645d8841f51 | 24 | |
bogdanm | 13:0645d8841f51 | 25 | void Timer::start() { |
mbed_official | 358:9d7ef901f004 | 26 | if (!_running) { |
mbed_official | 358:9d7ef901f004 | 27 | _start = us_ticker_read(); |
mbed_official | 358:9d7ef901f004 | 28 | _running = 1; |
mbed_official | 358:9d7ef901f004 | 29 | } |
bogdanm | 13:0645d8841f51 | 30 | } |
bogdanm | 13:0645d8841f51 | 31 | |
bogdanm | 13:0645d8841f51 | 32 | void Timer::stop() { |
bogdanm | 13:0645d8841f51 | 33 | _time += slicetime(); |
bogdanm | 13:0645d8841f51 | 34 | _running = 0; |
bogdanm | 13:0645d8841f51 | 35 | } |
bogdanm | 13:0645d8841f51 | 36 | |
bogdanm | 13:0645d8841f51 | 37 | int Timer::read_us() { |
bogdanm | 13:0645d8841f51 | 38 | return _time + slicetime(); |
bogdanm | 13:0645d8841f51 | 39 | } |
bogdanm | 13:0645d8841f51 | 40 | |
bogdanm | 13:0645d8841f51 | 41 | float Timer::read() { |
bogdanm | 13:0645d8841f51 | 42 | return (float)read_us() / 1000000.0f; |
bogdanm | 13:0645d8841f51 | 43 | } |
bogdanm | 13:0645d8841f51 | 44 | |
bogdanm | 13:0645d8841f51 | 45 | int Timer::read_ms() { |
bogdanm | 13:0645d8841f51 | 46 | return read_us() / 1000; |
bogdanm | 13:0645d8841f51 | 47 | } |
bogdanm | 13:0645d8841f51 | 48 | |
bogdanm | 13:0645d8841f51 | 49 | int Timer::slicetime() { |
bogdanm | 13:0645d8841f51 | 50 | if (_running) { |
bogdanm | 13:0645d8841f51 | 51 | return us_ticker_read() - _start; |
bogdanm | 13:0645d8841f51 | 52 | } else { |
bogdanm | 13:0645d8841f51 | 53 | return 0; |
bogdanm | 13:0645d8841f51 | 54 | } |
bogdanm | 13:0645d8841f51 | 55 | } |
bogdanm | 13:0645d8841f51 | 56 | |
bogdanm | 13:0645d8841f51 | 57 | void Timer::reset() { |
bogdanm | 13:0645d8841f51 | 58 | _start = us_ticker_read(); |
bogdanm | 13:0645d8841f51 | 59 | _time = 0; |
bogdanm | 13:0645d8841f51 | 60 | } |
bogdanm | 13:0645d8841f51 | 61 | |
bogdanm | 13:0645d8841f51 | 62 | #ifdef MBED_OPERATORS |
bogdanm | 13:0645d8841f51 | 63 | Timer::operator float() { |
bogdanm | 13:0645d8841f51 | 64 | return read(); |
bogdanm | 13:0645d8841f51 | 65 | } |
bogdanm | 13:0645d8841f51 | 66 | #endif |
bogdanm | 13:0645d8841f51 | 67 | |
bogdanm | 13:0645d8841f51 | 68 | } // namespace mbed |