Rigado
mbed-src updated for BMD-200 evaluation board. Just pin numbers are updated.
Dependents: mbed_blinky-bmd-200 bmd-200_accel_demo firstRig
Fork of
mbed-src
by 
mbed official
Replacement for the "mbed" or "mbed-src" library when using the BMD-200 Evaluation kit. This library only remaps the pin names (i.e. LED1 points to p0.01 instead of p0.18, etc) as used by the BMD-200 Evaluation board (select the nRF51822_mkit platform). All other code is untouched.
Diff: common/Timer.cpp
- Revision:
- 10:3bc89ef62ce7
- Parent:
- 9:0ce32e54c9a7
- Child:
- 13:0645d8841f51
--- a/common/Timer.cpp Mon Jun 10 16:03:00 2013 +0100
+++ b/common/Timer.cpp Fri Jun 14 17:49:17 2013 +0100
@@ -1,66 +1,66 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "Timer.h"
-#include "us_ticker_api.h"
-
-namespace mbed {
-
-Timer::Timer() {
- reset();
-}
-
-void Timer::start() {
- _start = us_ticker_read();
- _running = 1;
-}
-
-void Timer::stop() {
- _time += slicetime();
- _running = 0;
-}
-
-int Timer::read_us() {
- return _time + slicetime();
-}
-
-float Timer::read() {
- return (float)read_us() / 1000000.0f;
-}
-
-int Timer::read_ms() {
- return read_us() / 1000;
-}
-
-int Timer::slicetime() {
- if (_running) {
- return us_ticker_read() - _start;
- } else {
- return 0;
- }
-}
-
-void Timer::reset() {
- _start = us_ticker_read();
- _time = 0;
-}
-
-#ifdef MBED_OPERATORS
-Timer::operator float() {
- return read();
-}
-#endif
-
-} // namespace mbed
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "Timer.h"
+#include "us_ticker_api.h"
+
+namespace mbed {
+
+Timer::Timer() {
+ reset();
+}
+
+void Timer::start() {
+ _start = us_ticker_read();
+ _running = 1;
+}
+
+void Timer::stop() {
+ _time += slicetime();
+ _running = 0;
+}
+
+int Timer::read_us() {
+ return _time + slicetime();
+}
+
+float Timer::read() {
+ return (float)read_us() / 1000000.0f;
+}
+
+int Timer::read_ms() {
+ return read_us() / 1000;
+}
+
+int Timer::slicetime() {
+ if (_running) {
+ return us_ticker_read() - _start;
+ } else {
+ return 0;
+ }
+}
+
+void Timer::reset() {
+ _start = us_ticker_read();
+ _time = 0;
+}
+
+#ifdef MBED_OPERATORS
+Timer::operator float() {
+ return read();
+}
+#endif
+
+} // namespace mbed