Revision 4:6dc6e8b86b7d, committed 2014-12-05

Comitter:

kalbers

Date:

Fri Dec 05 21:38:03 2014 +0000

Parent:

3:5f5d75cba8e1

Parent:

2:45b90e8d7d82

Child:

6:9a6c0c98e694

Commit message:

Merged the branches

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/led.cpp	Fri Dec 05 21:38:03 2014 +0000
@@ -0,0 +1,13 @@
+/*
+ * LED Cube library
+ * by Jose Oyola and Robert Bui
+ * UC Berkeley 2014
+ */
+
+#include "main.h"
+#include "mbed.h"
+
+
+ void move(deltaX, deltaY, deltaZ) {
+     if(pos[Y] == 0 || pos[Z] == 9) {
+}
\ No newline at end of file

--- a/main.h	Fri Dec 05 21:35:37 2014 +0000
+++ b/main.h	Fri Dec 05 21:38:03 2014 +0000
@@ -23,6 +23,10 @@
 
 #define MY_BOARD WIGO
 
+#define X                  0
+#define Y                  1
+#define Z                  2
+
 void init();
 
 #endif