X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fcobboard%2Fshovel.c;h=56efa9685c59b5d7803d77686ae58ba49bbd80ae;hp=42ab78bce33c89b094357edf05064b5efd41a471;hb=f5502f60124c62801685777bb7c699bdfb7e1166;hpb=5d21466eb434aa44eeb334a19668c58ffef5665f

diff --git a/projects/microb2010/cobboard/shovel.c b/projects/microb2010/cobboard/shovel.c
index 42ab78b..56efa96 100644
--- a/projects/microb2010/cobboard/shovel.c
+++ b/projects/microb2010/cobboard/shovel.c
@@ -40,12 +40,17 @@
 #include <rdline.h>
 
 #include "main.h"
+#include "state.h"
 #include "shovel.h"
 
 #define SHOVEL_DOWN 100
 #define SHOVEL_MID  4500
 #define SHOVEL_UP   11000
 
+static int32_t shovel_k1 = 1000;
+static int32_t shovel_k2 = 20;
+static uint8_t shovel_current_limit = 1;
+
 /* init spickle position at beginning */
 static void shovel_autopos(void)
 {
@@ -68,6 +73,51 @@ static uint8_t shovel_is_at_pos(int32_t pos)
 	return 0;
 }
 
+void shovel_set_current_limit_coefs(int32_t k1, int32_t k2)
+{
+	shovel_k1 = k1;
+	shovel_k2 = k2;
+}
+
+uint8_t shovel_get_current_limit_coefs(int32_t *k1, int32_t *k2)
+{
+	*k1 = shovel_k1;
+	*k2 = shovel_k2;
+	return shovel_current_limit;
+}
+
+void shovel_current_limit_enable(uint8_t enable)
+{
+	shovel_current_limit = enable;
+}
+
+/* Set CS command for shovel. Called by CS manager. */
+void shovel_set(void *mot, int32_t cmd)
+{
+	static int32_t oldpos;
+	int32_t pos, maxcmd, speed;
+
+	pos = encoders_spi_get_value(SHOVEL_ENCODER);
+	if (shovel_current_limit) {
+		speed = pos - oldpos;
+		if (speed > 0 && cmd < 0)
+			maxcmd = shovel_k1;
+		else if (speed < 0 && cmd > 0)
+			maxcmd = shovel_k1;
+		else {
+			speed = ABS(speed);
+			maxcmd = shovel_k1 + shovel_k2 * speed;
+		}
+		if (cmd > maxcmd)
+			cmd = maxcmd;
+		else if (cmd < -maxcmd)
+			cmd = -maxcmd;
+	}
+
+	pwm_ng_set(mot, cmd);
+	oldpos = pos;
+}
+
 void shovel_down(void)
 {
 	quadramp_set_1st_order_vars(&cobboard.shovel.qr, 2500, 2500);
@@ -84,7 +134,10 @@ void shovel_mid(void)
 
 void shovel_up(void)
 {
-	quadramp_set_1st_order_vars(&cobboard.shovel.qr, 2000, 2500);
+	if (state_get_cob_count() <= 1)
+		quadramp_set_1st_order_vars(&cobboard.shovel.qr, 1000, 2500);
+	else
+		quadramp_set_1st_order_vars(&cobboard.shovel.qr, 2000, 2500);
 	quadramp_set_2nd_order_vars(&cobboard.shovel.qr, 80, 15);
 	cs_set_consign(&cobboard.shovel.cs, SHOVEL_UP);
 }