Skip to content

Support Holley DTZ541 wrongly implemented CRC Algorithm #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apollon77 merged 2 commits into from
Nov 14, 2020
Merged

Support Holley DTZ541 wrongly implemented CRC Algorithm #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bdf1dd
support Holley DTZ541 wrongly implemented CRC Algorithm
hacki11 Oct 23, 2020
d638081
changed tab indent to whitespaces
hacki11 Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 37 additions & 25 deletions lib/SmlCRC.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@
* MIT Licensed
*/

/*
* table to calculate crc16
*/
SmlCRC.table = [ 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1,
0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7,
0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399,
0x6726, 0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, 0x3183,
0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66,
0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e,
0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522,
0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e,
0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9,
0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb,
0x4e64, 0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, 0x18c1,
0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7,
0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699,
0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60,
0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c,
0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238,
0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514,
0xb1ab, 0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 ];

function SmlCRC(){
}

SmlCRC.crc16CCITT = function crc16CCITT(buffer) {
/*
* table to calculate crc16
*/
var table = [ 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1,
0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7,
0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399,
0x6726, 0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, 0x3183,
0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66,
0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e,
0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522,
0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e,
0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9,
0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb,
0x4e64, 0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, 0x18c1,
0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7,
0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699,
0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60,
0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c,
0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238,
0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514,
0xb1ab, 0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 ];

var crc = 0xffff;
for (var i = 0; i < buffer.length; i++) {
crc = (crc >> 8) ^ table[(crc ^ buffer[i]) & 0xff];
crc = (crc >> 8) ^ this.table[(crc ^ buffer[i]) & 0xff];
}
crc ^= 0xffff;
return crc;
Expand All @@ -49,4 +49,16 @@ SmlCRC.crc16CCITTRotate = function crc16CCITTRotate(buffer) {
return crc;
};

/*
* Holley DTZ541 uses kermit CRC16
*/
SmlCRC.crc16Kermit = function crc16Kermit(buffer) {
var crc = 0x0000;

for(var i = 0; i < buffer.length; i++) {
crc = (crc >> 8) ^ this.table[(crc ^ buffer[i]) & 0xff];
}

return crc;
}
module.exports = SmlCRC;
7 changes: 4 additions & 3 deletions lib/SmlFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ SmlFile.prototype.parse = function parse(buffer){
//console.log("CRC16-Compare-Rotated Msg="+crcRead.toString(16)+", Calculated="+crcCalc.toString(16));
if (crcRead == crcCalc){
this.valid = true;
}
else {
this.valid = false;
} else {
// Workaround for Holley DTZ541 uses CRC-16/Kermit
crcCalc = Crc16.crc16Kermit(buffer.slice(0, smlBuffer.offset - 2));
this.valid = crcRead === crcCalc;
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions lib/SmlMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,12 @@ SmlMessage.parse = function parse(buffer){
//console.log("CRC16-Compare-Rotated Msg="+smlMessage.getCRC16().toString(16)+", Calculated="+crcCalc.toString(16));
if (smlMessage.getCRC16() == crcCalc){
smlMessage.setValid(true);
}
}
} else {
// Workaround for Holley DTZ541 uses CRC-16/Kermit
crcCalc = Crc16.crc16Kermit(buffer.buffer.slice(smlMessageStart, buffer.offset - 3));
smlMessage.setValid(smlMessage.getCRC16() === crcCalc);
}
}
//console.log("Message CRC Valid: "+smlMessage.isValid());
} else {
throw new Error("Unknown TL-Field for SmlMessage!");
Expand Down
15 changes: 14 additions & 1 deletion test/SmlCRC_Spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,20 @@ describe("SmlCRC", function() {
var crc = SmlCRC.crc16CCITTRotate(data);
expect(crc.toString(16)).to.be.equal("e566");
});

});

