Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-17 21:35:30 +03:00
Code Wiki Activity

Add support for JUMBO frames

Browse source 
Fixes https://github.com/iNavFlight/inav/issues/1986
This commit is contained in:
Alberto García Hierro 2017-08-27 00:33:51 +02:00
parent 1948e3687a
commit dbf4fa164d
2 changed files with 118 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

71
build/script.js
View file

@ -11786,21 +11786,27 @@ var MSP = {
TO_MWC: '<'.charCodeAt(0), TO_MWC: '<'.charCodeAt(0),
UNSUPPORTED: '!'.charCodeAt(0), UNSUPPORTED: '!'.charCodeAt(0),
}, },
constants: {
JUMBO_FRAME_MIN_SIZE: 255,
},
decoder_states: { decoder_states: {
IDLE: 0, IDLE: 0,
PROTO_IDENTIFIER: 1, PROTO_IDENTIFIER: 1,
DIRECTION_V1: 2, DIRECTION_V1: 2,
DIRECTION_V2: 3, DIRECTION_V2: 3,
PAYLOAD_LENGTH_V1: 4, PAYLOAD_LENGTH_V1: 4,
PAYLOAD_LENGTH_V2_LOW: 5, PAYLOAD_LENGTH_JUMBO_LOW: 5,
PAYLOAD_LENGTH_V2_HIGH: 6, PAYLOAD_LENGTH_JUMBO_HIGH: 6,
CODE_V1: 7, PAYLOAD_LENGTH_V2_LOW: 7,
CODE_V2_LOW: 8, PAYLOAD_LENGTH_V2_HIGH: 8,
CODE_V2_HIGH: 9, CODE_V1: 9,
PAYLOAD_V1: 10, CODE_JUMBO_V1: 10,
PAYLOAD_V2: 11, CODE_V2_LOW: 11,
CHECKSUM_V1: 12, CODE_V2_HIGH: 12,
CHECKSUM_V2: 13, PAYLOAD_V1: 13,
PAYLOAD_V2: 14,
CHECKSUM_V1: 15,
CHECKSUM_V2: 16,
}, },
state: 0, // this.decoder_states.IDLE state: 0, // this.decoder_states.IDLE
message_direction: 1, message_direction: 1,
@ -11861,29 +11867,40 @@ var MSP = {
case this.decoder_states.PAYLOAD_LENGTH_V1: case this.decoder_states.PAYLOAD_LENGTH_V1:
this.message_length_expected = data[i]; this.message_length_expected = data[i];
this.message_checksum = data[i]; if (this.message_length_expected == this.constants.JUMBO_FRAME_MIN_SIZE) {
this.state = this.decoder_states.CODE_JUMBO_V1;
// setup arraybuffer } else {
this.message_buffer = new ArrayBuffer(this.message_length_expected); this._initialize_read_buffer();
this.message_buffer_uint8_view = new Uint8Array(this.message_buffer);
this.state = this.decoder_states.CODE_V1; this.state = this.decoder_states.CODE_V1;
}
break; break;
case this.decoder_states.CODE_V1: case this.decoder_states.CODE_V1:
case this.decoder_states.CODE_JUMBO_V1:
this.code = data[i]; this.code = data[i];
this.message_checksum ^= data[i];
if (this.message_length_expected > 0) { if (this.message_length_expected > 0) {
// process payload // process payload
if (this.state == this.decoder_states.CODE_JUMBO_V1) {
this.state = this.decoder_states.PAYLOAD_LENGTH_JUMBO_LOW;
} else {
this.state = this.decoder_states.PAYLOAD_V1; this.state = this.decoder_states.PAYLOAD_V1;
}
} else { } else {
// no payload // no payload
this.state = this.decoder_states.CHECKSUM_V1; this.state = this.decoder_states.CHECKSUM_V1;
} }
break; break;
case this.decoder_states.PAYLOAD_LENGTH_JUMBO_LOW:
this.message_length_expected = data[i];
this.state = this.decoder_states.PAYLOAD_LENGTH_JUMBO_HIGH;
break;
case this.decoder_states.PAYLOAD_LENGTH_JUMBO_HIGH:
this.message_length_expected |= data[i] << 8;
this._initialize_read_buffer();
this.state = this.decoder_states.PAYLOAD_V1;
break;
case this.decoder_states.PAYLOAD_V1: case this.decoder_states.PAYLOAD_V1:
this.message_buffer_uint8_view[this.message_length_received] = data[i]; this.message_buffer_uint8_view[this.message_length_received] = data[i];
this.message_checksum ^= data[i];
this.message_length_received++; this.message_length_received++;
if (this.message_length_received >= this.message_length_expected) { if (this.message_length_received >= this.message_length_expected) {
@ -11891,6 +11908,19 @@ var MSP = {
} }
break; break;
case this.decoder_states.CHECKSUM_V1: case this.decoder_states.CHECKSUM_V1:
if (this.message_length_expected >= this.constants.JUMBO_FRAME_MIN_SIZE) {
this.message_checksum = this.constants.JUMBO_FRAME_MIN_SIZE;
} else {
this.message_checksum = this.message_length_expected;
}
this.message_checksum ^= this.code;
if (this.message_length_expected >= this.constants.JUMBO_FRAME_MIN_SIZE) {
this.message_checksum ^= this.message_length_expected & 0xFF;
this.message_checksum ^= (this.message_length_expected & 0xFF00) >> 8;
}
for (var ii = 0; ii < this.message_length_received; ii++) {
this.message_checksum ^= this.message_buffer_uint8_view[ii];
}
if (this.message_checksum == data[i]) { if (this.message_checksum == data[i]) {
// message received, process // message received, process
mspHelper.processData(this); mspHelper.processData(this);
@ -11922,6 +11952,11 @@ var MSP = {
this.last_received_timestamp = Date.now(); this.last_received_timestamp = Date.now();
}, },
_initialize_read_buffer: function() {
this.message_buffer = new ArrayBuffer(this.message_length_expected);
this.message_buffer_uint8_view = new Uint8Array(this.message_buffer);
},
/** /**
* *
* @param {MSP} mspData * @param {MSP} mspData

71
js/msp.js
View file

@ -32,21 +32,27 @@ var MSP = {
TO_MWC: '<'.charCodeAt(0), TO_MWC: '<'.charCodeAt(0),
UNSUPPORTED: '!'.charCodeAt(0), UNSUPPORTED: '!'.charCodeAt(0),
}, },
constants: {
JUMBO_FRAME_MIN_SIZE: 255,
},
decoder_states: { decoder_states: {
IDLE: 0, IDLE: 0,
PROTO_IDENTIFIER: 1, PROTO_IDENTIFIER: 1,
DIRECTION_V1: 2, DIRECTION_V1: 2,
DIRECTION_V2: 3, DIRECTION_V2: 3,
PAYLOAD_LENGTH_V1: 4, PAYLOAD_LENGTH_V1: 4,
PAYLOAD_LENGTH_V2_LOW: 5, PAYLOAD_LENGTH_JUMBO_LOW: 5,
PAYLOAD_LENGTH_V2_HIGH: 6, PAYLOAD_LENGTH_JUMBO_HIGH: 6,
CODE_V1: 7, PAYLOAD_LENGTH_V2_LOW: 7,
CODE_V2_LOW: 8, PAYLOAD_LENGTH_V2_HIGH: 8,
CODE_V2_HIGH: 9, CODE_V1: 9,
PAYLOAD_V1: 10, CODE_JUMBO_V1: 10,
PAYLOAD_V2: 11, CODE_V2_LOW: 11,
CHECKSUM_V1: 12, CODE_V2_HIGH: 12,
CHECKSUM_V2: 13, PAYLOAD_V1: 13,
PAYLOAD_V2: 14,
CHECKSUM_V1: 15,
CHECKSUM_V2: 16,
}, },
state: 0, // this.decoder_states.IDLE state: 0, // this.decoder_states.IDLE
message_direction: 1, message_direction: 1,
@ -107,29 +113,40 @@ var MSP = {
case this.decoder_states.PAYLOAD_LENGTH_V1: case this.decoder_states.PAYLOAD_LENGTH_V1:
this.message_length_expected = data[i]; this.message_length_expected = data[i];
this.message_checksum = data[i]; if (this.message_length_expected == this.constants.JUMBO_FRAME_MIN_SIZE) {
this.state = this.decoder_states.CODE_JUMBO_V1;
// setup arraybuffer } else {
this.message_buffer = new ArrayBuffer(this.message_length_expected); this._initialize_read_buffer();
this.message_buffer_uint8_view = new Uint8Array(this.message_buffer);
this.state = this.decoder_states.CODE_V1; this.state = this.decoder_states.CODE_V1;
}
break; break;
case this.decoder_states.CODE_V1: case this.decoder_states.CODE_V1:
case this.decoder_states.CODE_JUMBO_V1:
this.code = data[i]; this.code = data[i];
this.message_checksum ^= data[i];
if (this.message_length_expected > 0) { if (this.message_length_expected > 0) {
// process payload // process payload
if (this.state == this.decoder_states.CODE_JUMBO_V1) {
this.state = this.decoder_states.PAYLOAD_LENGTH_JUMBO_LOW;
} else {
this.state = this.decoder_states.PAYLOAD_V1; this.state = this.decoder_states.PAYLOAD_V1;
}
} else { } else {
// no payload // no payload
this.state = this.decoder_states.CHECKSUM_V1; this.state = this.decoder_states.CHECKSUM_V1;
} }
break; break;
case this.decoder_states.PAYLOAD_LENGTH_JUMBO_LOW:
this.message_length_expected = data[i];
this.state = this.decoder_states.PAYLOAD_LENGTH_JUMBO_HIGH;
break;
case this.decoder_states.PAYLOAD_LENGTH_JUMBO_HIGH:
this.message_length_expected |= data[i] << 8;
this._initialize_read_buffer();
this.state = this.decoder_states.PAYLOAD_V1;
break;
case this.decoder_states.PAYLOAD_V1: case this.decoder_states.PAYLOAD_V1:
this.message_buffer_uint8_view[this.message_length_received] = data[i]; this.message_buffer_uint8_view[this.message_length_received] = data[i];
this.message_checksum ^= data[i];
this.message_length_received++; this.message_length_received++;
if (this.message_length_received >= this.message_length_expected) { if (this.message_length_received >= this.message_length_expected) {
@ -137,6 +154,19 @@ var MSP = {
} }
break; break;
case this.decoder_states.CHECKSUM_V1: case this.decoder_states.CHECKSUM_V1:
if (this.message_length_expected >= this.constants.JUMBO_FRAME_MIN_SIZE) {
this.message_checksum = this.constants.JUMBO_FRAME_MIN_SIZE;
} else {
this.message_checksum = this.message_length_expected;
}
this.message_checksum ^= this.code;
if (this.message_length_expected >= this.constants.JUMBO_FRAME_MIN_SIZE) {
this.message_checksum ^= this.message_length_expected & 0xFF;
this.message_checksum ^= (this.message_length_expected & 0xFF00) >> 8;
}
for (var ii = 0; ii < this.message_length_received; ii++) {
this.message_checksum ^= this.message_buffer_uint8_view[ii];
}
if (this.message_checksum == data[i]) { if (this.message_checksum == data[i]) {
// message received, process // message received, process
mspHelper.processData(this); mspHelper.processData(this);
@ -168,6 +198,11 @@ var MSP = {
this.last_received_timestamp = Date.now(); this.last_received_timestamp = Date.now();
}, },
_initialize_read_buffer: function() {
this.message_buffer = new ArrayBuffer(this.message_length_expected);
this.message_buffer_uint8_view = new Uint8Array(this.message_buffer);
},
/** /**
* *
* @param {MSP} mspData * @param {MSP} mspData