fix for mbed lib issue 3 (i2c problem) see also https://mbed.org/users/mbed_official/code/mbed/issues/3 affected implementations: LPC812, LPC11U24, LPC1768, LPC2368, LPC4088
Fork of mbed-src by
common/Timer.cpp@10:3bc89ef62ce7, 2013-06-14 (annotated)
- Committer:
- emilmont
- Date:
- Fri Jun 14 17:49:17 2013 +0100
- Revision:
- 10:3bc89ef62ce7
- Parent:
- 9:0ce32e54c9a7
Unify mbed library sources
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
emilmont | 10:3bc89ef62ce7 | 1 | /* mbed Microcontroller Library |
emilmont | 10:3bc89ef62ce7 | 2 | * Copyright (c) 2006-2013 ARM Limited |
emilmont | 10:3bc89ef62ce7 | 3 | * |
emilmont | 10:3bc89ef62ce7 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
emilmont | 10:3bc89ef62ce7 | 5 | * you may not use this file except in compliance with the License. |
emilmont | 10:3bc89ef62ce7 | 6 | * You may obtain a copy of the License at |
emilmont | 10:3bc89ef62ce7 | 7 | * |
emilmont | 10:3bc89ef62ce7 | 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
emilmont | 10:3bc89ef62ce7 | 9 | * |
emilmont | 10:3bc89ef62ce7 | 10 | * Unless required by applicable law or agreed to in writing, software |
emilmont | 10:3bc89ef62ce7 | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
emilmont | 10:3bc89ef62ce7 | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
emilmont | 10:3bc89ef62ce7 | 13 | * See the License for the specific language governing permissions and |
emilmont | 10:3bc89ef62ce7 | 14 | * limitations under the License. |
emilmont | 10:3bc89ef62ce7 | 15 | */ |
emilmont | 10:3bc89ef62ce7 | 16 | #include "Timer.h" |
emilmont | 10:3bc89ef62ce7 | 17 | #include "us_ticker_api.h" |
emilmont | 10:3bc89ef62ce7 | 18 | |
emilmont | 10:3bc89ef62ce7 | 19 | namespace mbed { |
emilmont | 10:3bc89ef62ce7 | 20 | |
emilmont | 10:3bc89ef62ce7 | 21 | Timer::Timer() { |
emilmont | 10:3bc89ef62ce7 | 22 | reset(); |
emilmont | 10:3bc89ef62ce7 | 23 | } |
emilmont | 10:3bc89ef62ce7 | 24 | |
emilmont | 10:3bc89ef62ce7 | 25 | void Timer::start() { |
emilmont | 10:3bc89ef62ce7 | 26 | _start = us_ticker_read(); |
emilmont | 10:3bc89ef62ce7 | 27 | _running = 1; |
emilmont | 10:3bc89ef62ce7 | 28 | } |
emilmont | 10:3bc89ef62ce7 | 29 | |
emilmont | 10:3bc89ef62ce7 | 30 | void Timer::stop() { |
emilmont | 10:3bc89ef62ce7 | 31 | _time += slicetime(); |
emilmont | 10:3bc89ef62ce7 | 32 | _running = 0; |
emilmont | 10:3bc89ef62ce7 | 33 | } |
emilmont | 10:3bc89ef62ce7 | 34 | |
emilmont | 10:3bc89ef62ce7 | 35 | int Timer::read_us() { |
emilmont | 10:3bc89ef62ce7 | 36 | return _time + slicetime(); |
emilmont | 10:3bc89ef62ce7 | 37 | } |
emilmont | 10:3bc89ef62ce7 | 38 | |
emilmont | 10:3bc89ef62ce7 | 39 | float Timer::read() { |
emilmont | 10:3bc89ef62ce7 | 40 | return (float)read_us() / 1000000.0f; |
emilmont | 10:3bc89ef62ce7 | 41 | } |
emilmont | 10:3bc89ef62ce7 | 42 | |
emilmont | 10:3bc89ef62ce7 | 43 | int Timer::read_ms() { |
emilmont | 10:3bc89ef62ce7 | 44 | return read_us() / 1000; |
emilmont | 10:3bc89ef62ce7 | 45 | } |
emilmont | 10:3bc89ef62ce7 | 46 | |
emilmont | 10:3bc89ef62ce7 | 47 | int Timer::slicetime() { |
emilmont | 10:3bc89ef62ce7 | 48 | if (_running) { |
emilmont | 10:3bc89ef62ce7 | 49 | return us_ticker_read() - _start; |
emilmont | 10:3bc89ef62ce7 | 50 | } else { |
emilmont | 10:3bc89ef62ce7 | 51 | return 0; |
emilmont | 10:3bc89ef62ce7 | 52 | } |
emilmont | 10:3bc89ef62ce7 | 53 | } |
emilmont | 10:3bc89ef62ce7 | 54 | |
emilmont | 10:3bc89ef62ce7 | 55 | void Timer::reset() { |
emilmont | 10:3bc89ef62ce7 | 56 | _start = us_ticker_read(); |
emilmont | 10:3bc89ef62ce7 | 57 | _time = 0; |
emilmont | 10:3bc89ef62ce7 | 58 | } |
emilmont | 10:3bc89ef62ce7 | 59 | |
emilmont | 10:3bc89ef62ce7 | 60 | #ifdef MBED_OPERATORS |
emilmont | 10:3bc89ef62ce7 | 61 | Timer::operator float() { |
emilmont | 10:3bc89ef62ce7 | 62 | return read(); |
emilmont | 10:3bc89ef62ce7 | 63 | } |
emilmont | 10:3bc89ef62ce7 | 64 | #endif |
emilmont | 10:3bc89ef62ce7 | 65 | |
emilmont | 10:3bc89ef62ce7 | 66 | } // namespace mbed |