Skip to content

Commit f95b6f1

Browse files
basdelfosbasdelfos
committed
Rebased and changes as per comments
1 parent 63af808 commit f95b6f1

File tree

3 files changed

+17
-161
lines changed

3 files changed

+17
-161
lines changed

‎_locales/en/messages.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2480,8 +2480,6 @@
24802480
"configurationMagHardware": {
24812481
"message": "Magnetometer (if supported)"
24822482
},
2483-
// ---------------------------------------------
2484-
// Remove this when we officialy retire BF 3.1.x
24852483
"configurationBatteryVoltage": {
24862484
"message": "Battery Voltage"
24872485
},
@@ -2518,7 +2516,6 @@
25182516
"configurationBatteryMultiwiiCurrent": {
25192517
"message": "Enable support for legacy Multiwii MSP current output"
25202518
},
2521-
// --------------------------------------------- END
25222519
"pidTuningProfile": {
25232520
"message": "Profile"
25242521
},

‎tabs/configuration.html‎

Lines changed: 16 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</select>
3232
</div>
3333
</div>
34-
<div class="spacer_box">
34+
<div class="spacer_box reverseMotor">
3535
<div class="checkbox" style="border-top: 1px solid #ddd; padding-top: 5px;">
3636
<div style="float: left; height: 20px; margin-right: 15px; margin-left: 3px;">
3737
<input type="checkbox" id="reverseMotorSwitch" class="toggle" />
@@ -530,11 +530,10 @@
530530
</tr>
531531
<tr class="oldBatteryConfig">
532532
<td style="width:calc(50%);vertical-align:top;">
533-
<!-- ROW 4 - LEFT PANE - ONLY NEEDED FOR BATTERY/CURRENT PART FOR PRE BF3.2 -->
533+
<!-- ROW 4 - LEFT PANE -->
534534

535-
<!-- -------------------------------------------------------- -->
536-
<!-- Remove this part when we officialy retire BF 3.1.x -->
537-
<div class="rightWrapper current voltage">
535+
<!-- BATTERY CONFIG FOR PRE BF 3.2 -->
536+
<div class="voltage">
538537
<div class="gui_box grey">
539538
<div class="gui_box_titlebar">
540539
<div class="spacer_box_title" i18n="configurationBatteryVoltage"></div>
@@ -585,7 +584,15 @@
585584
</div>
586585
</div>
587586
</div>
588-
<div class="gui_box grey">
587+
</div>
588+
589+
</td>
590+
<td style="width:calc(50%);vertical-align:top;">
591+
<!-- ROW 4 - RIGHT PANE -->
592+
593+
<!-- CURRENT CONFIG FOR PRE BF 3.2 -->
594+
<div class="current">
595+
<div class="gui_box grey">
589596
<div class="gui_box_titlebar">
590597
<div class="spacer_box_title" i18n="configurationCurrent"></div>
591598
</div>
@@ -633,17 +640,17 @@
633640
</div>
634641
</div>
635642
</div>
643+
636644
</div>
637-
<!-- -------------------------------------------------------- -->
638645

639646
</td>
640647
</tr>
641-
<tr>
648+
<tr class="beepers">
642649
<td style="width:calc(100%)" colspan="2">
643650
<!-- ROW 4 - FULL WIDTH PANE -->
644651

645652
<!-- BEEPER -->
646-
<div class="leftWrapper beepers" style="width: calc(100% - 20px);">
653+
<div class="beepers" style="width: calc(100%);">
647654
<div class="gui_box grey" style="margin-top:10px;">
648655
<div class="gui_box_titlebar">
649656
<div class="spacer_box_title" i18n="configurationBeeper"></div>
@@ -668,150 +675,11 @@
668675
</div>
669676
</div>
670677
</div>
671-
<<<<<<< HEAD
672678

673679
</td>
674680
</tr>
675681
</table>
676682

