Commit 9815d214 authored by berge's avatar berge
Browse files

Fixed TimestampIts decoding issue in cam

parent d3a7316c

cam/ITS-Container.asn

+3 −2
Original line number Diff line number Diff line
@@ -412,7 +412,8 @@ SteeringWheelAngleValue ::= INTEGER {straight(0), onePointFiveDegreesToRight(-1) 


SteeringWheelAngleConfidence ::= INTEGER {equalOrWithinOnePointFiveDegree (1), outOfRange(126), unavailable(127)} (1..127)



TimestampIts ::= INTEGER {utcStartOf2004(0), oneMillisecAfterUTCStartOf2004(1)} (0..4398046511103)

TimestampIts ::= BIT STRING(SIZE(42))  -- units of milliseconds, 7 byte

--TimestampIts ::= INTEGER {utcStartOf2004(0), oneMillisecAfterUTCStartOf2004(1)} (0..4398046511103)



VehicleRole ::= ENUMERATED {default(0), publicTransport(1), specialTransport(2), dangerousGoods(3), roadWork(4), rescue(5), emergency(6), safetyCar(7), agriculture(8),commercial(9),military(10),roadOperator(11),taxi(12), reserved1(13), reserved2(14), reserved3(15)}

cam/README

+1 −0
Original line number Diff line number Diff line 
Changelog:

==========



2.1.0: Fixed TimestampIts decoding issue

2.0.0: Updated to EN 302 637-2 v1.3.2

1.0.0: Updated to EN 302 637-2 v1.3.0

0.0.1: Initial version.

cam/cam.cnf

+8 −1
Original line number Diff line number Diff line
@@ -14,8 +14,15 @@ UNALIGNED 
CAM



#.FN_BODY TimestampIts

  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index, 0U, G_GUINT64_CONSTANT(4398046511103), NULL, FALSE);

#  offset = dissect_per_constrained_integer_64b(tvb, offset, actx, tree, hf_index, 0U, G_GUINT64_CONSTANT(4398046511103), NULL, FALSE);

#.END

#

# Modify ASN.1

#

# TimestampIts ::= BIT STRING(SIZE(42))  -- units of milliseconds, 7 byte

# --TimestampIts ::= INTEGER {utcStartOf2004(0), oneMillisecAfterUTCStartOf2004(1)} (0..4398046511103)

#

#



#.FN_BODY DangerousGoodsExtended/companyName

  offset=dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, NULL);

cam/moduleinfo.h

+1 −1
Original line number Diff line number Diff line
@@ -13,5 +13,5 @@ 
#endif



/* Version number of package */

#define VERSION "2.0.0"

#define VERSION "2.1.0"

cam/moduleinfo.nmake

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ PACKAGE=cam 


# The version

MODULE_VERSION_MAJOR=2

MODULE_VERSION_MINOR=0

MODULE_VERSION_MINOR=1

MODULE_VERSION_MICRO=0

MODULE_VERSION_EXTRA=0