Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-16 21:05:30 +03:00
Code Issues Wiki Activity

add support for connect over raw tcp socket

Browse source
This commit is contained in:
cs8425 2017-02-07 23:27:47 +08:00
parent eb4ab1b733
commit a2adfa0457
2 changed files with 95 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

101
js/serial.js
View file

@ -1,6 +1,9 @@
'use strict';
var serial = {
connectionType: 'serial', // 'serial' or 'tcp'
connectionIP: '127.0.0.1',
connectionPort: 2323,
connectionId: false,
openRequested: false,
openCanceled: false,
@ -12,10 +15,76 @@ var serial = {
transmitting: false,
outputBuffer: [],
LOGHEAD: 'SERIAL: ',
connect: function (path, options, callback) {
var self = this;
self.openRequested = true;
var testUrl = path.match(/tcp:\/\/(.*):(.*)/)
if (testUrl) {
self.connectionIP = testUrl[1];
self.connectionPort = testUrl[2] || self.connectionPort;
self.connectionPort = parseInt(self.connectionPort);
self.connectionType = 'tcp';
self.LOGHEAD = 'SERIAL-TCP: ';
console.log('connect to raw tcp:', self.connectionIP + ':' + self.connectionPort)
chrome.sockets.tcp.create({}, function(createInfo) {
console.log('chrome.sockets.tcp.create', createInfo)
if (createInfo && !self.openCanceled) {
self.connectionId = createInfo.socketId;
self.bitrate = 115200; // fake
self.bytesReceived = 0;
self.bytesSent = 0;
self.failed = 0;
self.openRequested = false;
}
chrome.sockets.tcp.connect(createInfo.socketId, self.connectionIP, self.connectionPort, function (result){
if (chrome.runtime.lastError) {
console.error('onConnectedCallback', chrome.runtime.lastError.message);
}
console.log('onConnectedCallback', result)
if(result == 0) {
chrome.sockets.tcp.setNoDelay(createInfo.socketId, true, function (noDelayResult){
if (chrome.runtime.lastError) {
console.error('setNoDelay', chrome.runtime.lastError.message);
}
console.log('setNoDelay', noDelayResult)
if(noDelayResult != 0) {
self.openRequested = false;
console.log(self.LOGHEAD + 'Failed to setNoDelay');
}
self.onReceive.addListener(function log_bytesReceived(info) {
if (info.socketId != self.connectionId) return;
self.bytesReceived += info.data.byteLength;
});
self.onReceiveError.addListener(function watch_for_on_receive_errors(info) {
console.error(info);
if (info.socketId != self.connectionId) return;
});
console.log(self.LOGHEAD + 'Connection opened with ID: ' + createInfo.socketId + ', url: ' + self.connectionIP + ':' + self.connectionPort);
if (callback) callback(createInfo);
});
} else {
self.openRequested = false;
console.log(self.LOGHEAD + 'Failed to connect');
if (callback) callback(false);
}
});
});
} else {
self.connectionType = 'serial';
self.LOGHEAD = 'SERIAL: ';
chrome.serial.connect(path, options, function (connectionInfo) {
if (chrome.runtime.lastError) {
console.error(chrome.runtime.lastError.message);
@ -142,6 +211,7 @@ var serial = {
if (callback) callback(false);
}
});
}
},
disconnect: function (callback) {
var self = this;
@ -158,15 +228,16 @@ var serial = {
self.onReceiveError.removeListener(self.onReceiveError.listeners[i]);
}
chrome.serial.disconnect(this.connectionId, function (result) {
var disconnectFn = (self.connectionType == 'serial') ? chrome.serial.disconnect : chrome.sockets.tcp.close;
disconnectFn(this.connectionId, function (result) {
if (chrome.runtime.lastError) {
console.error(chrome.runtime.lastError.message);
}
if (result) {
console.log('SERIAL: Connection with ID: ' + self.connectionId + ' closed, Sent: ' + self.bytesSent + ' bytes, Received: ' + self.bytesReceived + ' bytes');
console.log(self.LOGHEAD + 'Connection with ID: ' + self.connectionId + ' closed, Sent: ' + self.bytesSent + ' bytes, Received: ' + self.bytesReceived + ' bytes');
} else {
console.log('SERIAL: Failed to close connection with ID: ' + self.connectionId + ' closed, Sent: ' + self.bytesSent + ' bytes, Received: ' + self.bytesReceived + ' bytes');
console.log(self.LOGHEAD + 'Failed to close connection with ID: ' + self.connectionId + ' closed, Sent: ' + self.bytesSent + ' bytes, Received: ' + self.bytesReceived + ' bytes');
}
self.connectionId = false;
@ -191,13 +262,14 @@ var serial = {
});
},
getInfo: function (callback) {
chrome.serial.getInfo(this.connectionId, callback);
var chromeType = (self.connectionType == 'serial') ? chrome.serial : chrome.sockets.tcp;
chromeType.getInfo(this.connectionId, callback);
},
getControlSignals: function (callback) {
chrome.serial.getControlSignals(this.connectionId, callback);
if (self.connectionType == 'serial') chrome.serial.getControlSignals(this.connectionId, callback);
},
setControlSignals: function (signals, callback) {
chrome.serial.setControlSignals(this.connectionId, signals, callback);
if (self.connectionType == 'serial') chrome.serial.setControlSignals(this.connectionId, signals, callback);
},
send: function (data, callback) {
var self = this;
@ -208,7 +280,8 @@ var serial = {
var data = self.outputBuffer[0].data,
callback = self.outputBuffer[0].callback;
chrome.serial.send(self.connectionId, data, function (sendInfo) {
var sendFn = (self.connectionType == 'serial') ? chrome.serial.send : chrome.sockets.tcp.send;
sendFn(self.connectionId, data, function (sendInfo) {
// track sent bytes for statistics
self.bytesSent += sendInfo.bytesSent;
@ -229,7 +302,7 @@ var serial = {
counter++;
}
console.log('SERIAL: Send buffer overflowing, dropped: ' + counter + ' entries');
console.log(self.LOGHEAD + 'Send buffer overflowing, dropped: ' + counter + ' entries');
}
send();
@ -248,13 +321,15 @@ var serial = {
listeners: [],
addListener: function (function_reference) {
chrome.serial.onReceive.addListener(function_reference);
var chromeType = (serial.connectionType == 'serial') ? chrome.serial : chrome.sockets.tcp;
chromeType.onReceive.addListener(function_reference);
this.listeners.push(function_reference);
},
removeListener: function (function_reference) {
var chromeType = (serial.connectionType == 'serial') ? chrome.serial : chrome.sockets.tcp;
for (var i = (this.listeners.length - 1); i >= 0; i--) {
if (this.listeners[i] == function_reference) {
chrome.serial.onReceive.removeListener(function_reference);
chromeType.onReceive.removeListener(function_reference);
this.listeners.splice(i, 1);
break;
@ -266,13 +341,15 @@ var serial = {
listeners: [],
addListener: function (function_reference) {
chrome.serial.onReceiveError.addListener(function_reference);
var chromeType = (serial.connectionType == 'serial') ? chrome.serial : chrome.sockets.tcp;
chromeType.onReceiveError.addListener(function_reference);
this.listeners.push(function_reference);
},
removeListener: function (function_reference) {
var chromeType = (serial.connectionType == 'serial') ? chrome.serial : chrome.sockets.tcp;
for (var i = (this.listeners.length - 1); i >= 0; i--) {
if (this.listeners[i] == function_reference) {
chrome.serial.onReceiveError.removeListener(function_reference);
chromeType.onReceiveError.removeListener(function_reference);
this.listeners.splice(i, 1);
break;