X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fcobboard%2Factuator.c;h=8dfe8bb44cea1ed0de020a00e85b381eaf3558bc;hp=321727067a05465a5ace2168ab27a3095fd7fed1;hb=b022f257a5ee568737e1a684a83d0154397fffcb;hpb=57b3e145f2ff46e1a7e7d522c85f3c56821dbf48

diff --git a/projects/microb2010/cobboard/actuator.c b/projects/microb2010/cobboard/actuator.c
index 3217270..8dfe8bb 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
@@ -46,21 +46,30 @@
 #include "actuator.h"
 
 #define COBROLLER_SPEED 800
+//#define COBROLLER_SPEED 400
+
+#define SERVO_DOOR_OPEN 260
+#define SERVO_DOOR_CLOSED 500
+#define SERVO_DOOR_BLOCK 500
+
+#define SERVO_CARRY_L_OPEN 295
+#define SERVO_CARRY_L_CLOSED 400 // 510
 
-#define SERVO_DOOR_PWM ((void *)&gen.servo2)
-#define SERVO_DOOR_OPEN 250
-#define SERVO_DOOR_CLOSED 470
+#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,33 @@ void servo_door_close(void)
 	pwm_ng_set(SERVO_DOOR_PWM, SERVO_DOOR_CLOSED);
 }
 
-void left_cobroller_on(void)
+void servo_door_block(void)
 {
-	cobboard.left_cobroller_speed = COBROLLER_SPEED;
+	pwm_ng_set(SERVO_DOOR_PWM, SERVO_DOOR_BLOCK);
 }
 
-void right_cobroller_on(void)
+void cobroller_on(uint8_t side)
 {
-	cobboard.right_cobroller_speed = COBROLLER_SPEED;
+	if (side == I2C_LEFT_SIDE)
+		cobboard.left_cobroller_speed = COBROLLER_SPEED;
+	else
+		cobboard.right_cobroller_speed = -COBROLLER_SPEED;
 }
 
-void left_cobroller_off(void)
+void cobroller_off(uint8_t side)
 {
-	cobboard.left_cobroller_speed = 0;
+	if (side == I2C_LEFT_SIDE)
+		cobboard.left_cobroller_speed = 0;
+	else
+		cobboard.right_cobroller_speed = 0;
 }
 
-void right_cobroller_off(void)
+void cobroller_reverse(uint8_t side)
 {
-	cobboard.right_cobroller_speed = 0;
+	if (side == I2C_LEFT_SIDE)
+		cobboard.left_cobroller_speed = -COBROLLER_SPEED;
+	else
+		cobboard.right_cobroller_speed = COBROLLER_SPEED;
 }
 
 void actuator_init(void)