mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-26 09:45:23 +03:00
Merge pull request #1187 from avsaase/avs-separate-d-ff-gain-adjustments
Separate D and CD/FF adjustments
This commit is contained in:
Paweł Spychalski
GitHub
commit
2f733c00f1
3 changed files with 73 additions and 57 deletions
|
|
@ -1284,138 +1284,150 @@
|
||||||
"message": "Pitch & Roll I Adjustment"
|
"message": "Pitch & Roll I Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction8": {
|
"adjustmentsFunction8": {
|
||||||
"message": "Pitch & Roll D/FF Adjustment"
|
"message": "Pitch & Roll D"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction9": {
|
"adjustmentsFunction9": {
|
||||||
"message": "Yaw P Adjustment"
|
"message": "Pitch & Roll CD/FF Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction10": {
|
"adjustmentsFunction10": {
|
||||||
"message": "Yaw I Adjustment"
|
|
||||||
},
|
|
||||||
"adjustmentsFunction11": {
|
|
||||||
"message": "Yaw D/FF Adjustment"
|
|
||||||
},
|
|
||||||
"adjustmentsFunction12": {
|
|
||||||
"message": "Rate Profile Selection"
|
|
||||||
},
|
|
||||||
"adjustmentsFunction13": {
|
|
||||||
"message": "Pitch Rate"
|
|
||||||
},
|
|
||||||
"adjustmentsFunction14": {
|
|
||||||
"message": "Roll Rate"
|
|
||||||
},
|
|
||||||
"adjustmentsFunction15": {
|
|
||||||
"message": "Pitch P Adjustment"
|
"message": "Pitch P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction16": {
|
"adjustmentsFunction11": {
|
||||||
"message": "Pitch I Adjustment"
|
"message": "Pitch I Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction17": {
|
"adjustmentsFunction12": {
|
||||||
"message": "Pitch D/FF Adjustment"
|
"message": "Pitch D Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction18": {
|
"adjustmentsFunction13": {
|
||||||
|
"message": "Pitch CD/FF Adjustment"
|
||||||
|
},
|
||||||
|
"adjustmentsFunction14": {
|
||||||
"message": "Roll P Adjustment"
|
"message": "Roll P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction19": {
|
"adjustmentsFunction15": {
|
||||||
"message": "Roll I Adjustment"
|
"message": "Roll I Adjustment"
|
||||||
},
|
},
|
||||||
|
"adjustmentsFunction16": {
|
||||||
|
"message": "Roll D Adjustment"
|
||||||
|
},
|
||||||
|
"adjustmentsFunction17": {
|
||||||
|
"message": "Roll CD/FF Adjustment"
|
||||||
|
},
|
||||||
|
"adjustmentsFunction18": {
|
||||||
|
"message": "Yaw P Adjustment"
|
||||||
|
},
|
||||||
|
"adjustmentsFunction19": {
|
||||||
|
"message": "Yaw I Adjustment"
|
||||||
|
},
|
||||||
"adjustmentsFunction20": {
|
"adjustmentsFunction20": {
|
||||||
"message": "Roll D/FF Adjustment"
|
"message": "Yaw D Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction21": {
|
"adjustmentsFunction21": {
|
||||||
"message": "RC Yaw Expo Adjustment"
|
"message": "Yaw CD/FF Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction22": {
|
"adjustmentsFunction22": {
|
||||||
"message": "Manual RC Expo Adjustment"
|
"message": "Rate Profile Selection"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction23": {
|
"adjustmentsFunction23": {
|
||||||
"message": "Manual RC Yaw Expo Adjustment"
|
"message": "Pitch Rate"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction24": {
|
"adjustmentsFunction24": {
|
||||||
"message": "Manual Pitch & Roll Rate Adjustment"
|
"message": "Roll Rate"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction25": {
|
"adjustmentsFunction25": {
|
||||||
"message": "Manual Roll Rate Adjustment"
|
"message": "RC Yaw Expo Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction26": {
|
"adjustmentsFunction26": {
|
||||||
"message": "Manual Pitch Rate Adjustment"
|
"message": "Manual RC Expo Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction27": {
|
"adjustmentsFunction27": {
|
||||||
"message": "Manual Yaw Rate Adjustment"
|
"message": "Manual RC Yaw Expo Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction28": {
|
"adjustmentsFunction28": {
|
||||||
"message": "Navigation FW Cruise Throttle Adjustment"
|
"message": "Manual Pitch & Roll Rate Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction29": {
|
"adjustmentsFunction29": {
|
||||||
"message": "Navigation FW Pitch To Throttle Adjustment"
|
"message": "Manual Roll Rate Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction30": {
|
"adjustmentsFunction30": {
|
||||||
"message": "Board Roll Alignment Adjustment"
|
"message": "Manual Pitch Rate Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction31": {
|
"adjustmentsFunction31": {
|
||||||
"message": "Board Pitch Alignment Adjustment"
|
"message": "Manual Yaw Rate Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction32": {
|
"adjustmentsFunction32": {
|
||||||
"message": "Level P Adjustment"
|
"message": "Navigation FW Cruise Throttle Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction33": {
|
"adjustmentsFunction33": {
|
||||||
"message": "Level I Adjustment"
|
"message": "Navigation FW Pitch To Throttle Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction34": {
|
"adjustmentsFunction34": {
|
||||||
"message": "Level D Adjustment"
|
"message": "Board Roll Alignment Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction35": {
|
"adjustmentsFunction35": {
|
||||||
"message": "Pos XY P Adjustment"
|
"message": "Board Pitch Alignment Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction36": {
|
"adjustmentsFunction36": {
|
||||||
"message": "Pos XY I Adjustment"
|
"message": "Level P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction37": {
|
"adjustmentsFunction37": {
|
||||||
"message": "Pos XY D Adjustment"
|
"message": "Level I Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction38": {
|
"adjustmentsFunction38": {
|
||||||
"message": "Pos Z P Adjustment"
|
"message": "Level D Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction39": {
|
"adjustmentsFunction39": {
|
||||||
"message": "Pos Z I Adjustment"
|
"message": "Pos XY P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction40": {
|
"adjustmentsFunction40": {
|
||||||
"message": "Pos Z D Adjustment"
|
"message": "Pos XY I Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction41": {
|
"adjustmentsFunction41": {
|
||||||
"message": "Heading P Adjustment"
|
"message": "Pos XY D Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction42": {
|
"adjustmentsFunction42": {
|
||||||
"message": "Vel XY P Adjustment"
|
"message": "Pos Z P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction43": {
|
"adjustmentsFunction43": {
|
||||||
"message": "Vel XY I Adjustment"
|
"message": "Pos Z I Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction44": {
|
"adjustmentsFunction44": {
|
||||||
"message": "Vel XY D Adjustment"
|
"message": "Pos Z D Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction45": {
|
"adjustmentsFunction45": {
|
||||||
"message": "Vel Z P Adjustment"
|
"message": "Heading P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction46": {
|
"adjustmentsFunction46": {
|
||||||
"message": "Vel Z I Adjustment"
|
"message": "Vel XY P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction47": {
|
"adjustmentsFunction47": {
|
||||||
"message": "Vel Z D Adjustment"
|
"message": "Vel XY I Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction48": {
|
"adjustmentsFunction48": {
|
||||||
"message": "FW min thr down pitch angle Adjustment"
|
"message": "Vel XY D Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction49": {
|
"adjustmentsFunction49": {
|
||||||
"message": "VTX power level Adjustment"
|
"message": "Vel Z P Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction50": {
|
"adjustmentsFunction50": {
|
||||||
"message": "Thrust PID Attenuation (TPA) Adjustment"
|
"message": "Vel Z I Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction51": {
|
"adjustmentsFunction51": {
|
||||||
"message": "TPA Breakpoint Adjustment"
|
"message": "Vel Z D Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsFunction52": {
|
"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"
|
"message": "Control Smoothness Adjustment"
|
||||||
},
|
},
|
||||||
"adjustmentsSave": {
|
"adjustmentsSave": {
|
||||||
|
|
|
||||||
|
|
@ -117,6 +117,10 @@
|
||||||
<option value="50" i18n="adjustmentsFunction50"></option>
|
<option value="50" i18n="adjustmentsFunction50"></option>
|
||||||
<option value="51" i18n="adjustmentsFunction51"></option>
|
<option value="51" i18n="adjustmentsFunction51"></option>
|
||||||
<option value="52" i18n="adjustmentsFunction52"></option>
|
<option value="52" i18n="adjustmentsFunction52"></option>
|
||||||
|
<option value="53" i18n="adjustmentsFunction53"></option>
|
||||||
|
<option value="54" i18n="adjustmentsFunction54"></option>
|
||||||
|
<option value="55" i18n="adjustmentsFunction55"></option>
|
||||||
|
<option value="56" i18n="adjustmentsFunction56"></option>
|
||||||
</select></td>
|
</select></td>
|
||||||
<td class="adjustmentSlot"><select class="slot">
|
<td class="adjustmentSlot"><select class="slot">
|
||||||
<option value="0" i18n="adjustmentsSlot0"></option>
|
<option value="0" i18n="adjustmentsSlot0"></option>
|
||||||
|
|
|
||||||
|
|
@ -1425,17 +1425,17 @@ OSD.constants = {
|
||||||
{
|
{
|
||||||
name: 'ROLL_PIDS',
|
name: 'ROLL_PIDS',
|
||||||
id: 16,
|
id: 16,
|
||||||
preview: 'ROL 40 30 23'
|
preview: 'ROL 40 30 20 23'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'PITCH_PIDS',
|
name: 'PITCH_PIDS',
|
||||||
id: 17,
|
id: 17,
|
||||||
preview: 'PIT 40 30 23'
|
preview: 'ROL 40 30 20 23'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'YAW_PIDS',
|
name: 'YAW_PIDS',
|
||||||
id: 18,
|
id: 18,
|
||||||
preview: 'YAW 85 45 0'
|
preview: 'YAW 85 45 0 20'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'LEVEL_PIDS',
|
name: 'LEVEL_PIDS',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue