SoftStart removed; now enabled permanently

NicoAleman · NicoAleman · commit b103ae8cab95 · 2023-03-11T08:24:17.000-05:00
Extremely large majority okay with this feature being removed, and the few against this removal have not posed a valid enough argument for keeping it around, outside of for compatibility with one EUC project, which the Float Package is not meant for.
diff --git a/float/float/conf/conf_default.h b/float/float/conf/conf_default.h
@@ -185,7 +185,7 @@
 
 // Tiltback Speed
 #ifndef APPCONF_FLOAT_INPUTTILT_SPEED
-#define APPCONF_FLOAT_INPUTTILT_SPEED 20
+#define APPCONF_FLOAT_INPUTTILT_SPEED 30
 #endif
 
 // Tiltback Smoothing Factor
@@ -233,11 +233,6 @@
 #define APPCONF_FLOAT_STARTUP_CLICK_CURRENT 0
 #endif
 
-// Enable Soft Start
-#ifndef APPCONF_FLOAT_STARTUP_SOFTSTART_ENABLED
-#define APPCONF_FLOAT_STARTUP_SOFTSTART_ENABLED 1
-#endif
-
 // Enable Simple Start
 #ifndef APPCONF_SIMPLESTART_ENABLED
 #define APPCONF_SIMPLESTART_ENABLED 0
