5.2.1 - Updated I2C files

Dependents:   mbed-TFT-example-NCS36510 mbed-Accelerometer-example-NCS36510 mbed-Accelerometer-example-NCS36510

Committer:
jacobjohnson
Date:
Mon Feb 27 17:45:05 2017 +0000
Revision:
1:f30bdcd2b33b
Parent:
0:098463de4c5d
changed the inputscale from 1 to 7 in analogin_api.c.  This will need to be changed later, and accessed from the main level, but for now this allows the  adc to read a value from 0 to 3.7V, instead of just up to 1V.;

Who changed what in which revision?

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