Diff: main.cpp

Revision:

49:4475f0760594

Parent:

46:853966aab733

Child:

50:8cf0be9a61db

--- a/main.cpp	Tue Apr 11 15:59:30 2017 +0000
+++ b/main.cpp	Tue Apr 11 20:00:27 2017 +0000
@@ -3,7 +3,7 @@
 #include "LedController.hpp"
 #include "LedController.hpp"
 #include "RealPwmOut.hpp"
-#include "Servomotor.hpp"
+#include "RealServomotor.hpp"
 #include "RealXbeeTransmitter.hpp"
 #include "RealXbeeReceiver.hpp"
 #include "Target.hpp"
@@ -32,10 +32,10 @@
     
     //Target 0
     RealPwmOut servo_pwm_out_0(p21);
-    Servomotor servomotor_0(servo_pwm_out_0);
-    servomotor_0.set_angle(25);
+    RealServomotor servomotor_0(servo_pwm_out_0);
+    servomotor_0.set_position_down();
     
-    RealDigitalOut ally_leds_0(p5);
+    ally_leds_0(p5);
     RealDigitalOut ennemy_leds_0(p6);
     LedController ally_leds_controller_0(ally_leds_0);
     LedController ennemy_leds_controller_0(ennemy_leds_0);
@@ -44,8 +44,8 @@
     
     //Target 1
     RealPwmOut servo_pwm_out_1(p22);
-    Servomotor servomotor_1(servo_pwm_out_1);
-    servomotor_1.set_angle(25);
+    RealServomotor servomotor_1(servo_pwm_out_1);
+    servomotor_1.set_position_down();
     
     RealDigitalOut ally_leds_1(p9);
     RealDigitalOut ennemy_leds_1(p10);