Ken Parish / Mbed 2 deprecated XYZ_PROX_01_1

compiling aside from neopixel lib?

Dependencies:   VCNL40x0_1 mbed

Files at this revision

API Documentation at this revision

Revision 2:e97394fe87c4, committed 2014-05-30

Comitter:
ghostaudio
Date:
Fri May 30 12:46:47 2014 +0000
Parent:
1:33ba332a73ab
Commit message:
again...

Changed in this revision

NeoStrip.lib Show diff for this revision Revisions of this file
gt.h Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r 33ba332a73ab -r e97394fe87c4 NeoStrip.lib
--- a/NeoStrip.lib	Fri May 30 12:41:00 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/aswild/code/NeoStrip/#9f237b11f0a8

diff -r 33ba332a73ab -r e97394fe87c4 gt.h
--- a/gt.h	Fri May 30 12:41:00 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-/**** gt.h ****/
-
-const int gt_img[] = {
-	0x122446, 0xffff00, 0xffff00, 0xffff00, 0xffff00, 0x122446, 0x122446, 0x122446, 
-	0xffff00, 0xffff00, 0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 
-	0xffff00, 0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 
-	0xffff00, 0x122446, 0x122446, 0xffff00, 0xffff00, 0xffff00, 0xffff00, 0xffff00, 
-	0xffff00, 0xffff00, 0x122446, 0x122446, 0xffff00, 0x122446, 0xffff00, 0x122446, 
-	0x122446, 0xffff00, 0xffff00, 0xffff00, 0xffff00, 0x122446, 0xffff00, 0x122446, 
-	0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 0xffff00, 0x122446, 
-	0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 0x122446, 0xffff00, 0x122446};
-

diff -r 33ba332a73ab -r e97394fe87c4 main.cpp
--- a/main.cpp	Fri May 30 12:41:00 2014 +0000
+++ b/main.cpp	Fri May 30 12:46:47 2014 +0000
@@ -1,7 +1,7 @@
 #include "mbed.h"
 #include "VCNL40x0.h"
-#include "NeoStrip.h"
-#define #define NumPixels 4
+//#include "NeoStrip.h"
+//#define NumPixels 4
 
 I2C i2c(p28, p27);
 DigitalOut mled0(LED1); 
@@ -10,7 +10,7 @@
 DigitalOut mled3(LED4); 
 Serial pc(USBTX, USBRX);
 DigitalOut reset(p29);
-NeoStrip strip(p26, NumPixels);
+//NeoStrip strip(p26, NumPixels);
 
 const uint8_t MUX = 0xE0; // 11100000
 const uint8_t VCNL4020 = 0x26;
@@ -109,7 +109,7 @@
         for (int i = 0; i < 4; i++){
         pc.printf("\r %i ", sensors[i]);
         }
-    pc.printf("\r \n ");};
+    pc.printf("\r \n ");
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////