diff --git a/tabs/servos.html b/tabs/servos.html index 078a1b29..d16dd4a3 100755 --- a/tabs/servos.html +++ b/tabs/servos.html @@ -23,29 +23,6 @@
-
-
Servo mixer
-
- -
- - - - - - - - - - - - - -
ServoInputWeightSpeed
-
- -
-
diff --git a/tabs/servos.js b/tabs/servos.js index d216c85b..cbd09b65 100755 --- a/tabs/servos.js +++ b/tabs/servos.js @@ -15,7 +15,6 @@ TABS.servos.initialize = function (callback) { mspHelper.loadServoConfiguration, mspHelper.loadRcData, mspHelper.loadBfConfig, - mspHelper.loadServoMixRules ]); loadChainer.setExitPoint(load_html); @@ -25,71 +24,17 @@ TABS.servos.initialize = function (callback) { saveChainer.setChain([ mspHelper.sendServoConfigurations, - mspHelper.sendServoMixer, mspHelper.saveToEeprom ]); saveChainer.setExitPoint(function () { GUI.log(chrome.i18n.getMessage('servosEepromSave')); - SERVO_RULES.cleanup(); - renderServoMixRules(); }); function load_html() { $('#content').load("./tabs/servos.html", process_html); } - function renderServoMixRules() { - - let $servoMixTable = $('#servo-mix-table'), - $servoMixTableBody = $servoMixTable.find('tbody'); - - /* - * Process servo mix table UI - */ - let rules = SERVO_RULES.get(); - $servoMixTableBody.find("*").remove(); - for (let servoRuleIndex in rules) { - if (rules.hasOwnProperty(servoRuleIndex)) { - const servoRule = rules[servoRuleIndex]; - - $servoMixTableBody.append('\ - \ - \ - \ - \ - \ - \ - \ - '); - - const $row = $servoMixTableBody.find('tr:last'); - - GUI.fillSelect($row.find(".mix-rule-input"), FC.getServoMixInputNames(), servoRule.getInput()); - - $row.find(".mix-rule-input").val(servoRule.getInput()).change(function () { - servoRule.setInput($(this).val()); - }); - - $row.find(".mix-rule-servo").val(servoRule.getTarget()).change(function () { - servoRule.setTarget($(this).val()); - }); - - $row.find(".mix-rule-rate").val(servoRule.getRate()).change(function () { - servoRule.setRate($(this).val()); - }); - - $row.find(".mix-rule-speed").val(servoRule.getSpeed()).change(function () { - servoRule.setSpeed($(this).val()); - }); - - $row.find("[data-role='role-delete']").attr("data-index", servoRuleIndex); - } - - } - localize(); - } - function update_ui() { let i, @@ -179,10 +124,7 @@ TABS.servos.initialize = function (callback) { }); //Save configuration to FC - SERVO_RULES.cleanup(); - SERVO_RULES.inflate(); saveChainer.execute(); - } // drop previous table @@ -204,19 +146,6 @@ TABS.servos.initialize = function (callback) { servos_update(true); }); - $servoMixTableBody.on('click', "[data-role='role-delete']", function (event) { - SERVO_RULES.drop($(event.currentTarget).attr("data-index")); - renderServoMixRules(); - }); - - $("[data-role='role-add']").click(function () { - if (SERVO_RULES.hasFreeSlots()) { - SERVO_RULES.put(new ServoMixRule(0, 0, 0, 0)); - renderServoMixRules(); - } - }); - - renderServoMixRules(); } function process_html() {