677-
=======
678-
</div>
679-
</div>
680-
<div class="clear-both"></div>
681-
</div>
682-
683-
684-
<!-- -------------------------------------------------------- -->
685-
<!-- Remove this part when we officialy retire BF 3.1.x -->
686-
<div class="rightWrapper current voltage oldBatteryConfig">
687-
<div class="gui_box grey">
688-
<div class="gui_box_titlebar">
689-
<div class="spacer_box_title" i18n="configurationBatteryVoltage"></div>
690-
</div>
691-
<div class="spacer_box">
692-
<table cellpadding="0" cellspacing="0">
693-
<thead>
694-
<tr>
695-
<th i18n="configurationFeatureEnabled"></th>
696-
<th i18n="configurationFeatureDescription"></th>
697-
<th i18n="configurationFeatureName"></th>
698-
</tr>
699-
</thead>
700-
<tbody class="features batteryVoltage">
701-
<!-- table generated here -->
702-
</tbody>
703-
</table>
704-
<div class="select batterymetertype vbatmonitoring">
705-
<label>
706-
<select class="batterymetertype"><!-- list generated here --></select>
707-
<span i18n="configurationBatteryMeterType"></span>
708-
</label>
709-
</div>
710-
<div class="number vbatmonitoring">
711-
<label> <input type="number" name="mincellvoltage" step="0.1" min="1" max="5" /> <span
712-
i18n="configurationBatteryMinimum"></span>
713-
</label>
714-
</div>
715-
<div class="number vbatmonitoring">
716-
<label> <input type="number" name="maxcellvoltage" step="0.1" min="1" max="5" /> <span
717-
i18n="configurationBatteryMaximum"></span>
718-
</label>
719-
</div>
720-
<div class="number vbatmonitoring">
721-
<label> <input type="number" name="warningcellvoltage" step="0.1" min="1" max="5" /> <span
722-
i18n="configurationBatteryWarning"></span>
723-
</label>
724-
</div>
725-
<div class="number vbatmonitoring vbatCalibration">
726-
<label> <input type="number" name="voltagescale" step="1" min="10" max="255" /> <span
727-
i18n="configurationBatteryScale"></span>
728-
</label>
729-
</div>
730-
<div class="number vbatmonitoring">
731-
<label> <input type="text" name="batteryvoltage" readonly class="disabled" /> <span
732-
i18n="configurationBatteryVoltage"></span>
733-
</label>
734-
</div>
735-
</div>
736-
</div>
737-
<div class="gui_box grey">
738-
<div class="gui_box_titlebar">
739-
<div class="spacer_box_title" i18n="configurationCurrent"></div>
740-
</div>
741-
<div class="spacer_box">
742-
<table cellpadding="0" cellspacing="0">
743-
<thead>
744-
<tr>
745-
<th i18n="configurationFeatureEnabled"></th>
746-
<th i18n="configurationFeatureDescription"></th>
747-
<th i18n="configurationFeatureName"></th>
748-
</tr>
749-
</thead>
750-
<tbody class="features batteryCurrent">
751-
<!-- table generated here -->
752-
</tbody>
753-
</table>
754-
<div class="select currentMonitoring">
755-
<label>
756-
<select class="currentmetertype"><!-- list generated here --></select>
757-
<span i18n="configurationCurrentMeterType"></span>
758-
</label>
759-
</div>
760-
<div class="number currentMonitoring currentCalibration">
761-
<label> <input type="number" name="currentscale" step="1" min="-16000" max="16000" /> <span
762-
i18n="configurationCurrentScale"></span>
763-
</label>
764-
</div>
765-
<div class="number currentMonitoring currentCalibration">
766-
<label> <input type="number" name="currentoffset" step="1" min="-1600" max="16000" /> <span
767-
i18n="configurationCurrentOffset"></span>
768-
</label>
769-
</div>
770-
<div class="number currentMonitoring currentOutput">
771-
<label>
772-
<input type="text" name="batterycurrent" readonly class="disabled" /> <span
773-
i18n="configurationBatteryCurrent"></span>
774-
</label>
775-
</div>
776-
<div class="checkbox currentMonitoring currentOutput">
777-
<div class="numberspacer">
778-
<input type="checkbox" name="multiwiicurrentoutput" class="toggle" />
779-
</div>
780-
<label> <span i18n="configurationBatteryMultiwiiCurrent"></span>
781-
</label>
782-
</div>
783-
</div>
784-
</div>
785-
</div>
786-
<!-- -------------------------------------------------------- -->
787-
788-
<div class="leftWrapper beepers" style="width: calc(100% - 20px);">
789-
<div class="gui_box grey" style="margin-top:10px;">
790-
<div class="gui_box_titlebar">
791-
<div class="spacer_box_title" i18n="configurationBeeper"></div>
792-
</div>
793-
<div class="spacer_box">
794-
<table cellpadding="0" cellspacing="0">
795-
<tbody class="beeper-configuration" id="noline">
796-
<tr class="beeper-template" style="display:none">
797-
<td>
798-
<input class="beeper toggle" id="" name="" title="" type="checkbox" />
799-
</td>
800-
<td>
801-
<label for=""></label>
802-
</td>
803-
<td>
804-
<span i18n=""></span>
805-
</td>
806-
</tr>
807-
<!-- table generated here -->
808-
</tbody>
809-
</table>
810-
</div>
811-
</div>
812-
</div>
813-
<div class="clear-both"></div>
814-
>>>>>>> Several fixes for compatibility with BF 3.1.x
815683
<div class="content_toolbar">
816684
<div class="btn save_btn">
817685
<a class="save" href="#" i18n="configurationButtonSave"></a>

‎tabs/configuration.js‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
160160
}
161161
}
162162

163-
// -----------------------------------------------
164-
// Remove this when we officily retire BF 3.1.x
165163
function load_battery() {
166164
var next_callback = load_current;
167165
if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
@@ -178,8 +176,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
178176
} else {
179177
next_callback();
180178
}
181-
}
182-
// -----------------------------------------------
179+
}
183180

184181
function load_rx_config() {
185182
var next_callback = load_html;
@@ -592,8 +589,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
592589
$('input[name="maxthrottle"]').val(MOTOR_CONFIG.maxthrottle);
593590
$('input[name="mincommand"]').val(MOTOR_CONFIG.mincommand);
594591

595-
// -----------------------------------------------
596-
// Remove this when we officily retire BF 3.1.x
597592
// fill battery
598593
if (self.SHOW_OLD_BATTERY_CONFIG) {
599594
if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
@@ -689,7 +684,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
689684
$('.currentMonitoring').hide();
690685
}
691686
}
692-
// ------------------------------------------------
693687

694688
//fill 3D
695689
if (semver.lt(CONFIG.apiVersion, "1.14.0")) {
@@ -980,8 +974,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
980974
MSP.send_message(MSPCodes.MSP_SET_NAME, mspHelper.crunch(MSPCodes.MSP_SET_NAME), false, next_callback);
981975
}
982976

983-
// -----------------------------------------------
984-
// Remove this when we officily retire BF 3.1.x
985977
function save_battery() {
986978
var next_callback = save_current;
987979
if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
@@ -999,7 +991,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
999991
next_callback();
1000992
}
1001993
}
1002-
// -----------------------------------------------
1003994

1004995
function save_rx_config() {
1005996
var next_callback = save_to_eeprom;

0 commit comments

Comments
 (0)