Commit ccc5b39b authored by ctrenkov's avatar ctrenkov
Browse files

Merge branch 'master' into drone_builder

parents 9c05f4ee bf7972c5
......@@ -717,13 +717,13 @@
"message": "Number of cells (0 = auto)"
},
"configurationBatteryCellsHelp": {
"message": "Set this to the number of cells of your battery to disable automatic cell count detection or to make the automatic switching of battery profiles possible"
"message": "Set this to the number of cells of your battery to disable automatic cell count detection or to make the automatic switching of battery profiles possible. 7S, 9S and 11S batteries cannot be autodetected."
},
"configurationBatteryCellDetectVoltage": {
"message": "Maximum cell voltage for cell count detection"
},
"configurationBatteryCellDetectVoltageHelp": {
"message": "Maximum cell voltage used for cell count autodetection. Should be higher than maximum cell voltage to take into account possible drift in measured voltage and keep cell count detection accurate"
"message": "Maximum cell voltage used for cell count autodetection. Should be higher than maximum cell voltage to take into account possible drift in measured voltage and keep cell count detection accurate."
},
"configurationBatteryMinimum": {
"message": "Minimum Cell Voltage"
......@@ -1046,6 +1046,9 @@
"portsFunction_DJI_FPV": {
"message": "DJI FPV VTX"
},
"portsFunction_IMU2": {
"message": "Secondary IMU"
},
"pidTuningName": {
"message": "Name"
},
......@@ -1132,7 +1135,7 @@
},
"receiverHelp": {
"message": "Please read receiver chapter of the documentation. Configure serial port (if required), receiver mode (serial/ppm/pwm), provider (for serial receivers), bind receiver, set channel map, configure channel endpoints/range on TX so that all channels go from ~1000 to ~2000. Set midpoint (default 1500), trim channels to 1500, configure stick deadband, verify behaviour when TX is off or out of range.<br /><span style=\"color: red\">IMPORTANT:</span> Before flying read failsafe chapter of documentation and configure failsafe."
"message": "Please read receiver chapter of the documentation. Configure serial port (if required), receiver mode (serial/ppm/pwm), provider (for serial receivers), bind receiver, set channel map, configure channel endpoints/range on TX so that all channels go from ~1000 to ~2000. Set midpoint (default 1500), trim channels to 1500, configure stick deadband, verify behaviour when TX is off or out of range. Make sure that the channel values all increase when you push the sticks up and to the right. If not, reverse the channel in the TX. Do not apply any other mixing in the TX.<br /><span style=\"color: red\">IMPORTANT:</span> Before flying read failsafe chapter of documentation and configure failsafe."
},
"receiverThrottleMid": {
"message": "Throttle MID"
......@@ -1287,138 +1290,150 @@
"message": "Pitch & Roll I Adjustment"
},
"adjustmentsFunction8": {
"message": "Pitch & Roll D/FF Adjustment"
"message": "Pitch & Roll D"
},
"adjustmentsFunction9": {
"message": "Yaw P Adjustment"
"message": "Pitch & Roll CD/FF Adjustment"
},
"adjustmentsFunction10": {
"message": "Yaw I Adjustment"
"message": "Pitch P Adjustment"
},
"adjustmentsFunction11": {
"message": "Yaw D/FF Adjustment"
"message": "Pitch I Adjustment"
},
"adjustmentsFunction12": {
"message": "Rate Profile Selection"
"message": "Pitch D Adjustment"
},
"adjustmentsFunction13": {
"message": "Pitch Rate"
"message": "Pitch CD/FF Adjustment"
},
"adjustmentsFunction14": {
"message": "Roll Rate"
"message": "Roll P Adjustment"
},
"adjustmentsFunction15": {
"message": "Pitch P Adjustment"
"message": "Roll I Adjustment"
},
"adjustmentsFunction16": {
"message": "Pitch I Adjustment"
"message": "Roll D Adjustment"
},
"adjustmentsFunction17": {
"message": "Pitch D/FF Adjustment"
"message": "Roll CD/FF Adjustment"
},
"adjustmentsFunction18": {
"message": "Roll P Adjustment"
"message": "Yaw P Adjustment"
},
"adjustmentsFunction19": {
"message": "Roll I Adjustment"
"message": "Yaw I Adjustment"
},
"adjustmentsFunction20": {
"message": "Roll D/FF Adjustment"
"message": "Yaw D Adjustment"
},
"adjustmentsFunction21": {
"message": "RC Yaw Expo Adjustment"
"message": "Yaw CD/FF Adjustment"
},
"adjustmentsFunction22": {
"message": "Manual RC Expo Adjustment"
"message": "Rate Profile Selection"
},
"adjustmentsFunction23": {
"message": "Manual RC Yaw Expo Adjustment"
"message": "Pitch Rate"
},
"adjustmentsFunction24": {
"message": "Manual Pitch & Roll Rate Adjustment"
"message": "Roll Rate"
},
"adjustmentsFunction25": {
"message": "Manual Roll Rate Adjustment"
"message": "RC Yaw Expo Adjustment"
},
"adjustmentsFunction26": {
"message": "Manual Pitch Rate Adjustment"
"message": "Manual RC Expo Adjustment"
},
"adjustmentsFunction27": {
"message": "Manual Yaw Rate Adjustment"
"message": "Manual RC Yaw Expo Adjustment"
},
"adjustmentsFunction28": {
"message": "Navigation FW Cruise Throttle Adjustment"
"message": "Manual Pitch & Roll Rate Adjustment"
},
"adjustmentsFunction29": {
"message": "Navigation FW Pitch To Throttle Adjustment"
"message": "Manual Roll Rate Adjustment"
},
"adjustmentsFunction30": {
"message": "Board Roll Alignment Adjustment"
"message": "Manual Pitch Rate Adjustment"
},
"adjustmentsFunction31": {
"message": "Board Pitch Alignment Adjustment"
"message": "Manual Yaw Rate Adjustment"
},
"adjustmentsFunction32": {
"message": "Level P Adjustment"
"message": "Navigation FW Cruise Throttle Adjustment"
},
"adjustmentsFunction33": {
"message": "Level I Adjustment"
"message": "Navigation FW Pitch To Throttle Adjustment"
},
"adjustmentsFunction34": {
"message": "Level D Adjustment"
"message": "Board Roll Alignment Adjustment"
},
"adjustmentsFunction35": {
"message": "Pos XY P Adjustment"
"message": "Board Pitch Alignment Adjustment"
},
"adjustmentsFunction36": {
"message": "Pos XY I Adjustment"
"message": "Level P Adjustment"
},
"adjustmentsFunction37": {
"message": "Pos XY D Adjustment"
"message": "Level I Adjustment"
},
"adjustmentsFunction38": {
"message": "Pos Z P Adjustment"
"message": "Level D Adjustment"
},
"adjustmentsFunction39": {
"message": "Pos Z I Adjustment"
"message": "Pos XY P Adjustment"
},
"adjustmentsFunction40": {
"message": "Pos Z D Adjustment"
"message": "Pos XY I Adjustment"
},
"adjustmentsFunction41": {
"message": "Heading P Adjustment"
"message": "Pos XY D Adjustment"
},
"adjustmentsFunction42": {
"message": "Vel XY P Adjustment"
"message": "Pos Z P Adjustment"
},
"adjustmentsFunction43": {
"message": "Vel XY I Adjustment"
"message": "Pos Z I Adjustment"
},
"adjustmentsFunction44": {
"message": "Vel XY D Adjustment"
"message": "Pos Z D Adjustment"
},
"adjustmentsFunction45": {
"message": "Vel Z P Adjustment"
"message": "Heading P Adjustment"
},
"adjustmentsFunction46": {
"message": "Vel Z I Adjustment"
"message": "Vel XY P Adjustment"
},
"adjustmentsFunction47": {
"message": "Vel Z D Adjustment"
"message": "Vel XY I Adjustment"
},
"adjustmentsFunction48": {
"message": "FW min thr down pitch angle Adjustment"
"message": "Vel XY D Adjustment"
},
"adjustmentsFunction49": {
"message": "VTX power level Adjustment"
"message": "Vel Z P Adjustment"
},
"adjustmentsFunction50": {
"message": "Thrust PID Attenuation (TPA) Adjustment"
"message": "Vel Z I Adjustment"
},
"adjustmentsFunction51": {
"message": "TPA Breakpoint Adjustment"
"message": "Vel Z D Adjustment"
},
"adjustmentsFunction52": {
"message": "FW min thr down pitch angle Adjustment"
},
"adjustmentsFunction53": {
"message": "VTX power level Adjustment"
},
"adjustmentsFunction54": {
"message": "Thrust PID Attenuation (TPA) Adjustment"
},
"adjustmentsFunction55": {
"message": "TPA Breakpoint Adjustment"
},
"adjustmentsFunction56": {
"message": "Control Smoothness Adjustment"
},
"adjustmentsSave": {
......@@ -2354,13 +2369,16 @@
"message": "Programming"
},
"tabAdvancedTuning": {
"message": "Advanced tuning"
"message": "Advanced Tuning"
},
"advancedTuningSave": {
"message": "Save and Reboot"
},
"tabAdvancedTuningTitle": {
"message": "Advanced tuning"
"message": "Advanced Tuning"
},
"tabAdvancedTuningGenericTitle": {
"message": "Generic settings"
},
"presetApplyHead": {
"message": "Applies following settings:"
......@@ -2431,6 +2449,12 @@
"posholdHoverMidThrottle": {
"message": "Use mid. throttle for ALTHOLD"
},
"mcWpSlowdown": {
"message": "Slow down when approaching waypoint"
},
"mcWpSlowdownHelp": {
"message": "When enabled, NAV engine will slow down when switching to the next waypoint. This prioritizes turning over forward movement. When disabled, NAV engine will continue to the next waypoint and turn as it goes."
},
"positionEstimatorConfiguration": {
"message": "Position Estimator"
},
......@@ -2450,7 +2474,7 @@
"message": "Horizontal speed GPS weight"
},
"positionEstimatorConfigurationDisclaimer": {
"message": "This value should be changed very carefully. In most cases there is not need to change that. For advanced users only!"
"message": "These values should be changed very carefully. In most cases there is no need to change them. For advanced users only!"
},
"gps_min_sats": {
"message": "Min. GPS satellites for a valid fix"
......@@ -2458,8 +2482,8 @@
"w_z_baro_p_help": {
"message": "When this value is set to <strong>0</strong>, barometer is not used for altitude computation"
},
"w_z_gos_p_help": {
"message": "When this value is set to <strong>0</strong>, GPS is not used for altitude computation"
"w_z_gps_p_help": {
"message": "This setting is only used when no barometer is installed and <strong>inav_use_gps_no_baro</strong> is configured."
},
"wirelessModeSwitch": {
"message": "Wireless mode"
......@@ -2476,9 +2500,18 @@
"rthClimbFirst": {
"message": "Climb before RTH"
},
"rthClimbFirstHelp": {
"message": "If set to ON or ON_FW_SPIRAL, aircraft will climb to nav_rth_altitude first before turning to head home. If set to OFF, aircraft will turn and head home immediately climbing on the way. For a fixed wing, ON will use a linear climb, ON_FW_SPIRAL will use a loiter turning climb with climb rate set by nav_auto_climb_rate and turn rate set by nav_fw_loiter_radius (ON_FW_SPIRAL is a fixed wing setting and behaves the same as ON for a multirotor)."
},
"rthClimbIgnoreEmergency": {
"message": "Climb regardless of position sensors health"
},
"rthAltControlOverride": {
"message": "Override RTH altitude and climb setting with roll/pitch stick"
},
"rthAltControlOverrideHELP": {
"message": "When enabled, the climb on RTH can be canceled by holding full pitch down for >1 second so aircraft will fly home at the current altitude. On fixed wing aircraft, the 'Climb before RTH' setting can be overriden by holding full roll left or right for >1 second so that the plane will turn towards home immediately."
},
"rthTailFirst": {
"message": "Tail first"
},
......@@ -2540,19 +2573,31 @@
"message": "Max. throttle"
},
"maxBankAngle": {
"message": "Max. bank angle [degrees]"
"message": "Max. navigation bank angle [degrees]"
},
"maxBankAngleHelp": {
"message": "Maximum banking angle in navigation modes. Constrained by maximum ROLL angle in PID tuning tab."
},
"maxClimbAngle": {
"message": "Max. climb angle [degrees]"
"message": "Max. navigation climb angle [degrees]"
},
"maxClimbAngleHelp": {
"message": "Maximum climb angle in navigation modes. Constrained by maximum PITCH angle in PID tuning tab."
},
"navManualClimbRate": {
"message": "Max. Alt-hold climb rate [cm/s]"
},
"navManualClimbRateHelp": {
"message": "Maximum climb/descent rate firmware is allowed when processing pilot input for ALTHOLD control mode [cm/s]"
},
"navAutoClimbRate": {
"message": "Max. navigation climb rate [cm/s]"
},
"navAutoClimbRateHelp": {
"message": "Maximum climb/descent rate that UAV is allowed to reach during navigation modes. [cm/s]"
},
"maxDiveAngle": {
"message": "Max. dive angle [degrees]"
"message": "Max. navigation dive angle [degrees]"
},
"maxDiveAngleHelp": {
"message": "Maximum dive angle in navigation modes. Constrained by maximum PITCH angle in PID tuning tab."
......@@ -2590,6 +2635,36 @@
"controlSmoothnessHelp": {
"message": "How smoothly the autopilot controls the airplane to correct the navigation error [0-9]."
},
"powerConfiguration": {
"message": "Battery Estimation Settings"
},
"idlePower": {
"message": "Idle power [cW]"
},
"idlePowerHelp": {
"message": "Power draw at zero throttle used for remaining flight time/distance estimation in 0.01W unit"
},
"cruisePower": {
"message": "Cruise power [cW]"
},
"cruisePowerHelp": {
"message": "Power draw at cruise throttle used for remaining flight time/distance estimation in 0.01W unit"
},
"cruiseSpeed": {
"message": "Cruise speed [cm/s]"
},
"cruiseSpeedHelp": {
"message": "Speed for the plane/wing at cruise throttle used for remaining flight time/distance estimation in cm/s"
},
"rthEnergyMargin": {
"message": "RTH energy margin [%]"
},
"rthEnergyMarginHelp": {
"message": "Energy margin wanted after getting home (percent of battery energy capacity). Use for the remaining flight time/distance calculation."
},
"generalNavigationSettings": {
"message": "General Navigation Settings"
},
"waypointConfiguration": {
"message": "Waypoint Navigation Settings"
},
......@@ -3073,6 +3148,9 @@
"osdSettingMainVoltageDecimals": {
"message": "Main voltage decimals"
},
"osdElement_OSD_RANGEFINDER": {
"message": "Rangefinder distance"
},
"osdSettingPLUS_CODE_DIGITS_HELP": {
"message": "Precision at the equator: 10=13.9x13.9m; 11=2.8x3.5m; 12=56x87cm; 13=11x22cm."
},
......@@ -3493,6 +3571,18 @@
"dTermMechanics": {
"message": "D-term mechanics"
},
"tpaMechanics": {
"message": "Thrust PID attenuation"
},
"fw_level_pitch_trim": {
"message": "Level Trim [deg]"
},
"fw_level_pitch_trim_help": {
"message": "Pitch trim for self-leveling flight modes. In degrees. +5 means airplane nose should be raised 5 deg from level"
},
"fwLevelTrimMechanics": {
"message": "Fixed Wing Level Trim"
},
"d_boost_factor": {
"message": "D-Boost Factor"
},
......@@ -3538,6 +3628,12 @@
"antigravityCutoff": {
"message": "Antigravity Cutoff Frequency"
},
"itermBankAngleFreeze": {
"message": "Yaw Iterm freeze bank angle"
},
"itermBankAngleFreezeHelp": {
"message": "Freeze yaw Iterm when plane is banked more than this many degrees. This helps to stop the rudder from counteracting turn. 0 disables this feature. Applies only to fixed wing aircraft."
},
"ouptputsConfiguration": {
"message": "Configuration"
},
......@@ -3612,5 +3708,35 @@
},
"configurationCurrentMeterType": {
"message": "Current Meter Type"
},
"rollPitchAdjustmentsMoved": {
"message": "Roll & Pitch board orientation is available only in the CLI. Do not use it to trim the airplane for the level flight! Use Fixed Wing Level Trim on the PID tuning tab under Mechanics instead (<strong>fw_level_pitch_trim</strong>)."
},
"pidId": {
"message": "#"
},
"pidEnabled": {
"message": "Enabled"
},
"pidSetpoint": {
"message": "Setpoint"
},
"pidMeasurement": {
"message": "Measurement"
},
"pidP": {
"message": "P-gain"
},
"pidI": {
"message": "I-gain"
},
"pidD": {
"message": "D-gain"
},
"pidFF": {
"message": "FF-gain"
},
"pidOutput": {
"message": "Output"
}
}
......@@ -108,6 +108,7 @@ sources.js = [
'./js/globalVariablesStatus.js',
'./js/programmingPid.js',
'./js/programmingPidCollection.js',
'./js/programmingPidStatus.js',
'./js/vtx.js',
'./main.js',
'./js/tabs.js',
......
......@@ -2,8 +2,8 @@
var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '2.6.0',
'maxFirmwareVersionAccepted': '2.8.0', // Condition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'minfirmwareVersionAccepted': '3.0.0',
'maxFirmwareVersionAccepted': '3.1.0', // Condition is < (lt) so we accept all in 3.0 branch
'connectionValid': false,
'connectionValidCliOnly': false,
'cliActive': false,
......
......@@ -184,11 +184,19 @@ helper.defaultsDialog = (function() {
]
},
{
"title": 'Airplane',
"title": 'Airplane with a Tail',
"notRecommended": false,
"id": 3,
"reboot": true,
"settings": [
{
key: "platform_type",
value: "AIRPLANE"
},
{
key: "applied_defaults",
value: 3
},
{
key: "gyro_hardware_lpf",
value: "256HZ"
......@@ -197,6 +205,10 @@ helper.defaultsDialog = (function() {
key: "gyro_lpf_hz",
value: 25
},
{
key: "dterm_lpf_hz",
value: 40
},
{
key: "gyro_lpf_type",
value: "BIQUAD"
......@@ -217,6 +229,10 @@ helper.defaultsDialog = (function() {
key: "motor_pwm_protocol",
value: "STANDARD"
},
{
key: "throttle_idle",
value: 5.0
},
{
key: "rc_yaw_expo",
value: 30
......@@ -227,15 +243,83 @@ helper.defaultsDialog = (function() {
},
{
key: "roll_rate",
value: 20
value: 18
},
{
key: "pitch_rate",
value: 15
value: 9
},
{
key: "yaw_rate",
value: 9
value: 3
},
{
key: "nav_fw_pos_z_p",
value: 20
},
{
key: "nav_fw_pos_z_d",
value: 5
},
{
key: "nav_fw_pos_xy_p",
value: 50
},
{
key: "fw_turn_assist_pitch_gain",
value: 0.5
},
{
key: "max_angle_inclination_rll",
value: 350
},
{
key: "nav_fw_bank_angle",
value: 35
},
{
key: "fw_p_pitch",
value: 15
},
{
key: "fw_i_pitch",
value: 10
},
{
key: "fw_ff_pitch",
value: 60
},
{
key: "fw_p_roll",
value: 10
},
{
key: "fw_i_roll",
value: 8
},
{
key: "fw_ff_roll",
value: 40
},
{
key: "fw_p_yaw",
value: 20
},
{
key: "fw_i_yaw",
value: 5
},
{
key: "fw_ff_yaw",
value: 100
},
{
key: "imu_acc_ignore_rate",
value: 10
},
{
key: "airmode_type",
value: "STICK_CENTER_ONCE"
},
{
key: "small_angle",
......@@ -255,36 +339,190 @@ helper.defaultsDialog = (function() {
},
{
key: "failsafe_mission",
value: "OFF"
value: "ON"
},
{
key: "nav_wp_radius",
value: 3000
value: 1500
},
],
"features":[
{
bit: 4, // Enable MOTOR_STOP
state: true
}
]
},
{