diff --git a/float/float/conf/confparser.c b/float/float/conf/confparser.c
@@ -56,7 +56,6 @@ int32_t confparser_serialize_float_config(uint8_t *buffer, const float_config *c
 	buffer_append_float16(buffer, conf->startup_roll_tolerance, 100, &ind);
 	buffer_append_float16(buffer, conf->startup_speed, 100, &ind);
 	buffer[ind++] = (uint8_t)conf->startup_click_current;
-	buffer[ind++] = conf->startup_softstart_enabled;
 	buffer[ind++] = conf->startup_simplestart_enabled;
 	buffer[ind++] = conf->startup_pushstart_enabled;
 	buffer[ind++] = conf->startup_dirtylandings_enabled;
@@ -158,7 +157,6 @@ bool confparser_deserialize_float_config(const uint8_t *buffer, float_config *co
 	conf->startup_roll_tolerance = buffer_get_float16(buffer, 100, &ind);
 	conf->startup_speed = buffer_get_float16(buffer, 100, &ind);
 	conf->startup_click_current = buffer[ind++];
-	conf->startup_softstart_enabled = buffer[ind++];
 	conf->startup_simplestart_enabled = buffer[ind++];
 	conf->startup_pushstart_enabled = buffer[ind++];
 	conf->startup_dirtylandings_enabled = buffer[ind++];
@@ -253,7 +251,6 @@ void confparser_set_defaults_float_config(float_config *conf) {
 	conf->startup_roll_tolerance = APPCONF_FLOAT_STARTUP_ROLL_TOLERANCE;
 	conf->startup_speed = APPCONF_FLOAT_STARTUP_SPEED;
 	conf->startup_click_current = APPCONF_FLOAT_STARTUP_CLICK_CURRENT;
-	conf->startup_softstart_enabled = APPCONF_FLOAT_STARTUP_SOFTSTART_ENABLED;
 	conf->startup_simplestart_enabled = APPCONF_SIMPLESTART_ENABLED;
 	conf->startup_pushstart_enabled = APPCONF_PUSHSTART_ENABLED;
 	conf->startup_dirtylandings_enabled = APPCONF_DIRTYLANDINGS_ENABLED;
diff --git a/float/float/conf/confparser.h b/float/float/conf/confparser.h
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 
 // Constants
-#define FLOAT_CONFIG_SIGNATURE		1789314336
+#define FLOAT_CONFIG_SIGNATURE		3567063650
 
 // Functions
 int32_t confparser_serialize_float_config(uint8_t *buffer, const float_config *conf);
diff --git a/float/float/conf/confxml.c b/float/float/conf/confxml.c
diff --git a/float/float/conf/confxml.h b/float/float/conf/confxml.h
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 
 // Constants
-#define DATA_FLOAT_CONFIG__SIZE		14914
+#define DATA_FLOAT_CONFIG__SIZE		14694
 
 // Variables
 extern uint8_t data_float_config_[];
diff --git a/float/float/conf/datatypes.h b/float/float/conf/datatypes.h
@@ -79,7 +79,6 @@ typedef struct {
 	float startup_roll_tolerance;
 	float startup_speed;
 	float startup_click_current;
-	bool startup_softstart_enabled;
 	bool startup_simplestart_enabled;
 	bool startup_pushstart_enabled;
 	bool startup_dirtylandings_enabled;
diff --git a/float/float/conf/settings.xml b/float/float/conf/settings.xml
@@ -1046,20 +1046,6 @@ p, li { white-space: pre-wrap; }
             <suffix> A</suffix>
             <vTx>1</vTx>
         </startup_click_current>
-        <startup_softstart_enabled>
-            <longName>Enable Soft Start</longName>
-            <type>5</type>
-            <transmittable>1</transmittable>
-            <description>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Roboto'; ; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Smoothens startup by ramping in Rate P and Booster, rather than enabling their full effect immediately. This eliminates the initial jerk and momentary nose high riding that could be triggered when mounting quickly. &lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If you would like some response/feedback for when the board engages while still having a smooth startup, consider using Startup Click Current in addition to Soft Start.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</description>
-            <cDefine>APPCONF_FLOAT_STARTUP_SOFTSTART_ENABLED</cDefine>
-            <valInt>1</valInt>
-        </startup_softstart_enabled>
         <startup_simplestart_enabled>
             <longName>Enable Simple Start</longName>
             <type>5</type>
@@ -2051,7 +2037,6 @@ p, li { white-space: pre-wrap; }
         <ser>startup_roll_tolerance</ser>
         <ser>startup_speed</ser>
         <ser>startup_click_current</ser>
-        <ser>startup_softstart_enabled</ser>
         <ser>startup_simplestart_enabled</ser>
         <ser>startup_pushstart_enabled</ser>
         <ser>startup_dirtylandings_enabled</ser>
@@ -2180,7 +2165,6 @@ p, li { white-space: pre-wrap; }
                     <param>startup_speed</param>
                     <param>::sep::Start Options</param>
                     <param>startup_click_current</param>
-                    <param>startup_softstart_enabled</param>
                     <param>startup_simplestart_enabled</param>
                     <param>startup_pushstart_enabled</param>
                     <param>startup_dirtylandings_enabled</param>
diff --git a/float/float/float.c b/float/float/float.c
@@ -1811,7 +1811,7 @@ static void float_thd(void *arg) {
 				d->applied_booster_current = 0.01 * booster_current + 0.99 * d->applied_booster_current;
 				pid_mod += d->applied_booster_current;
 
-				if (d->float_conf.startup_softstart_enabled && (d->softstart_pid_limit < d->mc_current_max)) {
+				if (d->softstart_pid_limit < d->mc_current_max) {
 					pid_mod = fminf(fabs(pid_mod), d->softstart_pid_limit) * SIGN(pid_mod);
 					d->softstart_pid_limit += d->softstart_ramp_step_size;
 				}

Original file line number	Diff line number	Diff line change
`@@ -1811,7 +1811,7 @@ static void float_thd(void *arg) {`
`1811`	`1811`	`d->applied_booster_current = 0.01 * booster_current + 0.99 * d->applied_booster_current;`
`1812`	`1812`	`pid_mod += d->applied_booster_current;`
`1813`	`1813`
`1814`		`- if (d->float_conf.startup_softstart_enabled && (d->softstart_pid_limit < d->mc_current_max)) {`
	`1814`	`+ if (d->softstart_pid_limit < d->mc_current_max) {`
`1815`	`1815`	`pid_mod = fminf(fabs(pid_mod), d->softstart_pid_limit) * SIGN(pid_mod);`
`1816`	`1816`	`d->softstart_pid_limit += d->softstart_ramp_step_size;`
`1817`	`1817`	`}`