Revision 1:d1b960698e70, committed 2015-03-26

Comitter:

eduardoG26

Date:

Thu Mar 26 14:21:36 2015 +0000

Parent:

0:571ea8a1bbae

Child:

2:215810c8e89e

Commit message:

20150326

Changed in this revision

--- a/millis.cpp	Mon Nov 24 17:02:21 2014 +0000
+++ b/millis.cpp	Thu Mar 26 14:21:36 2015 +0000
@@ -1,15 +1,49 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2014 calima engineering
+
+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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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.
+*/
 // millis as in Arduino...
 
 #include "mbed.h"
 #include "millis.h"
 
+#ifdef DEBUG_MILLIS
+#if DEBUG_MILLIS
+DigitalOut DebugMillisPin(D2);
+#endif
+#endif
+
 static volatile uint32_t MilliSeconds_u32;
 
 static  Ticker MilliSecondsTicker;
 
 static void MilliSecondsTickerIRQ()
 {
-    MilliSeconds_u32 ++;
+#ifdef DEBUG_MILLIS
+#if DEBUG_MILLIS
+    DebugMillisPin = not DebugMillisPin;
+#endif
+#endif
+    MilliSeconds_u32++;
 }
 
 uint32_t millis ()

--- a/millis.h	Mon Nov 24 17:02:21 2014 +0000
+++ b/millis.h	Thu Mar 26 14:21:36 2015 +0000
@@ -1,14 +1,39 @@
-// millis as in Arduino...
+/*
+The MIT License (MIT)
+
+Copyright (c) 2014 calima engineering
+
+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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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.
+*/
+
+// millis() as in Arduino...
 
 #ifndef MILLIS_H_
 #define MILLIS_H_
 
 #include "mbed.h"
+#include "project.h"
 
 // Get millis value similar to arduino
 uint32_t millis ();
 
-// Must be called to start milli seconds timer!
+// Must be called to start milliseconds timer!
 void StartMillis ();
 
 #endif  // See #ifndef MILLIS_H_