Skip to content

Commit d542fef

Browse files
basdelfosbasdelfos
committed
Added separate fields for rates
1 parent dc285d7 commit d542fef

File tree

2 files changed

+53
-41
lines changed

2 files changed

+53
-41
lines changed

‎index.html‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -949,42 +949,52 @@ <h5 class="modal-title-craft"></h5>
949949
</div>
950950
<div class="spacer_box">
951951
<table class="parameter cf">
952-
<thead>
953-
<tr>
954-
<th colspan="3">ROLL/PITCH</th>
955-
</tr>
956-
</thead>
957952
<tbody>
953+
<tr>
954+
<th colspan="3">ROLL</th>
955+
</tr>
958956
<tr>
959-
<td name="rcRate" class="no-inav"><label>Rate</label><input type="number" step="0.01" min="0" max="1.00"/></td>
960-
<td name="rcExpo"><label>Expo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
961-
<td name="deadband"><label>Deadband</label><input type="number" step="1" min="0" max="32"/></td>
962-
</tr>
957+
<td name="rcRollRate" class="no-inav"><label>Rate</label><input type="number" step="0.01" min="0" max="1.00"/></td>
958+
<td name="rates[0]"><label>Super Rate</label><input type="number" step="0.01" min="0" max="1.00" /></td>
959+
<td name="rcRollExpo"><label>Expo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
960+
</tr>
961+
<tr>
962+
<th colspan="3">PITCH</th>
963+
</tr>
964+
<tr>
965+
<td name="rcPitchRate" class="no-inav"><label>Rate</label><input type="number" step="0.01" min="0" max="1.00"/></td>
966+
<td name="rates[1]"><label>Super Rate</label><input type="number" step="0.01" min="0" max="1.00" /></td>
967+
<td name="rcPitchExpo"><label>Expo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
968+
</tr>
963969
<tr>
964970
<th colspan="3">YAW</th>
965971
</tr>
966972
<tr>
967973
<td name="rcYawRate" class="no-inav"><label>Rate</label><input type="number" step="0.01" min="0" max="1.00"/></td>
968-
<td name="rcYawExpo" ><label>Expo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
969-
<td name="yaw_deadband" ><label>Deadband</label><input type="number" step="1" min="0" max="100"/></td>
970-
</tr>
974+
<td name="rates[2]"><label>Super Rate</label><input type="number" step="0.01" min="0" max="2.55" /></td>
975+
<td name="rcYawExpo" ><label>Expo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
976+
</tr>
971977
<tr>
972-
<th colspan="5">Super Expo Rates</th>
973-
</tr>
974-
<tr>
975-
<td name="rates[0]"><label>ROLL Rate</label><input type="number" step="0.01" min="0" max="1.00" /></td>
976-
<td name="rates[1]"><label>PITCH Rate</label><input type="number" step="0.01" min="0" max="1.00" /></td>
977-
<td name="rates[2]"><label>YAW Rate</label><input type="number" step="0.01" min="0" max="2.55" /></td>
978-
</tr>
978+
<td name="superExpoFactor" class="bf-only"><label>ROLL/PITCH SuperExpo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
979+
<td name="superExpoFactorYaw" class="bf-only"><label>YAW SuperExpo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
980+
<td></td>
981+
</tr>
982+
<tr>
983+
<td></td>
984+
<td name='superExpoYawMode' class="bf-only"><select><!-- list generated here --></select></td>
985+
<td></td>
986+
</tr>
987+
</tbody>
988+
</table>
989+
<table class="parameter cf">
990+
<body>
979991
<tr>
980-
<td name="superExpoFactor" class="bf-only"><label>ROLL/PITCH SuperExpo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
981-
<td name="superExpoFactorYaw" class="bf-only"><label>YAW SuperExpo</label><input type="number" step="0.01" min="0" max="1.00"/></td>
982-
<td></td>
992+
<th colspan="5">Deadband</th>
983993
</tr>
984994
<tr>
985-
<td></td>
986-
<td name='superExpoYawMode' class="bf-only"><select><!-- list generated here --></select></td>
987-
<td></td>
995+
<td name="deadband"><label>Pitch/Roll</label><input type="number" step="1" min="0" max="32"/></td>
996+
<td name="yaw_deadband" ><label>Yaw</label><input type="number" step="1" min="0" max="100"/></td>
997+
<td></td>
988998
</tr>
989999
</tbody>
9901000
</table>

