systick testing and simplification

ripped out marti's SystemTick for the sake of simplicity and added a
systick_resume function to libmaple. new example program demonstrates
the functionality, also demonstrates micros()/USB bug

4 files changed, 0 insertions, 85 deletions

diff --git a/wirish/SystemTick.cpp b/wirish/SystemTick.cpp
deleted file mode 100644
index 8631a70..0000000
--- a/wirish/SystemTick.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* *****************************************************************************
- * 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
deleted file mode 100644
index f0dd876..0000000
--- a/wirish/SystemTick.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* *****************************************************************************
- * 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 18d93b2..cb5a69f 100644
--- a/wirish/rules.mk
+++ b/wirish/rules.mk
@@ -26,7 +26,6 @@ cppSRCS_$(d) := wirish_math.cpp          \
                 usb_serial.cpp 	         \
 		HardwareTimer.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 d293901..7ede77c 100644
--- a/wirish/wirish.h
+++ b/wirish/wirish.h
@@ -45,7 +45,6 @@
 #include "HardwareSPI.h"
 #include "HardwareSerial.h"
 #include "usb_serial.h"
-#include "SystemTick.h"
 #include "HardwareTimer.h"
 #endif