added support to enable/disable systick in wirish

7 files changed, 94 insertions, 4 deletions

diff --git a/examples/vga-leaf.cpp b/examples/vga-leaf.cpp
index 16204ba..d1c6d7d 100644
--- a/examples/vga-leaf.cpp
+++ b/examples/vga-leaf.cpp
@@ -86,7 +86,6 @@ uint8 logo[18][16] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,}, };
 
 void setup() {
-    
     // Setup our pins
     pinMode(LED_PIN, OUTPUT);
     pinMode(VGA_R, OUTPUT);
@@ -101,9 +100,8 @@ void setup() {
     digitalWrite(VGA_V, HIGH);
 
     // This gets rid of the majority of the interrupt artifacts;
-    // a SysTick.end() is required as well
     SerialUSB.end();
-    
+    SystemTick.end();
 
     // Configure
     Timer4.pause(); // while we configure
diff --git a/libmaple/systick.c b/libmaple/systick.c
index 8b0d92a..456ac2f 100644
--- a/libmaple/systick.c
+++ b/libmaple/systick.c
@@ -52,6 +52,12 @@ void systick_init(uint32 reload_val) {
                          SYSTICK_TICKINT);
 }
 
+void systick_disable() {
+  /* clock the system timer with the core clock, but don't turn it on
+     or enable interrupt. */
+  __write(SYSTICK_CSR, SYSTICK_SRC_HCLK);
+}
+
 void SysTickHandler(void) {
     systick_timer_millis++;
 }
diff --git a/libmaple/systick.h b/libmaple/systick.h
index 57b724a..86284f8 100644
--- a/libmaple/systick.h
+++ b/libmaple/systick.h
@@ -43,6 +43,7 @@ extern "C"{
 #endif
 
 void systick_init(uint32 reload_val);
+void systick_disable();
 
 static inline uint32 systick_get_count(void) {
     return __read(SYSTICK_CNT);
diff --git a/wirish/SystemTick.cpp b/wirish/SystemTick.cpp
new file mode 100644
index 0000000..8631a70
--- /dev/null
+++ b/wirish/SystemTick.cpp
@@ -0,0 +1,40 @@
+/* *****************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Marti F. Bolivar.
+ *
+ * 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.
+ * ****************************************************************************/
+
+#include "SystemTick.h"
+#include "systick.h"
+#include "time.h"
+
+SysTick::SysTick(void) {
+}
+
+void SysTick::begin(void) {
+  systick_init(MAPLE_RELOAD_VAL);
+}
+
+void SysTick::end(void) {
+  systick_disable();
+}
+
+SysTick SystemTick;
diff --git a/wirish/SystemTick.h b/wirish/SystemTick.h
new file mode 100644
index 0000000..f0dd876
--- /dev/null
+++ b/wirish/SystemTick.h
@@ -0,0 +1,43 @@
+/* *****************************************************************************
+ * The MIT License
+ *
+ * Copyright (c) 2010 Marti F. Bolivar.
+ *
+ * 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.
+ * ****************************************************************************/
+
+/**
+ * @brief wrapper class for starting and stopping SysTick interrupts.
+ */
+
+#ifndef _SYSTEMTICK_H_
+#define _SYSTEMTICK_H_
+
+#include "systick.h"
+
+class SysTick {
+ public:
+  SysTick(void);
+  void begin(void);
+  void end(void);
+};
+
+extern SysTick SystemTick;
+
+#endif
diff --git a/wirish/rules.mk b/wirish/rules.mk
index fcd25c6..18d93b2 100644
--- a/wirish/rules.mk
+++ b/wirish/rules.mk
@@ -25,7 +25,8 @@ cppSRCS_$(d) := wirish_math.cpp          \
                 comm/HardwareSPI.cpp 	 \
                 usb_serial.cpp 	         \
 		HardwareTimer.cpp        \
-                cxxabi-compat.cpp
+                cxxabi-compat.cpp        \
+		SystemTick.cpp
 
 cFILES_$(d) := $(cSRCS_$(d):%=$(d)/%)
 cppFILES_$(d) := $(cppSRCS_$(d):%=$(d)/%)
diff --git a/wirish/wirish.h b/wirish/wirish.h
index 13ff313..9ca5692 100644
--- a/wirish/wirish.h
+++ b/wirish/wirish.h
@@ -44,6 +44,7 @@
 #include "HardwareSPI.h"
 #include "HardwareSerial.h"
 #include "usb_serial.h"
+#include "SystemTick.h"
 #include "HardwareTimer.h"
 #endif