X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=projects%2Fmicrob2010%2Fballboard%2Factuator.c;h=c635fe92f3ea6f3eac2a797dad22aa20b097e6c7;hb=d78a81c0df6dfe318d873a6f877e53cfb957ad8e;hp=d745fa08552aac92869d9b42e0a88b2dd8c517f5;hpb=063af91cd38fceba6cbcf3a9b8abd4c48684d990;p=aversive.git

diff --git a/projects/microb2010/ballboard/actuator.c b/projects/microb2010/ballboard/actuator.c
index d745fa0..c635fe9 100644
--- a/projects/microb2010/ballboard/actuator.c
+++ b/projects/microb2010/ballboard/actuator.c
@@ -47,12 +47,9 @@
 #define ROLLER_OFF     0
 #define ROLLER_REVERSE ROLLER_SPEED
 
-#define FORKROT_DEPLOYED -50000
-#define FORKROT_PACKED   0
-
-#define FORKTRANS_LEFT   0
-#define FORKTRANS_MIDDLE 500
-#define FORKTRANS_RIGHT  1000
+#define FORKROT_DEPLOYED -55000
+#define FORKROT_MID -33000
+#define FORKROT_PACKED   -4000
 
 void roller_on(void)
 {
@@ -79,17 +76,18 @@ void fork_pack(void)
 	cs_set_consign(&ballboard.forkrot.cs, FORKROT_PACKED);
 }
 
-void fork_left(void)
-{
-	cs_set_consign(&ballboard.forktrans.cs, FORKTRANS_LEFT);
-}
-
-void fork_right(void)
+void fork_mid(void)
 {
-	cs_set_consign(&ballboard.forktrans.cs, FORKTRANS_RIGHT);
+	cs_set_consign(&ballboard.forkrot.cs, FORKROT_MID);
 }
 
-void fork_middle(void)
+void actuator_init(void)
 {
-	cs_set_consign(&ballboard.forktrans.cs, FORKTRANS_MIDDLE);
+	printf_P(PSTR("fork autopos..."));
+	pwm_ng_set(FORKROT_PWM, 400);
+	wait_ms(1000);
+	pwm_ng_set(FORKROT_PWM, 0);
+	encoders_spi_set_value(FORKROT_ENCODER, 0);
+	printf_P(PSTR("ok\r\n"));
+	ballboard.forkrot.on = 1;
 }