describe("crc16Kermit()", function () {

it("check sample file", function () {
var data = Buffer.from("1B1B1B1B01010101760400000162006200726500000101760101070000011D5C360B0A01484C59020001206A0101637DC60076040000026200620072650000070177010B0A01484C59020001206A0101F10477070100603201010101010104484C590177070100600100FF010101010B0A01484C59020001206A0177070100010800FF65001C010465011D5C36621E52FF6500DDC7560177070100020800FF65001C010465011D5C36621E52FF62000177070100100700FF0101621B52005302C80177070100200700FF0101622352FF6308F10177070100340700FF0101622352FF6308E40177070100480700FF0101622352FF6308EF01770701001F0700FF0101622152FE62260177070100330700FF0101622152FE62C90177070100470700FF0101622152FE62940177070100510701FF01016208520062790177070100510702FF01016208520062F00177070100510704FF010162085200620D017707010051070FFF01016208520063013F017707010051071AFF01016208520063014401770701000E0700FF0101622C52FF6301F30177070100000200000101010109312E30322E3030370177070100605A02010101010105413031410177070100600500FF0101010165001C010401010163522400760400000362006200726500000201710163EBF4000000001B1B1B1B1A03", "hex");
var crc = SmlCRC.crc16Kermit(data);
expect(crc.toString(16)).to.be.equal("f406");
});

it("check sample message", function () {
var data = Buffer.from("760400000162006200726500000101760101070000011D5C360B0A01484C59020001206A0101", "hex");
var crc = SmlCRC.crc16Kermit(data);
expect(crc.toString(16)).to.be.equal("7dc6");
});
});
});
19 changes: 16 additions & 3 deletions test/SmlFile_Spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,21 @@ describe("SmlFile", function() {

describe("getSize()", function(){
});

describe("parse()", function(){

describe("parse()", function () {
it("should parse with 3 messages", function () {
var smlFile = new SmlFile();
var buffer = Buffer.from("1B1B1B1B01010101760400000162006200726500000101760101070000011D5C360B0A01484C59020001206A0101637DC60076040000026200620072650000070177010B0A01484C59020001206A0101F10477070100603201010101010104484C590177070100600100FF010101010B0A01484C59020001206A0177070100010800FF65001C010465011D5C36621E52FF6500DDC7560177070100020800FF65001C010465011D5C36621E52FF62000177070100100700FF0101621B52005302C80177070100200700FF0101622352FF6308F10177070100340700FF0101622352FF6308E40177070100480700FF0101622352FF6308EF01770701001F0700FF0101622152FE62260177070100330700FF0101622152FE62C90177070100470700FF0101622152FE62940177070100510701FF01016208520062790177070100510702FF01016208520062F00177070100510704FF010162085200620D017707010051070FFF01016208520063013F017707010051071AFF01016208520063014401770701000E0700FF0101622C52FF6301F30177070100000200000101010109312E30322E3030370177070100605A02010101010105413031410177070100600500FF0101010165001C010401010163522400760400000362006200726500000201710163EBF4000000001B1B1B1B1A03F406", "hex");
smlFile.parse(buffer);
expect(smlFile.messages.length).to.be.equal(3);
});

it("should parse with valid crc", function () {
var smlFile = new SmlFile();
var buffer = Buffer.from("1B1B1B1B01010101760400000162006200726500000101760101070000011D5C360B0A01484C59020001206A0101637DC60076040000026200620072650000070177010B0A01484C59020001206A0101F10477070100603201010101010104484C590177070100600100FF010101010B0A01484C59020001206A0177070100010800FF65001C010465011D5C36621E52FF6500DDC7560177070100020800FF65001C010465011D5C36621E52FF62000177070100100700FF0101621B52005302C80177070100200700FF0101622352FF6308F10177070100340700FF0101622352FF6308E40177070100480700FF0101622352FF6308EF01770701001F0700FF0101622152FE62260177070100330700FF0101622152FE62C90177070100470700FF0101622152FE62940177070100510701FF01016208520062790177070100510702FF01016208520062F00177070100510704FF010162085200620D017707010051070FFF01016208520063013F017707010051071AFF01016208520063014401770701000E0700FF0101622C52FF6301F30177070100000200000101010109312E30322E3030370177070100605A02010101010105413031410177070100600500FF0101010165001C010401010163522400760400000362006200726500000201710163EBF4000000001B1B1B1B1A03F406", "hex");
smlFile.parse(buffer);
expect(smlFile.valid).to.be.true;
});
});

});
9 changes: 7 additions & 2 deletions test/SmlMessage_Spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ var should = require('chai').should;
describe("SmlMessage", function() {

var SmlMessage = require("../lib/SmlMessage");
var SmlBuffer = require("../lib/SmlBuffer");
var Constants = require('../lib/Constants');

describe("SmlMessage()", function(){
Expand All @@ -25,7 +26,11 @@ describe("SmlMessage", function() {
describe("getSize()", function(){
});

describe("parse()", function(){
describe("parse()", function(){
it("should parse with valid crc", function () {
let buffer = Buffer.from("760400000162006200726500000101760101070000011D5C360B0A01484C59020001206A0101637DC6", "hex");
let smlMessage = SmlMessage.parse(new SmlBuffer(buffer));
expect(smlMessage.valid).to.be.true;
});
});

});