Merge pull request #9 from iNavFlight/master

Merge with master
pull/1145/head
Darren Lines 4 years ago committed by GitHub
commit c63c03dbb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -765,74 +765,80 @@
"message": "Fixed Wing Auto Launch Settings" "message": "Fixed Wing Auto Launch Settings"
}, },
"configurationLaunchVelocity": { "configurationLaunchVelocity": {
"message": "Threshold Velocity" "message": "Threshold Velocity [cm/s]"
},
"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": { "configurationLaunchVelocityHelp": {
"message": "Forward velocity threshold for swing-launch detection [cm/s]" "message": "Forward velocity threshold for swing-launch detection [cm/s]"
}, },
"configurationLaunchAccel": {
"message": "Threshold Acceleration [cm/s/s]"
},
"configurationLaunchAccelHelp": { "configurationLaunchAccelHelp": {
"message": "Forward acceleration threshold for bungee launch of throw launch [cm/s/s], 1G = 981 cm/s/s" "message": "Forward acceleration threshold for bungee launch of throw launch [cm/s/s], 1G = 981 cm/s/s"
}, },
"configurationLaunchMaxAngle": {
"message": "Max Throw Angle [°]"
},
"configurationLaunchMaxAngleHelp": { "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 [ms]"
}, },
"configurationLaunchDetectTimeHelp": { "configurationLaunchDetectTimeHelp": {
"message": "Time for which thresholds have to breached to consider launch happened [ms]" "message": "Time for which thresholds have to breached to consider launch happened [ms]"
}, },
"configurationLaunchThr": {
"message": "Launch Throttle [uS]"
},
"configurationLaunchThrHelp": { "configurationLaunchThrHelp": {
"message": "Launch throttle - throttle to be set during launch sequence (pwm units)" "message": "Launch throttle - throttle to be set during launch sequence (pwm units)"
}, },
"configurationLaunchIdleThr": {
"message": "Idle Throttle [uS]"
},
"configurationLaunchIdleThrHelp": { "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 [ms]"
}, },
"configurationLaunchMotorDelayHelp": { "configurationLaunchMotorDelayHelp": {
"message": "Delay between detected launch and launch sequence start and throttling up (ms)" "message": "Delay between detected launch and launch sequence start and throttling up (ms)"
}, },
"configurationLaunchSpinupTime": {
"message": "Motor Spinup Time [ms]"
},
"configurationLaunchSpinupTimeHelp": { "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" "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 [ms]"
},
"configurationLaunchMinTimeHelp": { "configurationLaunchMinTimeHelp": {
"message": "Allow launch mode to execute at least this time (ms) and ignore stick movements [0-60000]." "message": "Allow launch mode to execute at least this time (ms) and ignore stick movements [0-60000]."
}, },
"configurationLaunchTimeout": {
"message": "Launch Timeout [ms]"
},
"configurationLaunchTimeoutHelp": { "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)" "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 [ms]"
},
"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 [cm]"
},
"configurationLaunchMaxAltitudeHelp": { "configurationLaunchMaxAltitudeHelp": {
"message": "Altitude at which LAUNCH mode will be turned off and regular flight mode will take over. [cm]" "message": "Altitude at which LAUNCH mode will be turned off and regular flight mode will take over. [cm]"
}, },
"configurationLaunchClimbAngle": {
"message": "Climb Angle [°]"
},
"configurationLaunchClimbAngleHelp": { "configurationLaunchClimbAngleHelp": {
"message": "Climb angle for launch sequence (degrees), is also restrained by global max_angle_inclination_pit" "message": "Climb angle for launch sequence (degrees), is also restrained by global max_angle_inclination_pit"
}, },

