Skip to content

Commit

Permalink
Added ReadByDid, first step.
Browse files Browse the repository at this point in the history
  • Loading branch information
MyHomeMyData committed Dec 1, 2023
1 parent 8a4d7c5 commit 8592124
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 5 deletions.
7 changes: 3 additions & 4 deletions lib/canCollect.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class collect {
this.config = config;
this.storage = new storageCol.storage(this.config);
this.ts = {};
this.dids = null;
this.didwatch = 7777;
this.data = {
'len' : 0,
Expand All @@ -19,7 +18,7 @@ class collect {
}

async initStates(ctx) {
this.storage.initStates(ctx);
await this.storage.initStates(ctx);
}

async msgCollect(ctx, msg) {
Expand All @@ -45,12 +44,12 @@ class collect {
if (this.data.did == this.didwatch) { ctx.log.debug('D0='+String(this.data.D0)+'; candata='+JSON.stringify(this.data.databytes)); }
} else {
// no more data
if ((this.dids == null) || (this.data.did in this.dids) ) {
if ((this.config.dids == null) || (this.data.did in this.config.dids) ) {
if (this.data.did == this.didwatch) {
ctx.log.debug(JSON.stringify(this.data));
}
this.data.collecting = false;
this.storage.decodeDataCAN(ctx, this.data.did, this.data.databytes.slice(0,this.data.len));
await this.storage.decodeDataCAN(ctx, this.data.did, this.data.databytes.slice(0,this.data.len));
this.ts[this.data.did] = tsNow;
}
}
Expand Down
152 changes: 152 additions & 0 deletions lib/canUds.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@

const storageCol = require('./storage');

class uds {
constructor(config) {
this.config = config;
this.storage = new storageCol.storage(this.config);
this.states = ['standby','waitForFF','waitForCF'];
this.frameFC = [0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00];
this.readByDidProt = {
'idTx' : this.config.canID,
'idRx' : Number(this.config.canID) + 0x10,
'PCI' : 0x03, // Protocol Control Information
'SIDtx' : 0x22, // Service ID transmit
'SIDrx' : 0x62, // Service ID receive
'SIDnr' : 0x7F, // SID negative response
'FC' : [0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00], // Flow Control frame
};
this.data = {
'len' : 0,
'timestamp' : 0,
'databytes' : [],
'did' : 0,
'state' : this.states[0],
'D0' : 0x21
};
this.cmndQueueId = 'uds.0x'+Number(this.config.canID).toString(16)+'.cmndQueue';
}

async initStates(ctx) {
await this.storage.initStates(ctx);
await ctx.setObjectNotExistsAsync(this.cmndQueueId, {
type: 'state',
common: {
name: 'Command queue for UDS communication',
type: 'json',
role: 'state',
read: true,
write: true,
},
native: {},
});
await ctx.setStateAsync(this.cmndQueueId, JSON.stringify([]), true);
}

pushCmnd(ctx, mode, dids) {
const cmnds = JSON.parse(ctx.getState(this.cmndQueueId).val);
cmnds.push({'mode':mode, 'dids': dids});
ctx.setState(JSON.stringify(cmnds), true);
}

initialRequestSF(did) {
return [this.readByDidProt.PCI, this.readByDidProt.SIDtx,((did >> 8) & 0xFF),(did & 0xFF),0x00,0x00,0x00,0x00];
}

canMessage(canID, frame) {
return { id: canID,ext: false, rtr: false,data: Buffer.from(frame) };
}

async sendFrame(frame) {
await this.config.channel.send(this.canMessage(this.config.canID,frame));
}

async readByDid(ctx, did) {
this.data.state = this.states[1]; // 'waitForFF'
this.data.did = did;
await this.sendFrame(this.initialRequestSF(did));
}

async msgUds(ctx, msg) {
const candata = msg.data.toJSON().data;
const canid = msg.id;

//ctx.log.debug('msgUds: '+String(canid)+' '+JSON.stringify(candata));

switch (this.data.state) {
case 'waitForFF':
if ( (candata[0] == 0x03) && (candata[1] == 0x7F) && (candata[2] == this.readByDidProt.SIDtx) ) {
// Negative response
this.data.state = this.states[0];
ctx.log.error('msgUds(): Negative response. Code=0x'+Number(candata[3]).toString(16));
break;
}
if ( (candata.length == 8) && ((candata[0] >> 4) == 0) && (candata[1] == this.readByDidProt.SIDrx) ) {
// Single-frame communication
const didRx = candata[3]+256*candata[2];
if (didRx == this.data.did) {
// Did does match
this.data.len = candata[0]-3;
this.data.databytes = candata.slice(4,4+this.data.len);
await this.storage.decodeDataCAN(ctx, this.data.did, this.data.databytes.slice(0,this.data.len));
this.data.state = this.states[0]; // 'standby'
break;
} else {
// Did does not match
this.data.state = this.states[0]; // 'standby'
ctx.log.error('msgUds(): Did mismatch');
break;
}
}
if ( (candata.length == 8) && ((candata[0] >> 4) == 1) && (candata[2] == this.readByDidProt.SIDrx) ) {
// Multiframe communication
ctx.log.debug('msgUds FF: '+String(canid)+' '+JSON.stringify(candata));
const didRx = candata[4]+256*candata[3];
if (didRx == this.data.did) {
// Did does match
this.data.len = (candata[0] & 0x0F)*256 + candata[1] - 3;
ctx.log.debug('msgUds FF: data.len='+String(this.data.len));
this.data.databytes = candata.slice(5,4+this.data.len);
this.data.D0 = 0x21;
await this.sendFrame(this.frameFC); // Send request for Consecutive Frames
this.data.state = this.states[2]; // 'waitForCF'
break;
} else {
// Did does not match
this.data.state = this.states[0];
ctx.log.error('msgUds(): Did mismatch. Expected='+String(this.data.did)+'; Received='+String(didRx));
break;
}
}
ctx.log.error('msgUds(): Bad frame: '+JSON.stringify(candata));
this.data.state = this.states[0]; // 'standby'
break;

case 'waitForCF':
if ( (candata.length == 8) && (candata[0] == this.data.D0) ) {
// Correct code for Consecutive Frame
ctx.log.debug('msgUds CF: '+String(canid)+' '+JSON.stringify(candata));
this.data.databytes = this.data.databytes.concat(candata.slice(1));
if (this.data.databytes.length >= this.data.len) {
// All data received
this.storage.decodeDataCAN(ctx, this.data.did, this.data.databytes.slice(0,this.data.len));
} else {
// More data to come
this.data.D0 += 1;
if (this.data.D0 > 0x2F) {
this.data.D0 = 0x20;
}
}
}
break;

default:
ctx.log.error('msgUds(): Bad state value');
this.data.state = this.states[0];
}
}
}

module.exports = {
uds
};
3 changes: 2 additions & 1 deletion lib/storage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class storage {
},
native: {},
});
await ctx.setStateAsync(stateId, JSON.stringify(obj), true);
ctx.log.debug(String(stateId)+': '+JSON.stringify(obj));
//await ctx.setStateAsync(stateId, JSON.stringify(obj), true);
}
async function storeObjectTree(ctx, stateId, obj) {
if (typeof(obj) == 'object') {
Expand Down

0 comments on commit 8592124

Please sign in to comment.