aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriperry <iperry@749a229e-a60e-11de-b98f-4500b42dc123>2010-01-08 01:22:43 +0000
committeriperry <iperry@749a229e-a60e-11de-b98f-4500b42dc123>2010-01-08 01:22:43 +0000
commita038b4f9875d06be339d3abb33967ec9a89c2f8a (patch)
treeebd77ccb2702f218207077594916f42491527375 /src
parent2addfe8c42c6bcdc0a15c751e2436447b73d03fe (diff)
downloadlibrambutan-a038b4f9875d06be339d3abb33967ec9a89c2f8a.tar.gz
librambutan-a038b4f9875d06be339d3abb33967ec9a89c2f8a.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp15
-rw-r--r--src/wiring/wiring_math.cpp (renamed from src/wiring/math.cpp)0
-rw-r--r--src/wiring/wiring_math.h (renamed from src/wiring/math.h)6
3 files changed, 13 insertions, 8 deletions
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);