Steve Kim / mbed-src

mbed library sources(for async_print)

Dependents:   AsyncPrint

Fork of mbed-src by mbed official

common/Timer.cpp@566:85de60b2bbaf, 2015-06-15 (annotated)

Committer:
mbed_official
Date:
Mon Jun 15 13:15:08 2015 +0100
Revision:
566:85de60b2bbaf
Parent:
547:88c982c8f758 
Synchronized with git revision bf69fa1cfc0d4d59173af0a2d235c2fbc179e45c



Full URL: https://github.com/mbedmicro/mbed/commit/bf69fa1cfc0d4d59173af0a2d235c2fbc179e45c/



commit c4bf11cb6a0f36a1aca90cce128d7a8292df5bda

Merge: 0d58363 77a973c

Author: Mihail Stoyanov <wm@smode.org>

Date:   Mon Jun 15 14:41:28 2015 +0300



    Merge branch 'master' of https://github.com/mbedmicro/mbed



    Conflicts:

    	workspace_tools/targets.py



commit 0d58363887d11952b26dcefa3229a9a1457b155c

Author: Mihail Stoyanov <wm@smode.org>

Date:   Tue Jun 9 16:17:27 2015 +0300



    Added Nordic license for the soft device



commit d504a3b58af390c779cb7383df2223d0a500f70a

Merge: 2c5aab7 8902229

Author: Mihail Stoyanov <wm@smode.org>

Date:   Tue Jun 9 16:14:47 2015 +0300



    Merge branch 'master' of https://github.com/mbedmicro/mbed



commit 2c5aab74eba507d184b74166da059d4100841ff7

Author: Mihail Stoyanov <wm@smode.org>

Date:   Wed Jun 3 20:44:25 2015 +0300



    Add base MCU support for Cortex-M4. Tidy up targets.py



commit 59b868a517163bf8984baa6c87ad42f86af18391

Merge: 0e23067 927c31a

Author: Mihail Stoyanov <wm@smode.org>

Date:   Wed Jun 3 20:39:56 2015 +0300



    Merge branch 'master' of https://github.com/mbedmicro/mbed



commit 0e23067718c61808401311bb594ed25fb4ed62c6

Author: Mihail Stoyanov <wm@smode.org>

Date:   Tue Jun 2 16:08:08 2015 +0300



    Add the Delta NNN40 platform to releases



commit 62a585dcda553b6e3b5c84e90a55b465f0894863

Merge: e1cd545 7a1d25e

Author: Mihail Stoyanov <wm@smode.org>

Date:   Tue Jun 2 16:06:44 2015 +0300



    Merge branch 'master' of https://github.com/mbedmicro/mbed



    Conflicts:

    	workspace_tools/tests.py



commit e1cd545a9c92c4177f72da964d50d163dae5990f

Merge: 5c5e61f ffd5586

Author: Mihail Stoyanov <wm@smode.org>

Date:   Thu May 7 13:07:48 2015 +0300



    Merge branch 'master' of https://github.com/mbedmicro/mbed



commit 5c5e61f0ac38d91ad04738fd33af36f91452d984

Author: Mihail Stoyanov <wm@smode.org>

Date:   Thu May 7 13:07:35 2015 +0300



    Remove the Disco L053 from RTOS tests as it's not ready yet



commit e75efe346742fa22e124861fddf1b51c291f4219

Author: Mihail Stoyanov <wm@smode.org>

Date:   Wed May 6 13:49:05 2015 +0300



    Tidy up targets.py

Who changed what in which revision?

UserRevisionLine numberNew 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"
mbed_official 525:c320967f86b9 17 #include "ticker_api.h"
bogdanm 13:0645d8841f51 18 #include "us_ticker_api.h"
bogdanm 13:0645d8841f51 19
bogdanm 13:0645d8841f51 20 namespace mbed {
bogdanm 13:0645d8841f51 21
mbed_official 525:c320967f86b9 22 Timer::Timer() : _running(), _start(), _time(), _ticker_data(get_us_ticker_data()) {
mbed_official 525:c320967f86b9 23 reset();
mbed_official 525:c320967f86b9 24 }
mbed_official 525:c320967f86b9 25
mbed_official 547:88c982c8f758 26 Timer::Timer(const ticker_data_t *data) : _running(), _start(), _time(), _ticker_data(data) {
bogdanm 13:0645d8841f51 27 reset();
bogdanm 13:0645d8841f51 28 }
bogdanm 13:0645d8841f51 29
bogdanm 13:0645d8841f51 30 void Timer::start() {
mbed_official 358:9d7ef901f004 31 if (!_running) {
mbed_official 525:c320967f86b9 32 _start = ticker_read(_ticker_data);
mbed_official 358:9d7ef901f004 33 _running = 1;
mbed_official 358:9d7ef901f004 34 }
bogdanm 13:0645d8841f51 35 }
bogdanm 13:0645d8841f51 36
bogdanm 13:0645d8841f51 37 void Timer::stop() {
bogdanm 13:0645d8841f51 38 _time += slicetime();
bogdanm 13:0645d8841f51 39 _running = 0;
bogdanm 13:0645d8841f51 40 }
bogdanm 13:0645d8841f51 41
bogdanm 13:0645d8841f51 42 int Timer::read_us() {
bogdanm 13:0645d8841f51 43 return _time + slicetime();
bogdanm 13:0645d8841f51 44 }
bogdanm 13:0645d8841f51 45
bogdanm 13:0645d8841f51 46 float Timer::read() {
bogdanm 13:0645d8841f51 47 return (float)read_us() / 1000000.0f;
bogdanm 13:0645d8841f51 48 }
bogdanm 13:0645d8841f51 49
bogdanm 13:0645d8841f51 50 int Timer::read_ms() {
bogdanm 13:0645d8841f51 51 return read_us() / 1000;
bogdanm 13:0645d8841f51 52 }
bogdanm 13:0645d8841f51 53
bogdanm 13:0645d8841f51 54 int Timer::slicetime() {
bogdanm 13:0645d8841f51 55 if (_running) {
mbed_official 525:c320967f86b9 56 return ticker_read(_ticker_data) - _start;
bogdanm 13:0645d8841f51 57 } else {
bogdanm 13:0645d8841f51 58 return 0;
bogdanm 13:0645d8841f51 59 }
bogdanm 13:0645d8841f51 60 }
bogdanm 13:0645d8841f51 61
bogdanm 13:0645d8841f51 62 void Timer::reset() {
mbed_official 525:c320967f86b9 63 _start = ticker_read(_ticker_data);
bogdanm 13:0645d8841f51 64 _time = 0;
bogdanm 13:0645d8841f51 65 }
bogdanm 13:0645d8841f51 66
bogdanm 13:0645d8841f51 67 #ifdef MBED_OPERATORS
bogdanm 13:0645d8841f51 68 Timer::operator float() {
bogdanm 13:0645d8841f51 69 return read();
bogdanm 13:0645d8841f51 70 }
bogdanm 13:0645d8841f51 71 #endif
bogdanm 13:0645d8841f51 72
bogdanm 13:0645d8841f51 73 } // namespace mbed