Diff: main.cpp

Revision:

3:194d842b7ba1

Parent:

2:b3eddbd12635

Child:

4:0632609d4862

--- a/main.cpp	Tue May 19 11:04:00 2015 +0000
+++ b/main.cpp	Tue May 19 11:18:48 2015 +0000
@@ -36,33 +36,33 @@
 float Zaxis = 0;
  
 int modus = 0;
-int alarm1 = 0;
-int alarm2 = 0;
 int kleur = 0;
 int rood = 0;
 int groen = 0;
 int blauw = 0;
  
+/*
 char orientation;
-char side;
- 
+char side; 
 char Left;
 char Right;
 char Down;
 char Up;
 char Front;
 char Back;
- 
+*/ 
  
-RPCVariable<float> rpc_ai1(&potentiometer1,"potentiometer1");
-RPCVariable<float> rpc_ai2(&potentiometer2,"potentiometer2");
-RPCVariable<int> rpc_alarm1(&alarm1,"alarm1");
-RPCVariable<int> rpc_alarm2(&alarm2,"alarm2");
-   
+RPCVariable<float> rpc_potentiometer1(&potentiometer1,"potentiometer1");
+RPCVariable<float> rpc_potentiometer2(&potentiometer2,"potentiometer2");
+RPCVariable<float> rpc_Xaxis(&Xaxis,"Xaxis");
+RPCVariable<float> rpc_Yaxis(&Yaxis,"Yaxis");
+ 
 RPCVariable<int> rpc_rood(&rood,"rood");
 RPCVariable<int> rpc_groen(&groen,"groen");
 RPCVariable<int> rpc_blauw (&blauw ,"blauw ");
  
+
+ 
 AnalogIn pot2(p19);
 AnalogIn pot1(p20);
  
@@ -293,7 +293,7 @@
     glcd.locate(0,0);                            //Zet de cursor op X = 0 & Y = 0
     glcd.printf("Servo-1: %f", Servo1);
     glcd.locate(0,10);                            //Zet de cursor op X = 0 & Y = 10    
-    glcd.printf("Servo-21 %f", Servo2);
+    glcd.printf("Servo-2 %f", Servo2);
  
     wait(0.5);     
 }