Revision 2:215810c8e89e, committed 2015-03-27

Comitter:

eduardoG26

Date:

Fri Mar 27 15:36:20 2015 +0000

Parent:

1:d1b960698e70

Child:

3:abbc3308dfa1

Commit message:

Added: micros()

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arduino.cpp	Fri Mar 27 15:36:20 2015 +0000
@@ -0,0 +1,74 @@
+/*
+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 "Arduino.h"
+
+#ifdef DEBUG_MILLIS
+#if DEBUG_MILLIS
+DigitalOut DebugMillisPin(D2);
+#endif
+#endif
+
+// Period of IRQ in µs. This is the minimum (!) granularity of micros().
+#define TICKER_PERIOD_US (32uL)
+
+static volatile uint32_t MilliSeconds_u32, MicroSeconds_u32, MicroSecondsLast_u32;
+
+static  Ticker ArduinoTicker;
+
+static void TickerIRQ()
+{
+#ifdef DEBUG_MILLIS
+#if DEBUG_MILLIS
+    DebugMillisPin = not DebugMillisPin;
+#endif
+#endif
+    MicroSeconds_u32 += TICKER_PERIOD_US;
+    if ((MicroSeconds_u32 - MicroSecondsLast_u32) >= 1000uL) {
+        MilliSeconds_u32++;
+        MicroSecondsLast_u32 += 1000uL;
+    }
+}
+
+uint32_t millis ()
+{
+    // Not critical since variable is atomic
+    return MilliSeconds_u32;
+}
+
+uint32_t micros ()
+{
+    // Not critical since variable is atomic
+    return MicroSeconds_u32;
+}
+
+void StartArduinoTimer ()
+{
+    //arduino_timer.start();
+    ArduinoTicker.attach_us (&TickerIRQ, TICKER_PERIOD_US);
+}
+
+// End of file
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Arduino.h	Fri Mar 27 15:36:20 2015 +0000
@@ -0,0 +1,51 @@
+/*
+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.
+*/
+
+#ifndef ARDUINO_H_
+#define ARDUINO_H_
+
+#include "mbed.h"
+
+// Get millis value similar to arduino
+uint32_t millis ();
+
+// Get micros value similar to arduino
+uint32_t micros ();
+
+// Must be called to start timer!
+void StartArduinoTimer ();
+
+/** Macro for delay() 
+ *
+ * @param void
+ */
+#define delay(x)                  (wait_ms(x))
+/** Macro for delayMicroseconds()  
+ *
+ * @param void
+ */
+#define delayMicroseconds(x)      (wait_us(x))
+ 
+#endif  // See #ifndef ARDUINO_H_
+// End of file
\ No newline at end of file

--- a/millis.cpp	Thu Mar 26 14:21:36 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-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()
-{
-#ifdef DEBUG_MILLIS
-#if DEBUG_MILLIS
-    DebugMillisPin = not DebugMillisPin;
-#endif
-#endif
-    MilliSeconds_u32++;
-}
-
-uint32_t millis ()
-{
-    return MilliSeconds_u32;
-}
-
-void StartMillis ()
-{
-    MilliSecondsTicker.attach_us (&MilliSecondsTickerIRQ, 1000);
-}
-
-// End of file
\ No newline at end of file

--- a/millis.h	Thu Mar 26 14:21:36 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-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 milliseconds timer!
-void StartMillis ();
-
-#endif  // See #ifndef MILLIS_H_
-// End of file
\ No newline at end of file