add tommost support

Author: frankie-zeng

package.json

@@ -14,7 +14,8 @@
       "can": [
         "kvaser",
         "peak",
-        "zlg"
+        "zlg",
+        "toomoss"
       ]
     }
   },

src/main/docan/can.ts

@@ -5,13 +5,15 @@ import path from "path";
 import { ZLG_CAN } from "./zlg";
 import { KVASER_CAN } from "./kvaser";
 import { SIMULATE_CAN } from "./simulate";
+import { TOOMOSS_CAN } from "./toomoss";
 import { CanBase, CanBaseInfo } from "../share/can";
 
 
 const libPath = path.dirname(dllLib)
 PEAK_TP.loadDllPath(libPath)
 ZLG_CAN.loadDllPath(libPath)
 KVASER_CAN.loadDllPath(libPath)
+TOOMOSS_CAN.loadDllPath(libPath)
 
 export function openCanDevice(canDevice: CanBaseInfo) {
     let canBase: CanBase | undefined
@@ -27,6 +29,8 @@ export function openCanDevice(canDevice: CanBaseInfo) {
         canBase = new KVASER_CAN(canDevice)
     } else if (canDevice.vendor == 'simulate') {
         canBase = new SIMULATE_CAN(canDevice)
+    } else if (canDevice.vendor == 'toomoss') {
+        canBase = new TOOMOSS_CAN(canDevice)
     }
 
     return canBase
@@ -44,6 +48,8 @@ export function getCanVersion(vendor: string) {
         return KVASER_CAN.getLibVersion()
     } else if (vendor === 'SIMULATE') {
         return SIMULATE_CAN.getLibVersion()
+    } else if (vendor === 'TOOMOSS') {
+        return TOOMOSS_CAN.getLibVersion()
     }
     else
     // #v-endif
@@ -64,6 +70,8 @@ export function getCanDevices(vendor: string) {
         return KVASER_CAN.getValidDevices()
     } else if (vendor === 'SIMULATE') {
         return SIMULATE_CAN.getValidDevices()
+    } else if (vendor === 'TOOMOSS') {
+        return TOOMOSS_CAN.getValidDevices()
     }
     else
     // #v-endif

src/main/docan/toomoss/index.ts

@@ -388,7 +388,10 @@ export class TOOMOSS_CAN extends CanBase {
                 DLC: data.length,
                 Flags: (msgType.brs ? 0x01 : 0) | (msgType.canfd ? 0x04 : 0)
             }).then((timestamp: number) => {
-                const ts=getTsUs()-this.startTime
+                if (this.tsOffset == undefined) {
+                    this.tsOffset = timestamp*10 - (getTsUs() - this.startTime)
+                }
+                const ts=timestamp*10-this.tsOffset
                 const message: CanMessage = {
                     device: this.info.name,
                     dir: 'OUT',

src/renderer/src/views/uds/components/config/node/canNode.vue

@@ -211,6 +211,15 @@ const configInfo: Record<CanVendor, any> = {
     preScaler: false,
     freq: false,
     zlgSpec: false
+  },
+  'toomoss': {
+    clock: true,
+    timeSeg1: true,
+    timeSeg2: true,
+    sjw: true,
+    preScaler: true,
+    freq: true,
+    zlgSpec: false
   }
 }
 
@@ -254,6 +263,11 @@ const clockList = computed(() => {
   } else if (props.vendor == 'kvaser') {
     return [
       { clock: '80', name: "80" },
+      { clock: '40', name: "40" },
+    ];
+  } else if (props.vendor == 'toomoss') {
+    return [
+     
       { clock: '40', name: "40" },
     ];
   }
@@ -294,7 +308,7 @@ f_clock=20000000,nom_brp=1,nom_tseg1=14,nom_tseg2=5,nom_sjw=5  sample point = (t
 */
 
 function getBaudrateSP(speed: CanBitrate, index: number) {
-  if (props.vendor == "peak" || props.vendor == 'kvaser') {
+  if (props.vendor == "peak" || props.vendor == 'kvaser'||props.vendor == 'toomoss') {
     let f_clock = Number(speed.clock || 80) * 1000000;
     if (index == 1) {
       f_clock = Number(data.value.bitrate.clock || 80) * 1000000;
@@ -354,10 +368,14 @@ const nameCheck = (rule: any, value: any, callback: any) => {
 };
 
 const bitrateCheck = (rule: any, value: any, callback: any) => {
-  if (props.vendor == "peak" || props.vendor == 'kvaser') {
+  if (props.vendor == "peak" || props.vendor == 'kvaser' || props.vendor == 'toomoss') {
     if (data.value.bitrate.clock == undefined) {
       callback(new Error("Please select clock"));
     }
+    //must be in clockList
+    if (!clockList.value.some(item => item.clock == data.value.bitrate.clock)) {
+      callback(new Error("Please select correct clock"));
+    }
     if ((data.value.bitrate.timeSeg1 + 1) < data.value.bitrate.timeSeg2) {
       callback(new Error("normal tseg1 must be greater than tseg2-1"));
     }
@@ -402,7 +420,7 @@ const bitrateCheck = (rule: any, value: any, callback: any) => {
         callback(new Error("data tseg2 must be between 1-16"));
       }
     }
-    if (props.vendor == 'kvaser') {
+    if (props.vendor == 'kvaser' || props.vendor == 'toomoss') {
       const calcFreq = Number(data.value.bitrate.clock || 40) * 1000000 / (data.value.bitrate.preScaler * (data.value.bitrate.timeSeg1 + data.value.bitrate.timeSeg2 + 1));
       if (calcFreq != data.value.bitrate.freq) {
         callback(new Error(`Please input correct frequency, calculated frequency is ${calcFreq}Hz`));

src/renderer/src/views/uds/components/hardware.vue

@@ -292,6 +292,15 @@ function buildTree() {
     }
     t.push(simulate)
     addSubTree('simulate', simulate)
+    const toomoss: tree = {
+        label: 'TOOMOSS',
+        vendor: 'toomoss',
+        append: false,
+        id: 'TOOMOSS',
+        children: []
+    }
+    t.push(toomoss)
+    addSubTree('toomoss', toomoss)
 
 
     tData.value = t