Merge pull request vedderb#346 from afzalmam/dev_fw_5_03

vedderb · web-flow · commit b6eb5852aa7a · 2021-10-11T10:08:24.000+02:00
PAS: add constant torque control type
diff --git a/applications/app_pas.c b/applications/app_pas.c
@@ -207,6 +207,9 @@ static THD_FUNCTION(pas_thread, arg) {
 					}
 				}
 				break;
+			case PAS_CTRL_TYPE_CONSTANT_TORQUE:
+				output = pedal_rpm > config.pedal_rpm_start ? config.current_scaling : 0;
+				break;
 			default:
 				break;
 		}
diff --git a/confgenerator.h b/confgenerator.h
@@ -9,7 +9,7 @@
 
 // Constants
 #define MCCONF_SIGNATURE		3706516163
-#define APPCONF_SIGNATURE		1531606261
+#define APPCONF_SIGNATURE		763356168
 
 // Functions
 int32_t confgenerator_serialize_mcconf(uint8_t *buffer, const mc_configuration *conf);
diff --git a/datatypes.h b/datatypes.h
@@ -574,7 +574,8 @@ typedef enum {
 // PAS control types
 typedef enum {
 	PAS_CTRL_TYPE_NONE = 0,
-	PAS_CTRL_TYPE_CADENCE
+	PAS_CTRL_TYPE_CADENCE,
+	PAS_CTRL_TYPE_CONSTANT_TORQUE
 } pas_control_type;
 
 // PAS sensor types

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,9 @@ static THD_FUNCTION(pas_thread, arg) {`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`	`break;`
	`210`	`+ case PAS_CTRL_TYPE_CONSTANT_TORQUE:`
	`211`	`+ output = pedal_rpm > config.pedal_rpm_start ? config.current_scaling : 0;`
	`212`	`+ break;`
`210`	`213`	`default:`
`211`	`214`	`break;`
`212`	`215`	`}`