Diff: cpp/Ticker.h

Revision:

2:143cac498751

Parent:

0:fd0d7bdfcdc2

diff -r 62685faffa05 -r 143cac498751 cpp/Ticker.h
--- a/cpp/Ticker.h	Thu Nov 29 15:41:14 2012 +0000
+++ b/cpp/Ticker.h	Mon Feb 18 11:44:18 2013 +0000
@@ -1,23 +1,17 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2006-2012 ARM Limited
+ * Copyright (c) 2006-2013 ARM Limited
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * 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
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * 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.
  */
 #ifndef MBED_TICKER_H
 #define MBED_TICKER_H
@@ -29,7 +23,7 @@
 
 /** A Ticker is used to call a function at a recurring interval
  *
- *  You can use as many seperate Ticker objects as you require. 
+ *  You can use as many seperate Ticker objects as you require.
  *
  * Example:
  * @code
@@ -40,9 +34,9 @@
  * Ticker timer;
  * DigitalOut led1(LED1);
  * DigitalOut led2(LED2);
- * 
+ *
  * int flip = 0;
- * 
+ *
  * void attime() {
  *     flip = !flip;
  * }
@@ -72,7 +66,7 @@
     void attach(void (*fptr)(void), float t) {
         attach_us(fptr, t * 1000000.0f);
     }
-    
+
     /** Attach a member function to be called by the Ticker, specifiying the interval in seconds
      *
      *  @param tptr pointer to the object to call the member function on
@@ -83,7 +77,7 @@
     void attach(T* tptr, void (T::*mptr)(void), float t) {
         attach_us(tptr, mptr, t * 1000000.0f);
     }
-    
+
     /** Attach a function to be called by the Ticker, specifiying the interval in micro-seconds
      *
      *  @param fptr pointer to the function to be called
@@ -99,13 +93,13 @@
      *  @param tptr pointer to the object to call the member function on
      *  @param mptr pointer to the member function to be called
      *  @param t the time between calls in micro-seconds
-     */    
+     */
     template<typename T>
     void attach_us(T* tptr, void (T::*mptr)(void), unsigned int t) {
         _function.attach(tptr, mptr);
         setup(t);
     }
-    
+
     /** Detach the function
      */
     void detach();
@@ -113,7 +107,7 @@
 protected:
     void setup(unsigned int t);
     virtual void handler();
-    
+
     unsigned int _delay;
     FunctionPointer _function;
 };