From 0543378d26aa76eda4c434d5b96ff6639a96d0bb Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Sun, 15 Nov 2020 13:49:19 +0000 Subject: [PATCH 1/7] Update messages.json --- _locales/en/messages.json | 78 +++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index dfb84000..dde85dfc 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -764,73 +764,79 @@ "configurationLaunchVelocity": { "message": "Threshold Velocity" }, - "configurationLaunchAccel": { - "message": "Threshold Acceleration" - }, - "configurationLaunchMaxAngle": { - "message": "Max Tilt Angle" - }, - "configurationLaunchDetectTime": { - "message": "Detect Time" - }, - "configurationLaunchThr": { - "message": "Throttle" - }, - "configurationLaunchIdleThr": { - "message": "Idle Throttle" - }, - "configurationLaunchMotorDelay": { - "message": "Motor Delay" - }, - "configurationLaunchSpinupTime": { - "message": "Motor Spinup Time" - }, - "configurationLaunchMinTime": { - "message": "Min Time" - }, - "configurationLaunchTimeout": { - "message": "Time Out" - }, - "configurationLaunchMaxAltitude": { - "message": "Max Altitude" - }, - "configurationLaunchClimbAngle": { - "message": "Climb Angle" - }, "configurationLaunchVelocityHelp": { "message": "Forward velocity threshold for swing-launch detection [cm/s]" }, + "configurationLaunchAccel": { + "message": "Threshold Acceleration" + }, "configurationLaunchAccelHelp": { "message": "Forward acceleration threshold for bungee launch of throw launch [cm/s/s], 1G = 981 cm/s/s" }, + "configurationLaunchMaxAngle": { + "message": "Max Throw Angle" + }, "configurationLaunchMaxAngleHelp": { - "message": "Max tilt angle (pitch/roll combined) to consider launch successful. Set to 180 to disable completely [deg]" + "message": "Max throw angle (pitch/roll combined) to consider launch successful. Set to 180 to disable completely [deg]" + }, + "configurationLaunchDetectTime": { + "message": "Detect Time" }, "configurationLaunchDetectTimeHelp": { "message": "Time for which thresholds have to breached to consider launch happened [ms]" }, + "configurationLaunchThr": { + "message": "Launch Throttle" + }, "configurationLaunchThrHelp": { "message": "Launch throttle - throttle to be set during launch sequence (pwm units)" }, + "configurationLaunchIdleThr": { + "message": "Idle Throttle" + }, "configurationLaunchIdleThrHelp": { - "message": "Launch idle throttle - throttle to be set before launch sequence is initiated. If set below minimum throttle it will force motor stop or at idle throttle (depending if the MOTOR_STOP is enabled). If set above minimum throttle it will force throttle to this value (if MOTOR_STOP is enabled it will be handled according to throttle stick position)" + "message": "Idle throttle - throttle to be set before launch sequence is initiated. If set below minimum throttle it will force motor stop or at idle throttle (depending if the MOTOR_STOP is enabled). If set above minimum throttle it will force throttle to this value (if MOTOR_STOP is enabled it will be handled according to throttle stick position)" + }, + "configurationLaunchMotorDelay": { + "message": "Motor Delay" }, "configurationLaunchMotorDelayHelp": { "message": "Delay between detected launch and launch sequence start and throttling up (ms)" }, + "configurationLaunchSpinupTime": { + "message": "Motor Spinup Time" + }, "configurationLaunchSpinupTimeHelp": { "message": "Time to bring power from minimum throttle to nav_fw_launch_thr - to avoid big stress on ESC and large torque from propeller" }, + "configurationLaunchMinTime": { + "message": "Minimum Launch Time" + }, "configurationLaunchMinTimeHelp": { "message": "Allow launch mode to execute at least this time (ms) and ignore stick movements [0-60000]." }, + "configurationLaunchTimeout": { + "message": "Launch Timeout" + }, "configurationLaunchTimeoutHelp": { "message": "Maximum time for launch sequence to be executed. After this time LAUNCH mode will be turned off and regular flight mode will take over (ms)" }, + "configurationLaunchEndTime": { + "message": "End Transition Time" + }, + "configurationLaunchEndTimeHelp": { + "message": "Smooth transition time at the end of the launch (ms). Default: 2000 [0-5000]. This is added to the Launch Timeout." + }, + "configurationLaunchMaxAltitude": { + "message": "Maximum Altitude" + }, "configurationLaunchMaxAltitudeHelp": { "message": "Altitude at which LAUNCH mode will be turned off and regular flight mode will take over. [cm]" }, - "configurationLaunchClimbAngleHelp": { + "configurationLaunchClimbAngle": { + "message": "Climb Angle" + }, + "configurationLaunchClimbAngleHelp": { "message": "Climb angle for launch sequence (degrees), is also restrained by global max_angle_inclination_pit" }, "configuration3d": { From 5075ed390291bd163f06c1c642ec8347f3ed095a Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Sun, 15 Nov 2020 13:51:05 +0000 Subject: [PATCH 2/7] Update advanced_tuning.html --- tabs/advanced_tuning.html | 69 +++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html index 24ea7619..99a3f32f 100644 --- a/tabs/advanced_tuning.html +++ b/tabs/advanced_tuning.html @@ -163,6 +163,20 @@
+
+ + +
+
+
+ + +
+
-
+
-
- - -
-
-
-
- - -
-
-
- - -
@@ -212,19 +205,33 @@
+
+ + +
+
+
+
+ + +
- -
@@ -241,16 +248,14 @@
- -
-
-
From 207dda13abf6f5c350953305f5ba3c146af71e2d Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Sun, 15 Nov 2020 14:03:26 +0000 Subject: [PATCH 3/7] Update advanced_tuning.html Spotted that idle throttle and max throw angle should have been switched. --- tabs/advanced_tuning.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tabs/advanced_tuning.html b/tabs/advanced_tuning.html index 99a3f32f..58215a58 100644 --- a/tabs/advanced_tuning.html +++ b/tabs/advanced_tuning.html @@ -163,13 +163,6 @@
-
- - -
-
+
+ + +
+