X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fcobboard%2Factuator.c;h=6811854a3e97a2c9cea034b6e58c191db7133335;hp=cebcd2aaf05d1b0fed3e22f97c4d3f66c99501ba;hb=fa8546ea39c7442ad3bf5a822a72a2b50a41045d;hpb=9a55e14e6ec1c05dfc3a6a7a9bc1b9c879207cad

diff --git a/projects/microb2010/cobboard/actuator.c b/projects/microb2010/cobboard/actuator.c
index cebcd2a..6811854 100644
--- a/projects/microb2010/cobboard/actuator.c
+++ b/projects/microb2010/cobboard/actuator.c
@@ -1,6 +1,6 @@
-/*  
+/*
  *  Copyright Droids Corporation (2009)
- * 
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
@@ -48,19 +48,28 @@
 #define COBROLLER_SPEED 800
 //#define COBROLLER_SPEED 400
 
-#define SERVO_DOOR_OPEN 250
-#define SERVO_DOOR_CLOSED 470
+#define SERVO_DOOR_OPEN 260
+#define SERVO_DOOR_CLOSED 510
+#define SERVO_DOOR_BLOCK 510
+
+#define SERVO_CARRY_L_OPEN 295
+#define SERVO_CARRY_L_CLOSED 400 // 510
+
+#define SERVO_CARRY_R_OPEN 455
+#define SERVO_CARRY_R_CLOSED 350 // 250
 
 void actuator_init(void);
 
 void servo_carry_open(void)
 {
-	/* TODO */
+	pwm_ng_set(SERVO_CARRY_L_PWM, SERVO_CARRY_L_OPEN);
+	pwm_ng_set(SERVO_CARRY_R_PWM, SERVO_CARRY_R_OPEN);
 }
 
 void servo_carry_close(void)
 {
-	/* TODO */
+	pwm_ng_set(SERVO_CARRY_L_PWM, SERVO_CARRY_L_CLOSED);
+	pwm_ng_set(SERVO_CARRY_R_PWM, SERVO_CARRY_R_CLOSED);
 }
 
 void servo_door_open(void)
@@ -73,24 +82,25 @@ void servo_door_close(void)
 	pwm_ng_set(SERVO_DOOR_PWM, SERVO_DOOR_CLOSED);
 }
 
-void left_cobroller_on(void)
-{
-	cobboard.left_cobroller_speed = COBROLLER_SPEED;
-}
-
-void right_cobroller_on(void)
+void servo_door_block(void)
 {
-	cobboard.right_cobroller_speed = COBROLLER_SPEED;
+	pwm_ng_set(SERVO_DOOR_PWM, SERVO_DOOR_BLOCK);
 }
 
-void left_cobroller_off(void)
+void cobroller_on(uint8_t side)
 {
-	cobboard.left_cobroller_speed = 0;
+	if (side == I2C_LEFT_SIDE)
+		cobboard.left_cobroller_speed = COBROLLER_SPEED;
+	else
+		cobboard.right_cobroller_speed = -COBROLLER_SPEED;
 }
 
-void right_cobroller_off(void)
+void cobroller_off(uint8_t side)
 {
-	cobboard.right_cobroller_speed = 0;
+	if (side == I2C_LEFT_SIDE)
+		cobboard.left_cobroller_speed = 0;
+	else
+		cobboard.right_cobroller_speed = 0;
 }
 
 void actuator_init(void)