@ -2,8 +2,8 @@
var CONFIGURATOR = { var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/ // all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '2.5.0', 'minfirmwareVersionAccepted': '2.6.0',
'maxFirmwareVersionAccepted': '2.7.0', // Condition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy 'maxFirmwareVersionAccepted': '2.8.0', // Condition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'connectionValid': false, 'connectionValid': false,
'connectionValidCliOnly': false, 'connectionValidCliOnly': false,
'cliActive': false, 'cliActive': false,

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"minimum_chrome_version": "38", "minimum_chrome_version": "38",
"version": "2.6.0", "version": "2.7.0",
"author": "Several", "author": "Several",
"name": "INAV - Configurator", "name": "INAV - Configurator",
"short_name": "INAV", "short_name": "INAV",

@ -1,7 +1,7 @@
{ {
"name": "inav-configurator", "name": "inav-configurator",
"description": "INAV Configurator", "description": "INAV Configurator",
"version": "2.6.0", "version": "2.7.0",
"main": "main.html", "main": "main.html",
"default_locale": "en", "default_locale": "en",
"scripts": { "scripts": {

@ -163,6 +163,20 @@
<div class="spacer_box_title" data-i18n="configurationLaunch"></div> <div class="spacer_box_title" data-i18n="configurationLaunch"></div>
</div> </div>
<div class="spacer_box settings"> <div class="spacer_box settings">
<div class="number">
<input type="number" id="launchIdleThr" data-setting="nav_fw_launch_idle_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
<label for="launchIdleThr">
<span data-i18n="configurationLaunchIdleThr"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchIdleThrHelp"></div>
</div>
<div class="number">
<input type="number" id="launchMaxAngle" data-setting="nav_fw_launch_max_angle" data-setting-multiplier="1" step="1" min="5" max="180" />
<label for="launchMaxAngle">
<span data-i18n="configurationLaunchMaxAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMaxAngleHelp"></div>
</div>
<div class="number"> <div class="number">
<input type="number" id="launchVelocity" data-setting="nav_fw_launch_velocity" data-setting-multiplier="1" step="1" min="1000" max="2000" /> <input type="number" id="launchVelocity" data-setting="nav_fw_launch_velocity" data-setting-multiplier="1" step="1" min="1000" max="2000" />
<label for="launchVelocity"> <label for="launchVelocity">
@ -177,33 +191,12 @@
</label> </label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchAccelHelp"></div> <div class="helpicon cf_tip" data-i18n_title="configurationLaunchAccelHelp"></div>
</div> </div>
<div class="number">
<input type="number" id="launchMaxAngle" data-setting="nav_fw_launch_max_angle" data-setting-multiplier="1" step="1" min="5" max="180" />
<label for="launchMaxAngle">
<span data-i18n="configurationLaunchMaxAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMaxAngleHelp"></div>
</div>
<div class="number"> <div class="number">
<input type="number" id="launchDetectTime" data-setting="nav_fw_launch_detect_time" data-setting-multiplier="1" step="1" min="10" max="1000" /> <input type="number" id="launchDetectTime" data-setting="nav_fw_launch_detect_time" data-setting-multiplier="1" step="1" min="10" max="1000" />
<label for="launchDetectTime"> <label for="launchDetectTime">
<span data-i18n="configurationLaunchDetectTime"></span> <span data-i18n="configurationLaunchDetectTime"></span>
</label> </label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchDetectTimeHelp"></div> <div class="helpicon cf_tip" data-i18n_title="configurationLaunchDetectTimeHelp"></div>
</div>
<div class="number">
<input type="number" id="launchThr" data-setting="nav_fw_launch_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
<label for="launchThr">
<span data-i18n="configurationLaunchThr"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchThrHelp"></div>
</div>
<div class="number">
<input type="number" id="launchIdleThr" data-setting="nav_fw_launch_idle_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
<label for="launchIdleThr">
<span data-i18n="configurationLaunchIdleThr"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchIdleThrHelp"></div>
</div> </div>
<div class="number"> <div class="number">
<input type="number" id="launchMotorDelay" data-setting="nav_fw_launch_motor_delay" data-setting-multiplier="1" step="1" min="0" max="5000" /> <input type="number" id="launchMotorDelay" data-setting="nav_fw_launch_motor_delay" data-setting-multiplier="1" step="1" min="0" max="5000" />
@ -212,6 +205,13 @@
</label> </label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMotorDelayHelp"></div> <div class="helpicon cf_tip" data-i18n_title="configurationLaunchMotorDelayHelp"></div>
</div> </div>
<div class="number">
<input type="number" id="launchMinTime" data-setting="nav_fw_launch_min_time" data-setting-multiplier="1" step="1" min="0" max="60000" />
<label for="launchMinTime">
<span data-i18n="configurationLaunchMinTime"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMinTimeHelp"></div>
</div>
<div class="number"> <div class="number">
<input type="number" id="launchSpinupTime" data-setting="nav_fw_launch_spinup_time" data-setting-multiplier="1" step="1" min="0" max="1000" /> <input type="number" id="launchSpinupTime" data-setting="nav_fw_launch_spinup_time" data-setting-multiplier="1" step="1" min="0" max="1000" />
<label for="launchSpinupTime"> <label for="launchSpinupTime">
@ -220,11 +220,18 @@
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchSpinupTimeHelp"></div> <div class="helpicon cf_tip" data-i18n_title="configurationLaunchSpinupTimeHelp"></div>
</div> </div>
<div class="number"> <div class="number">
<input type="number" id="launchMinTime" data-setting="nav_fw_launch_min_time" data-setting-multiplier="1" step="1" min="0" max="60000" /> <input type="number" id="launchThr" data-setting="nav_fw_launch_thr" data-setting-multiplier="1" step="1" min="1000" max="2000" />
<label for="launchMinTime"> <label for="launchThr">
<span data-i18n="configurationLaunchMinTime"></span> <span data-i18n="configurationLaunchThr"></span>
</label> </label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMinTimeHelp"></div> <div class="helpicon cf_tip" data-i18n_title="configurationLaunchThrHelp"></div>
</div>
<div class="number">
<input type="number" id="launchClimbAngle" data-setting="nav_fw_launch_climb_angle" data-setting-multiplier="1" step="1" min="0" max="60000" />
<label for="launchClimbAngle">
<span data-i18n="configurationLaunchClimbAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchClimbAngleHelp"></div>
</div> </div>
<div class="number"> <div class="number">
<input type="number" id="launchTimeout" data-setting="nav_fw_launch_timeout" data-setting-multiplier="1" step="1" min="0" max="60000" /> <input type="number" id="launchTimeout" data-setting="nav_fw_launch_timeout" data-setting-multiplier="1" step="1" min="0" max="60000" />
@ -241,16 +248,14 @@
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMaxAltitudeHelp"></div> <div class="helpicon cf_tip" data-i18n_title="configurationLaunchMaxAltitudeHelp"></div>
</div> </div>
<div class="number"> <div class="number">
<input type="number" id="launchClimbAngle" data-setting="nav_fw_launch_climb_angle" data-setting-multiplier="1" step="1" min="0" max="60000" /> <input type="number" id="launchEndTime" data-setting="nav_fw_launch_end_time" data-setting-multiplier="1" step="1" min="0" max="5000" />
<label for="launchClimbAngle"> <label for="launchEndTime">
<span data-i18n="configurationLaunchClimbAngle"></span> <span data-i18n="configurationLaunchEndTime"></span>
</label> </label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchClimbAngleHelp"></div> <div class="helpicon cf_tip" data-i18n_title="configurationLaunchEndTimeHelp"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="rightWrapper"> <div class="rightWrapper">

@ -772,6 +772,11 @@ OSD.constants = {
id: 106, id: 106,
min_version: '2.3.0', min_version: '2.3.0',
preview: FONT.symbol(SYM.RPM) + '983', preview: FONT.symbol(SYM.RPM) + '983',
},
{
name: 'VERSION',
id: 119,
preview: 'INAV 2.7.0'
} }
] ]
}, },

Loading…
Cancel
Save