Headers and Isobus
diff --git a/demo/Isobus.ttcn b/demo/Isobus.ttcn
index 0f7cc29..4ac98b8 100644
--- a/demo/Isobus.ttcn
+++ b/demo/Isobus.ttcn
@@ -11,7 +11,7 @@
// File: Isobus.ttcn
// Description: Encoder / Decoder for Isobus message frames
//
-// Revision R1A
+
module Isobus {
import from General_Types all
@@ -31,11 +31,6 @@
external function decode_CAN_frame_j1939mod(in octetstring data) return CAN_frame_j1939mod
with { extension "prototype(convert) decode(RAW)" }
-
-
-
-
-
const octetstring ISOBUS_PRIORITY_MASK := '1C000000'O;
const octetstring ISOBUS_RESERVED_MASK := '02000000'O;
const octetstring ISOBUS_DATAPAGE_MASK := '01000000'O;
@@ -95,15 +90,7 @@
type record CAN_frame_j1939 {
J1939 can_j1939,
AnyIsoBusPdu can_pdu
-}with {
- variant (can_pdu) "CROSSTAG(
- vt2ecu, can_j1939.pf = 'E6'O; //230
- ecu2vt, can_j1939.pf = 'E7'O; //231
- requestForAddressClaimed, can_j1939.pf = 'EA'O; //234
- cannotClaimSourceAddress, {can_j1939.pf = 'EE'O, can_j1939.ps = 'FF'O, can_j1939.sa = 'FE'O}; //238 all and conjuction needed!!!!!!
- addressClaimed, {can_j1939.pf = 'EE'O, can_j1939.ps = 'FF'O}; //238 all and conjuction needed!!!!!!
- commandedAddress, {can_j1939.pf = 'FE'O, can_j1939.ps = 'D8'O})" //254 all and conjuction needed!!!!!!
-}
+}with { variant "" }
type record CAN_frame_j1939mod {
@@ -153,32 +140,19 @@
}
function canid2j1939(in CAN_id p_can_id) return J1939 {
- var bitstring v_can_id_bitstring
- var Priority v_priority
- var BIT1 v_reserved // BIT1
- var BIT1 v_datapage // BIT1
- var OCT1 v_pduformat // OCT1
- var OCT1 v_pduspecifc // OCT1
- var OCT1 v_sourceaddress // OCT1
- var PGN v_pgn
+//---------------------------------------------------------------------------------------
+
+ var bitstring v_can_id_bitstring:= oct2bit(p_can_id)
var J1939 v_j1939
- v_can_id_bitstring := oct2bit(p_can_id)
- v_priority := substr(v_can_id_bitstring, 3, 3)
- v_reserved := v_can_id_bitstring[6]
- v_datapage := v_can_id_bitstring[7]
- v_pduformat := p_can_id[1] //(p_can_id and4b ISOBUS_PDUFORMAT_MASK) >> 2 // shift 16 bits = 2 octets
- v_pduspecifc := p_can_id[2] // (p_can_id and4b ISOBUS_PDUSPECIFIC_MASK) >> 1 // shift 8 bits = 1 octet
- v_sourceaddress := p_can_id[3] //(p_can_id and4b ISOBUS_SOURCEADDRESS_MASK)
-
- if (oct2int(v_pduformat) < 240) {
- v_pgn := bit2int(v_reserved)*2*256*256 + bit2int(v_datapage)*256 *256 + oct2int(v_pduformat)*256
-
- } else {
- v_pgn := bit2int(v_reserved)*2*256*256 + bit2int(v_datapage)*256 *256 + oct2int(v_pduformat)*256 + oct2int(v_pduspecifc)
- }
- v_j1939 := {/*pgn := v_pgn, */prio := v_priority, res := v_reserved, dp := v_datapage, pf := v_pduformat, ps := v_pduspecifc, sa := v_sourceaddress}
- return v_j1939
+ v_j1939.prio :=substr(v_can_id_bitstring, 0, 6); //3 ,3
+ v_j1939.res :=v_can_id_bitstring[6];
+ v_j1939.dp :=v_can_id_bitstring[7];
+ v_j1939.pf :=p_can_id[1];//(p_can_id and4b ISOBUS_PDUFORMAT_MASK) >> 2 // shift 16 bits = 2 octets
+ v_j1939.ps :=p_can_id[2];// (p_can_id and4b ISOBUS_PDUSPECIFIC_MASK) >> 1 // shift 8 bits = 1 octet
+ v_j1939.sa :=p_can_id[3];//(p_can_id and4b ISOBUS_SOURCEADDRESS_MASK)
+
+ return v_j1939
}
//********************************************************************************-
diff --git a/demo/IsobusCMMessageTypes.ttcn b/demo/IsobusCMMessageTypes.ttcn
index 2deddd6..276916e 100644
--- a/demo/IsobusCMMessageTypes.ttcn
+++ b/demo/IsobusCMMessageTypes.ttcn
@@ -1,3 +1,15 @@
+/* Copyright (c) 2010, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Michael Josenhans
+******************************************************************************/
+
+
+
module IsobusCMMessageTypes {
import from General_Types all
import from IsobusMessageTypes all
diff --git a/demo/IsobusMessageTypes.ttcn b/demo/IsobusMessageTypes.ttcn
index 4742290..d44a57b 100644
--- a/demo/IsobusMessageTypes.ttcn
+++ b/demo/IsobusMessageTypes.ttcn
@@ -1,7 +1,12 @@
-/*
+/* Copyright (c) 2010, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
* Contributors:
* Michael Josenhans
-*/
+******************************************************************************/
module IsobusMessageTypes {
diff --git a/demo/IsobusNMMessageTypes.ttcn b/demo/IsobusNMMessageTypes.ttcn
index aea1481..2e293eb 100644
--- a/demo/IsobusNMMessageTypes.ttcn
+++ b/demo/IsobusNMMessageTypes.ttcn
@@ -1,7 +1,12 @@
-/*
+/* Copyright (c) 2010, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
* Contributors:
* Michael Josenhans
-*/
+******************************************************************************/
module IsobusNMMessageTypes {
diff --git a/demo/IsobusVTMessageTypes.ttcn b/demo/IsobusVTMessageTypes.ttcn
index aab197d..7dac40c 100644
--- a/demo/IsobusVTMessageTypes.ttcn
+++ b/demo/IsobusVTMessageTypes.ttcn
@@ -1,3 +1,12 @@
+/* Copyright (c) 2010, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Michael Josenhans
+******************************************************************************/
module IsobusVTMessageTypes {
import from General_Types all
diff --git a/demo/Isobus_Templates.ttcn b/demo/Isobus_Templates.ttcn
index 7b7d461..aadca7f 100644
--- a/demo/Isobus_Templates.ttcn
+++ b/demo/Isobus_Templates.ttcn
@@ -1,3 +1,13 @@
+/* Copyright (c) 2010, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Michael Josenhans
+******************************************************************************/
+
module Isobus_Templates {
import from IsobusMessageTypes all
diff --git a/demo/Isobustest.ttcn b/demo/Isobustest.ttcn
index 2db4c23..5938051 100644
--- a/demo/Isobustest.ttcn
+++ b/demo/Isobustest.ttcn
@@ -11,7 +11,6 @@
// File: Isobustest.ttcn
// Description: Encoder / Decoder for Isobus message frames
//
-// Revision R1A
module Isobustest {
diff --git a/demo/Isotp.ttcn b/demo/Isotp.ttcn
index 2db472a..b4349d6 100644
--- a/demo/Isotp.ttcn
+++ b/demo/Isotp.ttcn
@@ -13,7 +13,7 @@
// File: Isotp.ttcn
// Description: Isotp base
//
-// Revision R1A
+
module Isotp {
diff --git a/demo/Isotptest.ttcn b/demo/Isotptest.ttcn
index 7708e7d..51fc61d 100644
--- a/demo/Isotptest.ttcn
+++ b/demo/Isotptest.ttcn
@@ -1,3 +1,13 @@
+/* Copyright (c) 2010, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Michael Josenhans
+******************************************************************************/
+
module Isotptest {
import from General_Types all
diff --git a/demo/J1939.ttcn b/demo/J1939.ttcn
index 5d5f4ff..9cb9ef7 100644
--- a/demo/J1939.ttcn
+++ b/demo/J1939.ttcn
@@ -1,3 +1,13 @@
+/* Copyright (c) 2010, 2016 Ericsson AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* Michael Josenhans
+******************************************************************************/
+
module J1939 {
import from General_Types all;
diff --git a/demo/SocketCAN.cfg b/demo/SocketCAN.cfg
index fc6c6cc..07e237b 100644
--- a/demo/SocketCAN.cfg
+++ b/demo/SocketCAN.cfg
@@ -9,7 +9,7 @@
# Michael Josenhans
##############################################################################
-// Revision R1A
+
[LOGGING]
FileMask := LOG_ALL | DEBUG | MATCHING
diff --git a/demo/SocketCAN_BCM_test.ttcn b/demo/SocketCAN_BCM_test.ttcn
index 8843028..a28cc23 100644
--- a/demo/SocketCAN_BCM_test.ttcn
+++ b/demo/SocketCAN_BCM_test.ttcn
@@ -11,7 +11,6 @@
// File: SocketCAN_BCM_test.ttcn
// Description: SocketCAN testcases for CAN_BCM frames
//
-// Revision R1A
module SocketCAN_BCM_test {
diff --git a/demo/SocketCAN_RAW_test.ttcn b/demo/SocketCAN_RAW_test.ttcn
index e738f3c..4745b4c 100644
--- a/demo/SocketCAN_RAW_test.ttcn
+++ b/demo/SocketCAN_RAW_test.ttcn
@@ -11,7 +11,7 @@
// File: SocketCAN_RAW_test.ttcn
// Description: SocketCAN testcases for CAN_RAW frames
//
-// Revision R1A
+
module SocketCAN_RAW_test
diff --git a/demo/SocketCAN_broken_tests.cfg b/demo/SocketCAN_broken_tests.cfg
index 377b773..f5990d9 100644
--- a/demo/SocketCAN_broken_tests.cfg
+++ b/demo/SocketCAN_broken_tests.cfg
@@ -9,7 +9,7 @@
# Michael Josenhans
##############################################################################
-// Revision R1A
+
[LOGGING]
FileMask := LOG_ALL
diff --git a/demo/SocketCANtest.ttcn b/demo/SocketCANtest.ttcn
index b78727a..e6d2599 100644
--- a/demo/SocketCANtest.ttcn
+++ b/demo/SocketCANtest.ttcn
@@ -11,7 +11,7 @@
// File: SocketCANtest.ttcn
// Description: SocketCAN port type test
//
-// Revision R1A
+
module SocketCANtest {
diff --git a/demo/initscript.sh b/demo/initscript.sh
index b9a0550..dcdd192 100755
--- a/demo/initscript.sh
+++ b/demo/initscript.sh
@@ -9,7 +9,7 @@
# Michael Josenhans
##############################################################################
-# Revision R1A
+
#!/bin/bash
