Disabled throttle limit scaling

derlucas · Sep 21, 2017 · d073622 · d073622
1 parent ca5f47c
commit d073622
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+=== FW 3.29 ===
+* Disabled throttle limit scaling for now.
+* Increased packet timeout.
+
 === FW 3.28 ===
 * DC_CAL timeout.
 * Added board configuration file to avoid braking at boot.

diff --git a/build_all/410_o_411_o_412/VESC_0005ohm.bin b/build_all/410_o_411_o_412/VESC_0005ohm.bin
diff --git a/build_all/410_o_411_o_412/VESC_default.bin b/build_all/410_o_411_o_412/VESC_default.bin
diff --git a/build_all/410_o_411_o_412/VESC_default_no_hw_limits.bin b/build_all/410_o_411_o_412/VESC_default_no_hw_limits.bin
diff --git a/build_all/410_o_411_o_412/VESC_servoout.bin b/build_all/410_o_411_o_412/VESC_servoout.bin
diff --git a/build_all/410_o_411_o_412/VESC_ws2811.bin b/build_all/410_o_411_o_412/VESC_ws2811.bin
diff --git a/build_all/46_o_47/VESC_0005ohm.bin b/build_all/46_o_47/VESC_0005ohm.bin
diff --git a/build_all/46_o_47/VESC_33k.bin b/build_all/46_o_47/VESC_33k.bin
diff --git a/build_all/46_o_47/VESC_default.bin b/build_all/46_o_47/VESC_default.bin
diff --git a/build_all/46_o_47/VESC_servoout.bin b/build_all/46_o_47/VESC_servoout.bin
diff --git a/build_all/46_o_47/VESC_ws2811.bin b/build_all/46_o_47/VESC_ws2811.bin
diff --git a/build_all/46_o_47/VESC_ws2811_33k.bin b/build_all/46_o_47/VESC_ws2811_33k.bin
diff --git a/build_all/48/VESC_0005ohm.bin b/build_all/48/VESC_0005ohm.bin
diff --git a/build_all/48/VESC_default.bin b/build_all/48/VESC_default.bin
diff --git a/build_all/48/VESC_servoout.bin b/build_all/48/VESC_servoout.bin
diff --git a/build_all/48/VESC_ws2811.bin b/build_all/48/VESC_ws2811.bin
diff --git a/build_all/60/VESC_default.bin b/build_all/60/VESC_default.bin
diff --git a/build_all/60/VESC_default_no_hw_limits.bin b/build_all/60/VESC_default_no_hw_limits.bin
diff --git a/build_all/60/VESC_servoout.bin b/build_all/60/VESC_servoout.bin
diff --git a/build_all/60/VESC_ws2811.bin b/build_all/60/VESC_ws2811.bin
diff --git a/build_all/DAS_RS/VESC_default.bin b/build_all/DAS_RS/VESC_default.bin
diff --git a/conf_general.h b/conf_general.h
@@ -22,7 +22,7 @@
 
 // Firmware version
 #define FW_VERSION_MAJOR		3
-#define FW_VERSION_MINOR		28
+#define FW_VERSION_MINOR		29
 
 #include "datatypes.h"
 

diff --git a/mc_interface.c b/mc_interface.c
@@ -1429,13 +1429,18 @@ static void update_override_limits(volatile mc_configuration *conf) {
 		duty_abs *= SQRT3_BY_2;
 	}
 
-	if (duty_abs > 0.001) {
-		conf->lo_current_motor_max_now = utils_min_abs(conf->lo_current_max, conf->lo_in_current_max / duty_abs);
-		conf->lo_current_motor_min_now = utils_min_abs(conf->lo_current_min, conf->lo_in_current_min / duty_abs);
-	} else {
-		conf->lo_current_motor_max_now = conf->lo_current_max;
-		conf->lo_current_motor_min_now = conf->lo_current_min;
-	}
+//	if (duty_abs > 0.001) {
+//		conf->lo_current_motor_max_now = utils_min_abs(conf->lo_current_max, conf->lo_in_current_max / duty_abs);
+//		conf->lo_current_motor_min_now = utils_min_abs(conf->lo_current_min, conf->lo_in_current_min / duty_abs);
+//	} else {
+//		conf->lo_current_motor_max_now = conf->lo_current_max;
+//		conf->lo_current_motor_min_now = conf->lo_current_min;
+//	}
+
+	// Note: The above code should work, but many people have reported issues with it. Leaving it
+	// disabled for now until I have done more investigation.
+	conf->lo_current_motor_max_now = conf->lo_current_max;
+	conf->lo_current_motor_min_now = conf->lo_current_min;
 }
 
 static THD_FUNCTION(timer_thread, arg) {