dev01 Brautlecht / mbed-STM32F030F4

Blink, remove compiler errors

Dependents:   STM32F031_Blink_Aug17

Fork of mbed-STM32F030F4 by Nothing Special

common/Timer.cpp@8:edb6e2a469d0, 2015-08-10 (annotated)

Committer:
mega64
Date:
Mon Aug 10 23:44:25 2015 +0000
Revision:
8:edb6e2a469d0
Parent:
0:38ccae254a29 
update Timer::start() to comply with the behavior of mbed-src version 90 and later (start when running not reseting time)

Who changed what in which revision?

UserRevisionLine numberNew contents of line
mega64 0:38ccae254a29 1 /* mbed Microcontroller Library
mega64 0:38ccae254a29 2 * Copyright (c) 2006-2013 ARM Limited
mega64 0:38ccae254a29 3 *
mega64 0:38ccae254a29 4 * Licensed under the Apache License, Version 2.0 (the "License");
mega64 0:38ccae254a29 5 * you may not use this file except in compliance with the License.
mega64 0:38ccae254a29 6 * You may obtain a copy of the License at
mega64 0:38ccae254a29 7 *
mega64 0:38ccae254a29 8 * http://www.apache.org/licenses/LICENSE-2.0
mega64 0:38ccae254a29 9 *
mega64 0:38ccae254a29 10 * Unless required by applicable law or agreed to in writing, software
mega64 0:38ccae254a29 11 * distributed under the License is distributed on an "AS IS" BASIS,
mega64 0:38ccae254a29 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
mega64 0:38ccae254a29 13 * See the License for the specific language governing permissions and
mega64 0:38ccae254a29 14 * limitations under the License.
mega64 0:38ccae254a29 15 */
mega64 0:38ccae254a29 16 #include "Timer.h"
mega64 0:38ccae254a29 17 #include "us_ticker_api.h"
mega64 0:38ccae254a29 18
mega64 0:38ccae254a29 19 namespace mbed {
mega64 0:38ccae254a29 20
mega64 0:38ccae254a29 21 Timer::Timer() : _running(), _start(), _time() {
mega64 0:38ccae254a29 22 reset();
mega64 0:38ccae254a29 23 }
mega64 0:38ccae254a29 24
mega64 0:38ccae254a29 25 void Timer::start() {
mega64 8:edb6e2a469d0 26 if (!_running) {
mega64 8:edb6e2a469d0 27 _start = us_ticker_read();
mega64 8:edb6e2a469d0 28 _running = 1;
mega64 8:edb6e2a469d0 29 }
mega64 0:38ccae254a29 30 }
mega64 0:38ccae254a29 31
mega64 0:38ccae254a29 32 void Timer::stop() {
mega64 0:38ccae254a29 33 _time += slicetime();
mega64 0:38ccae254a29 34 _running = 0;
mega64 0:38ccae254a29 35 }
mega64 0:38ccae254a29 36
mega64 0:38ccae254a29 37 int Timer::read_us() {
mega64 0:38ccae254a29 38 return _time + slicetime();
mega64 0:38ccae254a29 39 }
mega64 0:38ccae254a29 40
mega64 0:38ccae254a29 41 float Timer::read() {
mega64 0:38ccae254a29 42 return (float)read_us() / 1000000.0f;
mega64 0:38ccae254a29 43 }
mega64 0:38ccae254a29 44
mega64 0:38ccae254a29 45 int Timer::read_ms() {
mega64 0:38ccae254a29 46 return read_us() / 1000;
mega64 0:38ccae254a29 47 }
mega64 0:38ccae254a29 48
mega64 0:38ccae254a29 49 int Timer::slicetime() {
mega64 0:38ccae254a29 50 if (_running) {
mega64 0:38ccae254a29 51 return us_ticker_read() - _start;
mega64 0:38ccae254a29 52 } else {
mega64 0:38ccae254a29 53 return 0;
mega64 0:38ccae254a29 54 }
mega64 0:38ccae254a29 55 }
mega64 0:38ccae254a29 56
mega64 0:38ccae254a29 57 void Timer::reset() {
mega64 0:38ccae254a29 58 _start = us_ticker_read();
mega64 0:38ccae254a29 59 _time = 0;
mega64 0:38ccae254a29 60 }
mega64 0:38ccae254a29 61
mega64 0:38ccae254a29 62 #ifdef MBED_OPERATORS
mega64 0:38ccae254a29 63 Timer::operator float() {
mega64 0:38ccae254a29 64 return read();
mega64 0:38ccae254a29 65 }
mega64 0:38ccae254a29 66 #endif
mega64 0:38ccae254a29 67
mega64 0:38ccae254a29 68 } // namespace mbed