mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-19 14:25:20 +03:00
Merge remote-tracking branch 'multiwii/master'
Conflicts: README.md _locales/en/messages.json changelog.html js/backup_restore.js js/data_storage.js js/msp.js js/protocols/stm32.js js/serial_backend.js main.css main.html main.js manifest.json tabs/auxiliary_configuration.css tabs/default.css tabs/firmware_flasher.js tabs/initial_setup.css tabs/initial_setup.html tabs/initial_setup.js tabs/modes.html tabs/modes.js tabs/motor_outputs.css tabs/motors.html tabs/receiver.css tabs/servos.js
This commit is contained in:
commit
a8cf910f51
108 changed files with 12813 additions and 4551 deletions
|
@ -8,9 +8,12 @@
|
|||
|
||||
TABS.servos = {};
|
||||
TABS.servos.initialize = function (callback) {
|
||||
GUI.active_tab_ref = this;
|
||||
GUI.active_tab = 'servos';
|
||||
googleAnalytics.sendAppView('Servos');
|
||||
var self = this;
|
||||
|
||||
if (GUI.active_tab != 'servos') {
|
||||
GUI.active_tab = 'servos';
|
||||
googleAnalytics.sendAppView('Servos');
|
||||
}
|
||||
|
||||
function get_servo_conf_data() {
|
||||
MSP.send_message(MSP_codes.MSP_SERVO_CONF, false, false, get_channel_forwarding_data);
|
||||
|
@ -159,27 +162,9 @@ TABS.servos.initialize = function (callback) {
|
|||
SERVO_CONFIG[info.obj].rate = val;
|
||||
}
|
||||
});
|
||||
|
||||
// send settings over to mcu
|
||||
var buffer_out = [];
|
||||
|
||||
var needle = 0;
|
||||
for (var i = 0; i < SERVO_CONFIG.length; i++) {
|
||||
buffer_out[needle++] = lowByte(SERVO_CONFIG[i].min);
|
||||
buffer_out[needle++] = highByte(SERVO_CONFIG[i].min);
|
||||
|
||||
buffer_out[needle++] = lowByte(SERVO_CONFIG[i].max);
|
||||
buffer_out[needle++] = highByte(SERVO_CONFIG[i].max);
|
||||
|
||||
buffer_out[needle++] = lowByte(SERVO_CONFIG[i].middle);
|
||||
buffer_out[needle++] = highByte(SERVO_CONFIG[i].middle);
|
||||
|
||||
buffer_out[needle++] = lowByte(SERVO_CONFIG[i].rate);
|
||||
}
|
||||
MSP.send_message(MSP_codes.MSP_SET_SERVO_CONF, buffer_out);
|
||||
|
||||
// send channel forwarding over to mcu
|
||||
buffer_out = [];
|
||||
var buffer_out = [];
|
||||
|
||||
var needle = 0;
|
||||
for (var i = 0; i < SERVO_CONFIG.length; i++) {
|
||||
|
@ -187,12 +172,16 @@ TABS.servos.initialize = function (callback) {
|
|||
}
|
||||
MSP.send_message(MSP_codes.MSP_SET_CHANNEL_FORWARDING, buffer_out);
|
||||
|
||||
if (save_to_eeprom) {
|
||||
// Save changes to EEPROM
|
||||
MSP.send_message(MSP_codes.MSP_EEPROM_WRITE, false, false, function () {
|
||||
GUI.log(chrome.i18n.getMessage('servosEepromSave'));
|
||||
});
|
||||
}
|
||||
MSP.send_message(MSP_codes.MSP_SET_SERVO_CONF, MSP.crunch(MSP_codes.MSP_SET_SERVO_CONF), false, function () {
|
||||
if (save_to_eeprom) {
|
||||
// Save changes to EEPROM
|
||||
MSP.send_message(MSP_codes.MSP_EEPROM_WRITE, false, false, function () {
|
||||
GUI.log(chrome.i18n.getMessage('servosEepromSave'));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
// drop previous table
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue