Reverting commits between `git merge-head master refactor` and master.

This is a combination of 11 revert commits, and allows for a clean
merge of the work done in the refactor branch.

The combined commit messages follow.

Revert "Committing basic ring_buffer test."

This reverts commit 987fa5f433e0cd41b1621dad8b4e331cf82d49f3.

Revert "qa-slave-shield.cpp and test-session.cpp fixes for Mini and RET6 Edition."

This reverts commit cdd367bdd264c9e19180032c119850fbba2115ba.

Revert "Brought examples/ up to date; PIN_MAP bugfix for D24."

This reverts commit b4c2d4514c6d52cac8a649c5d5c24b68a3c0a416.

Revert "Separated GPIO config to a separate FSMC routine."

This reverts commit 744848ad0fc33eed66acc44e41c3c9d646c5b100.

Revert "Slightly faster RAM writes (6.5MHz)."

This reverts commit 8ba0b6bb065acb4aff26bc9c838de5f37515caf1.

Revert "FSMC working but slow (~6 MHz)."

This reverts commit 0dc9490cf4f4f10a23b08fef1728773f10c1b76a.

Revert "Maple Mini ERROR_LED_PIN fix."

This reverts commit 07d437706840901db1e09ff0ab88229c67c1fa8a.

Revert "Fixing USBSerial::read(void*, uint32) return value (thanks, Crenn!)"

This reverts commit 3ba7196712a5bfe4fe1166b6c34d49c3d7254568.

Revert "Trivial gpio_init() bugfix"

This reverts commit f6ce003bb935f26eeefa54acf7c2ae6afaabd871.

Revert "Trivial changes to test-session.cpp"

This reverts commit a32a37b121ac7e62660d2a83fe67c857fe705122.

Revert ".gitignore: Ignore cscope* files"

This reverts commit d8c72c17bd6d7416a0846e69f4f5ae5cb229d58e.

1 files changed, 28 insertions, 22 deletions

diff --git a/examples/test-systick.cpp b/examples/test-systick.cpp
index c7b5529..247892d 100644
--- a/examples/test-systick.cpp
+++ b/examples/test-systick.cpp
@@ -3,48 +3,54 @@
 #include "wirish.h"
 #include "systick.h"
 
-#define LED_PIN BOARD_LED_PIN
-#define PWM_PIN 2
-#define BUT     BOARD_BUTTON_PIN
+#define LED_PIN 13
+#define PWM_PIN  2
+#define BUT     38
 
-void setup() {
+void setup()
+{
     /* Set up the LED to blink  */
     pinMode(LED_PIN, OUTPUT);
-    pinMode(BUT, INPUT);
+
+    /* Turn on PWM on pin PWM_PIN */
+    pinMode(PWM_PIN, PWM);
+    pwmWrite(PWM_PIN, 0x8000);
+
+    pinMode(BUT, INPUT_PULLDOWN);
 }
 
-bool disable = true;
+int toggle = 0;
 long time = 0;
 
 void loop() {
-    volatile int i = 0;
-    toggleLED();
+    toggle ^= 1;
+    digitalWrite(LED_PIN, toggle);
 
     // An artificial delay
-    for(i = 0; i < 150000; i++)
-        ;
-
-    if(isButtonPressed()) {
-        if (disable) {
-            systick_disable();
-            SerialUSB.println("Disabling SysTick");
-        } else {
-            SerialUSB.println("Re-enabling SysTick");
-            systick_resume();
-        }
-        disable = !disable;
+    int16 i = 1;
+    float j = 1;
+    for(i=0; i<6553; i++) {
+        j = sqrt(j) + 1; 
+    }
+        
+    if(digitalRead(BUT)) {
+        systick_disable();
+    } else {
+        systick_resume();
     }
 
+    //SerialUSB.println(micros());      // there is a bug with this
     SerialUSB.println(millis());
 }
 
 // Force init to be called *first*, i.e. before static object allocation.
 // Otherwise, statically allocated object that need libmaple may fail.
-__attribute__((constructor)) void premain() {
+ __attribute__(( constructor )) void premain() {
     init();
 }
 
-int main(void) {
+int main(void)
+{
     setup();
 
     while (1) {