‎js/header_dialog.js‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,12 @@ function HeaderDialog(dialog, onSave) {
433433
populatePID('levelPID' , sysConfig.levelPID);
434434

435435
// Fill in data from for the rates object
436-
setParameter('rcRate' ,sysConfig.rcRate,2);
436+
setParameter('rcRollRate' ,sysConfig.rcRate,2);
437+
setParameter('rcRollExpo' ,sysConfig.rcExpo,2);
438+
setParameter('rcPitchRate' ,sysConfig.rcRate,2);
439+
setParameter('rcPitchExpo' ,sysConfig.rcExpo,2);
440+
setParameter('rcYawRate' ,sysConfig.rcYawRate,2);
441+
setParameter('rcYawExpo' ,sysConfig.rcYawExpo,2);
437442
setParameter('vbatscale' ,sysConfig.vbatscale,0);
438443
setParameter('vbatref' ,sysConfig.vbatref,0);
439444
setParameter('vbatmincellvoltage' ,sysConfig.vbatmincellvoltage,1);
@@ -443,9 +448,6 @@ function HeaderDialog(dialog, onSave) {
443448
setParameter('maxthrottle' ,sysConfig.maxthrottle,0);
444449
setParameter('currentMeterOffset' ,sysConfig.currentMeterOffset,0);
445450
setParameter('currentMeterScale' ,sysConfig.currentMeterScale,0);
446-
setParameter('rcExpo' ,sysConfig.rcExpo,2);
447-
setParameter('rcYawRate' ,sysConfig.rcYawRate,2);
448-
setParameter('rcYawExpo' ,sysConfig.rcYawExpo,2);
449451
setParameter('thrMid' ,sysConfig.thrMid,2);
450452
setParameter('thrExpo' ,sysConfig.thrExpo,2);
451453
setParameter('dynThrPID' ,sysConfig.dynThrPID,2);
@@ -591,14 +593,14 @@ function HeaderDialog(dialog, onSave) {
591593
}
592594
}
593595
}
594-
});
596+
});
595597

596598
// Scan all the drop-down lists
597599
$(".parameter select").each(function() {
598600
if($(this).val()!=null) {
599601
newSysConfig[$(this).attr('name')] = parseInt($(this).val());
600602
}
601-
});
603+
});
602604

603605

604606
// Scan the pid_tuning table
@@ -615,15 +617,15 @@ function HeaderDialog(dialog, onSave) {
615617
newSysConfig[$(this).attr('name')] = $(this).val();
616618
}
617619
}
618-
});
620+
});
619621

620622
//Build the features value
621623
var newFeatureValue = 0;
622624
$(".features td input").each(function() {
623-
if ($(this).prop('checked')) {
624-
newFeatureValue |= (1<<parseInt($(this).attr('bit')));
625-
}
626-
});
625+
if ($(this).prop('checked')) {
626+
newFeatureValue |= (1<<parseInt($(this).attr('bit')));
627+
}
628+
});
627629
newSysConfig['features'] = newFeatureValue;
628630

629631
return newSysConfig;
@@ -632,11 +634,11 @@ function HeaderDialog(dialog, onSave) {
632634
// Public variables
633635

634636
this.show = function(sysConfig) {
635-
dialog.modal('show');
636-
renderSysConfig(sysConfig);
637-
// Disable changing input and dropdowns
638-
$('#dlgHeaderDialog input').prop('disabled', 'disabled');
639-
$('#dlgHeaderDialog select').prop('disabled', 'disabled');
637+
dialog.modal('show');
638+
renderSysConfig(sysConfig);
639+
// Disable changing input and dropdowns
640+
$('#dlgHeaderDialog input').prop('disabled', 'disabled');
641+
$('#dlgHeaderDialog select').prop('disabled', 'disabled');
640642
}
641643

642644
// Buttons

0 commit comments

Comments
 (0)