Commit 314babaf authored by mullers's avatar mullers
Browse files

changes due to Marben compiler

parent 10b552b3
Loading
Loading
Loading
Loading
+29 −19
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ DEFINITIONS AUTOMATIC TAGS ::=
BEGIN
BEGIN


IMPORTS
IMPORTS
ItsPduHeader, CauseCode, ReferencePosition, Speed, Heading, TimestampIts, StationID, VehicleIdentification 
ItsPduHeader, CauseCode, ReferencePosition, Speed, Heading, TimestampIts, StationID  
FROM ITS-Container {
FROM ITS-Container {
 itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1) 
 itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1) 
};
};
@@ -21,7 +21,7 @@ FROM ITS-Container {


TisTpgTransactionsPdu ::= SEQUENCE {
TisTpgTransactionsPdu ::= SEQUENCE {
	header ItsPduHeader, 
	header ItsPduHeader, 
	tisTpgTransaction tisTpgTransaction
	tisTpgTransaction TisTpgTransaction
}
}


TisTpgTransaction ::= CHOICE {
TisTpgTransaction ::= CHOICE {
@@ -45,7 +45,7 @@ TisTpgDRM ::= SEQUENCE {


TisTpgDRM-Management ::= SEQUENCE {
TisTpgDRM-Management ::= SEQUENCE {
 generationTime	TimestampIts,
 generationTime	TimestampIts,
 vehicleType UnecsType,
 vehicleType UNVehicleClassifcation,
 costumerContract CustomerContract OPTIONAL,
 costumerContract CustomerContract OPTIONAL,
 tisProfile	TisProfile, 
 tisProfile	TisProfile, 
 ... 
 ... 
@@ -90,7 +90,7 @@ TisTpgSRM ::= SEQUENCE {


TisTpgSRM-Management ::= SEQUENCE {
TisTpgSRM-Management ::= SEQUENCE {
 generationTime	TimestampIts,
 generationTime	TimestampIts,
 vehicleType UnecsType,
 vehicleType UNVehicleClassifcation,
 tpgStationID StationID, 
 tpgStationID StationID, 
 reservationStatus ReservationStatus,
 reservationStatus ReservationStatus,
 costumercontract CustomerContract OPTIONAL,
 costumercontract CustomerContract OPTIONAL,
@@ -171,13 +171,23 @@ TisTpgVDPM-Management ::= SEQUENCE {
 generationTime	TimestampIts,
 generationTime	TimestampIts,
 tisProfile	TisProfile	OPTIONAL,
 tisProfile	TisProfile	OPTIONAL,
 language Language,
 language Language,
 vehicleType UnecsType,
 vehicleType UNVehicleClassifcation,
 tyreTempCondition TyreTempCondition,
 tyreTempCondition TyreTempCondition,
 fillingStatus FillingStatus,
 fillingStatus FillingStatus,
 pairingID PairingID OPTIONAL,
 pairingID PairingID OPTIONAL,
 ...
 ...
}
}


VehicleSpecificData ::= SEQUENCE {
 currentVehicleConfiguration PressureConfiguration,
 frontLeftTyreData TyreData OPTIONAL,
 frontRightTyreData TyreData OPTIONAL,
 rearLeftTyreData TyreData OPTIONAL,
 rearRightTyreData TyreData OPTIONAL,
 spareTyreData TyreData OPTIONAL,
 ...
}

-- TisTpgEOFM
-- TisTpgEOFM


TisTpgEOFM ::= SEQUENCE {
TisTpgEOFM ::= SEQUENCE {
@@ -248,8 +258,6 @@ TyreData ::= SEQUENCE
	...	
	...	
}
}


VehicleType ::= StationType

TyreSidewallInformation ::= BIT STRING (SIZE (40)) 
TyreSidewallInformation ::= BIT STRING (SIZE (40)) 
		
		
TyreType ::= BIT STRING (SIZE (8))  
TyreType ::= BIT STRING (SIZE (8))  
@@ -280,8 +288,6 @@ ReservationStatus ::= ENUMERATED { reservationOK (0), noReservationService (1),


PairingID ::= INTEGER(0..9999)
PairingID ::= INTEGER(0..9999)


FillingStatus ::= ENUMERATED { fillingProcessFailed (0), fillingProcessCompleted (1) }

AppliedTyrePressures ::= SEQUENCE (SIZE(1..5)) OF AppliedTyrePressure
AppliedTyrePressures ::= SEQUENCE (SIZE(1..5)) OF AppliedTyrePressure


AppliedTyrePressure ::=  CHOICE {
AppliedTyrePressure ::=  CHOICE {
@@ -299,15 +305,14 @@ TpgStationData ::= SEQUENCE {
 address UTF8String(SIZE(1..128))  OPTIONAL,
 address UTF8String(SIZE(1..128))  OPTIONAL,
 phoneNumber PhoneNumber OPTIONAL,
 phoneNumber PhoneNumber OPTIONAL,
 digitalMap DigitalMap OPTIONAL,
 digitalMap DigitalMap OPTIONAL,
 openingDaysHours openingDaysHours OPTIONAL,
 openingDaysHours OpeningDaysHours OPTIONAL,
 bookingInfo BookingInfo OPTIONAL,
 bookingInfo BookingInfo OPTIONAL,
 availableTpgNumber AvailableTpgNumber OPTIONAL,
 availableTpgNumber AvailableTpgNumber OPTIONAL,
 cancellationCondition cancellationCondition OPTIONAL,
 cancellationCondition CancellationCondition OPTIONAL,
 ...
 ...
}
}


SearchRange ::= INTEGER(0..255)
SearchRange ::= INTEGER(0..255)
SearchCondition ::= ENUMERATED {nearest(0), quickest(1), paylessRoad(2), ... } SIZE((8))
TotalTpgStations ::= INTEGER(0..65535)
TotalTpgStations ::= INTEGER(0..65535)
TpgNotifContainer ::= SEQUENCE (SIZE(1..8)) OF TpgStationData
TpgNotifContainer ::= SEQUENCE (SIZE(1..8)) OF TpgStationData
DigitalMap ::= SEQUENCE (SIZE(1..256)) OF ReferencePosition
DigitalMap ::= SEQUENCE (SIZE(1..256)) OF ReferencePosition
@@ -315,13 +320,18 @@ TpgNumber ::= INTEGER(1..65535)
TpgProvider ::= UTF8String (SIZE(1..32))
TpgProvider ::= UTF8String (SIZE(1..32))
TpgLocation ::= ReferencePosition
TpgLocation ::= ReferencePosition
Accessibility ::= UTF8String (SIZE(1..32))
Accessibility ::= UTF8String (SIZE(1..32))
PhoneNumber NumericString (SIZE(1..16))
PhoneNumber ::= NumericString (SIZE(1..16))
OpeningDaysHours ::= UTF8String
OpeningDaysHours ::= UTF8String
BookingInfo ::= UTF8String
BookingInfo ::= UTF8String
AvailableTpgNumber ::= INTEGER(1..65535)
AvailableTpgNumber ::= INTEGER(1..65535)
CancellationCondition ::= UTF8String (SIZE(1..32))
CancellationCondition ::= UTF8String (SIZE(1..32))
TpgAutomation ::= BIT STRING  {fullAutomated(0), semiAutomated(1), manual(2), reserved (3)} (SIZE(4))
TpgAutomation ::= BIT STRING  {fullAutomated(0), semiAutomated(1), manual(2), reserved (3)} (SIZE(4))
FillingStatus ::= ENUMERATED {requestVehicleData(0), sendVehicleData(1), started(2), fillingProcessFailed (2), fillingProcessCompleted (3), ... } SIZE((8))
FillingStatus ::= INTEGER {requestVehicleData(0), sendVehicleData(1), started(2), fillingProcessFailed (3), fillingProcessCompleted (4) } (1..8)
NumberOfAppliedPressure ::= ENUMERATED {oneAppliedPressure(1), twoAppliedPressure (2), …} (1..5)
NumberOfAppliedPressure ::= INTEGER {oneAppliedPressure(1), twoAppliedPressure (2)} (1..5)
UNVehicleClassifcation ::= INTEGER {reserved(0), categoryL1(1), categoryL2(2), categoryL3(3), categoryL4(4), categoryL5(5), categoryL6(6), categoryL7(7), categoryL8(8)} (1..64)
SearchCondition ::= INTEGER {nearest(0), quickest(1), paylessRoad(2)} (1..8)
TisProfile ::= BIT STRING  {reserved(0),profileOne(1), profileTwo(2), profileThree(3)} (SIZE(8))
ReservationID ::= UTF8String (SIZE(1..32))
Language ::= BIT STRING (SIZE (10))


END
END
 No newline at end of file