changed math.h to wiring_math.h to avoid collision with newlib's math library

git-svn-id: https://leaflabs.googlecode.com/svn/trunk/library@99 749a229e-a60e-11de-b98f-4500b42dc123

4 files changed, 14 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index b25a9b9..58678df 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ CSRC = lib/systick.c                        \
 
 CSRC += $(STM32SRCS)
 
-CPPSRC = wiring/math.cpp \
+CPPSRC = wiring/wiring_math.cpp \
 	 wiring/Print.cpp \
 	 wiring/comm/HardwareSerial.cpp \
 	 wiring/comm/HardwareUsb.cpp \
diff --git a/src/main.cpp b/src/main.cpp
index fd846ee..28a9b98 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,19 +1,22 @@
 #include "wiring.h"

 #include "HardwareSerial.h"

-#include "math.h"

+#include "wiring_math.h"

 #include "usb.h"

 

 int ledPin = 13;

 int toggle=0;

 void setup() {

-  pinMode(ledPin,OUTPUT);

+//    pinMode(ledPin,OUTPUT);

+//    Serial2.begin(9600);

 }

 

 void loop() {

-  digitalWrite(ledPin,HIGH);

-  delay(200);

-  digitalWrite(ledPin,LOW);

-  delay(200);

+    asm volatile("nop");

+//    digitalWrite(ledPin,HIGH);

+//    delay(200);

+//    digitalWrite(ledPin,LOW);

+//    delay(200);

+//    Serial2.println("Hello world");

 }

 

 int main(void) {

diff --git a/src/wiring/math.cpp b/src/wiring/wiring_math.cpp
index 9be7dc3..9be7dc3 100644
--- a/src/wiring/math.cpp
+++ b/src/wiring/wiring_math.cpp
diff --git a/src/wiring/math.h b/src/wiring/wiring_math.h
index 8f30396..f000bbd 100644
--- a/src/wiring/math.h
+++ b/src/wiring/wiring_math.h
@@ -1,5 +1,7 @@
-#ifndef _MATH_H_
-#define _MATH_H_
+#ifndef _WIRING_MATH_H_
+#define _WIRING_MATH_H_
+
+#include <math.h>
 
 void randomSeed(unsigned int);
 long random(long);