Commit e89a65da authored by garciay's avatar garciay
Browse files

Update TITAN patche

parent 36544377
Index: AtsCAM/ItsCam_TpFunctions.ttcn Index: AtsCAM/ItsCam_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2622) --- AtsCAM/ItsCam_TpFunctions.ttcn (revision 2627)
+++ AtsCAM/ItsCam_TpFunctions.ttcn (working copy) +++ AtsCAM/ItsCam_TpFunctions.ttcn (working copy)
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
import from LibItsCommon_Templates all; import from LibItsCommon_Templates all;
...@@ -10,6 +10,15 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -10,6 +10,15 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
// LibItsCam // LibItsCam
import from LibItsCam_TestSystem all; import from LibItsCam_TestSystem all;
@@ -401,7 +402,7 @@
}
for (v_cnt:=0; v_cnt<lengthof(p_utTriggers); v_cnt:=v_cnt+1) {
- f_utTriggerEvent(p_utTriggers[v_cnt]);
+ f_utTriggerEvent(valueof(p_utTriggers[v_cnt]));
tc_ac.start;
alt {
@@ -557,7 +558,9 @@ @@ -557,7 +558,9 @@
f_CAM_MSD_INA_BV_01( f_CAM_MSD_INA_BV_01(
"Brake pedal being deactivated", "Brake pedal being deactivated",
...@@ -177,7 +186,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn ...@@ -177,7 +186,7 @@ Index: AtsCAM/ItsCam_TpFunctions.ttcn
// Postamble // Postamble
Index: AtsDENM/ItsDenm_TpFunctions.ttcn Index: AtsDENM/ItsDenm_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsDENM/ItsDenm_TpFunctions.ttcn (revision 2622) --- AtsDENM/ItsDenm_TpFunctions.ttcn (revision 2627)
+++ AtsDENM/ItsDenm_TpFunctions.ttcn (working copy) +++ AtsDENM/ItsDenm_TpFunctions.ttcn (working copy)
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
import from LibItsCommon_TypesAndValues all; import from LibItsCommon_TypesAndValues all;
...@@ -189,7 +198,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn ...@@ -189,7 +198,7 @@ Index: AtsDENM/ItsDenm_TpFunctions.ttcn
import from DENM_PDU_Descriptions language "ASN.1:1997" all; import from DENM_PDU_Descriptions language "ASN.1:1997" all;
Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (revision 2622) --- AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (revision 2627)
+++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (working copy) +++ AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn (working copy)
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
import from LibItsGeoNetworking_TypesAndValues all; import from LibItsGeoNetworking_TypesAndValues all;
...@@ -346,7 +355,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn ...@@ -346,7 +355,7 @@ Index: AtsGeoNetworking/ItsGeoNetworking_TpFunctions.ttcn
f_selfOrClientSyncAndVerdict(c_tbDone, e_error); f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
Index: AtsIVIM/ItsIvim_TpFunctions.ttcn Index: AtsIVIM/ItsIvim_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsIVIM/ItsIvim_TpFunctions.ttcn (revision 2622) --- AtsIVIM/ItsIvim_TpFunctions.ttcn (revision 2627)
+++ AtsIVIM/ItsIvim_TpFunctions.ttcn (working copy) +++ AtsIVIM/ItsIvim_TpFunctions.ttcn (working copy)
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
import from LibItsCommon_Pixits all; import from LibItsCommon_Pixits all;
...@@ -366,7 +375,7 @@ Index: AtsIVIM/ItsIvim_TpFunctions.ttcn ...@@ -366,7 +375,7 @@ Index: AtsIVIM/ItsIvim_TpFunctions.ttcn
Index: AtsMapemSpatem/ItsMapem_TpFunctions.ttcn Index: AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsMapemSpatem/ItsMapem_TpFunctions.ttcn (revision 2622) --- AtsMapemSpatem/ItsMapem_TpFunctions.ttcn (revision 2627)
+++ AtsMapemSpatem/ItsMapem_TpFunctions.ttcn (working copy) +++ AtsMapemSpatem/ItsMapem_TpFunctions.ttcn (working copy)
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
import from ITS_Container language "ASN.1:1997" all; import from ITS_Container language "ASN.1:1997" all;
...@@ -379,7 +388,7 @@ Index: AtsMapemSpatem/ItsMapem_TpFunctions.ttcn ...@@ -379,7 +388,7 @@ Index: AtsMapemSpatem/ItsMapem_TpFunctions.ttcn
import from LibItsMapemSpatem_TestSystem all; import from LibItsMapemSpatem_TestSystem all;
Index: AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn Index: AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn
=================================================================== ===================================================================
--- AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn (revision 2622) --- AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn (revision 2627)
+++ AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn (working copy) +++ AtsMapemSpatem/ItsSpatem_TpFunctions.ttcn (working copy)
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
import from ITS_Container language "ASN.1:1997" all; import from ITS_Container language "ASN.1:1997" all;
...@@ -6035,7 +6044,7 @@ Index: AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn ...@@ -6035,7 +6044,7 @@ Index: AtsRSUsSimulator/ItsRSUSimulator_PicsInitConsts.ttcn
\ No newline at end of file \ No newline at end of file
Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
=================================================================== ===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn (revision 2622) --- AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn (working copy) +++ AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn (working copy)
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
import from EVCSN_PDU_Descriptions language "ASN.1:1997" all; import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
...@@ -6057,7 +6066,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn ...@@ -6057,7 +6066,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Functions.ttcn
// Update poi status // Update poi status
Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
=================================================================== ===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (revision 2622) --- AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (working copy) +++ AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn (working copy)
@@ -14,9 +14,12 @@ @@ -14,9 +14,12 @@
import from EVCSN_PDU_Descriptions language "ASN.1:1997" all; import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
...@@ -7600,7 +7609,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn ...@@ -7600,7 +7609,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Pics.ttcn
} // End of group poimEvents } // End of group poimEvents
Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
=================================================================== ===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (revision 2622) --- AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (working copy) +++ AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (working copy)
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
...@@ -7656,7 +7665,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn ...@@ -7656,7 +7665,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
} // End of group evcsnTemplates } // End of group evcsnTemplates
Index: AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn Index: AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
=================================================================== ===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (revision 2622) --- AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (working copy) +++ AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (working copy)
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
*/ */
...@@ -7678,7 +7687,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn ...@@ -7678,7 +7687,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
var ThreeDLocation v_location; var ThreeDLocation v_location;
Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn
=================================================================== ===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (revision 2622) --- AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (working copy) +++ AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (working copy)
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
...@@ -7700,7 +7709,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn ...@@ -7700,7 +7709,7 @@ Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn
*/ */
Index: AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn Index: AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn
=================================================================== ===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (revision 2622) --- AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (working copy) +++ AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (working copy)
@@ -13,7 +13,8 @@ @@ -13,7 +13,8 @@
import from IVI language "ASN.1:1997" all; import from IVI language "ASN.1:1997" all;
......
Index: AddGrpC.asn Index: EV-RSR/EV_RechargingSpotReservation_PDU_Descriptions.asn
=================================================================== ===================================================================
--- AddGrpC.asn (nonexistent) --- EV-RSR/EV_RechargingSpotReservation_PDU_Descriptions.asn (nonexistent)
+++ AddGrpC.asn (working copy) +++ EV-RSR/EV_RechargingSpotReservation_PDU_Descriptions.asn (working copy)
@@ -0,0 +1,157 @@
+EV-RechargingSpotReservation-PDU-Descriptions {
+ itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (101556) ev-rsr (4) version (1)
+}
+
+DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+IMPORTS
+ ItsPduHeader FROM ITS-Container {
+ itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1)
+};
+
+EV-RSR ::= SEQUENCE {
+ header ItsPduHeader,
+ messageBody EV-RSR-MessageBody
+}
+
+EV-RSR-MessageBody ::= CHOICE {
+ preReservationRequestMessage PreReservationRequestMessage,
+ preReservationResponseMessage PreReservationResponseMessage,
+ reservationRequestMessage ReservationRequestMessage,
+ reservationResponseMessage ReservationResponseMessage,
+ cancellationRequestMessage CancellationRequestMessage,
+ cancellationResponseMessage CancellationResponseMessage,
+ updateRequestMessage UpdateRequestMessage,
+ updateResponseMessage UpdateResponseMessage,
+...
+}
+
+PreReservationRequestMessage ::= SEQUENCE {
+ evse-ID EVSE-ID,
+ arrivalTime TimestampUTC,
+ departureTime TimestampUTC OPTIONAL,
+ rechargingType RechargingType,
+ batteryType BatteryType OPTIONAL,
+ ...
+}
+
+PreReservationResponseMessage ::= SEQUENCE {
+ preReservation-ID PreReservation-ID,
+ availabilityStatus AvailabilityStatus,
+ preReservationExpirationTime TimestampUTC,
+ supportedPaymentTypes SupportedPaymentTypes,
+ ...
+}
+
+ReservationRequestMessage ::= SEQUENCE {
+ currentTime TimestampUTC,
+ preReservation-ID PreReservation-ID,
+ arrivalTime TimestampUTC,
+ departureTime TimestampUTC OPTIONAL,
+ eAmount EAmount,
+ eAmountMin EAmount,
+ paymentType PaymentType,
+ payment-ID Payment-ID,
+ secondPayment-ID Payment-ID OPTIONAL,
+ pairing-ID Pairing-ID OPTIONAL,
+ ...
+}
+
+ReservationResponseMessage ::= SEQUENCE {
+ reservationResponseCode ReservationResponseCode,
+ reservation-ID Reservation-ID OPTIONAL,
+ reservation-Password Reservation-Password OPTIONAL,
+ stationDetails StationDetails OPTIONAL,
+ chargingSpotLabel ChargingSpotLabel OPTIONAL,
+ expirationTime TimestampUTC,
+ freeCancelTimeLimit TimestampUTC OPTIONAL,
+ ...
+}
+
+CancellationRequestMessage ::= SEQUENCE {
+ reservation-ID Reservation-ID,
+ reservation-Password Reservation-Password,
+ currentTime TimestampUTC,
+ ...
+}
+
+CancellationResponseMessage ::= SEQUENCE {
+ reservation-ID Reservation-ID,
+ cancellationResponseCode CancellationResponseCode,
+ ...
+}
+
+UpdateRequestMessage ::= SEQUENCE {
+ reservation-ID Reservation-ID,
+ reservation-Password Reservation-Password,
+ updatedArrivalTime TimestampUTC,
+ updatedDepartureTime TimestampUTC,
+ ...
+}
+
+UpdateResponseMessage ::= SEQUENCE {
+ reservation-ID Reservation-ID,
+ updateResponseCode UpdateResponseCode,
+ chargingSpotLabel ChargingSpotLabel OPTIONAL,
+ ...
+}
+
+
+
+AvailabilityStatus ::= ENUMERATED { available, no-free-capacity }
+
+BatteryType ::= UTF8String (SIZE(1..16))
+
+CancellationResponseCode ::= ENUMERATED { ok, unknown-Reservation-ID, mismatching-Reservation-Password }
+
+ChargingSpotLabel ::= UTF8String (SIZE(1..4))
+
+ContractID ::= UTF8String (SIZE(1..24))
+
+EAmount ::= INTEGER { oneWh(1) } (1..500000)
+
+ChargingPower ::= INTEGER { oneW(1) } (1..200000)
+
+EVSE-ID ::= OCTET STRING (SIZE(1..32))
+
+ExternalIdentificationMeans ::= UTF8String (SIZE(1..24))
+
+Pairing-ID ::= VisibleString (SIZE(1..64))
+
+PaymentType ::= ENUMERATED {contract, externalIdentification}
+
+Payment-ID ::= CHOICE {
+ contractID ContractID,
+ externalIdentificationMeans ExternalIdentificationMeans
+}
+
+RechargingType ::= SEQUENCE {
+ rechargingMode RechargingMode,
+ powerSource PowerSource
+}
+
+RechargingMode ::= INTEGER { mode1(0), mode2(1), mode3(2), mode4(3), quickDrop(8), inductiveChargingWhileStationary(12), inductiveChargingWhileDriving(14) } (0..15)
+
+PowerSource::= INTEGER { notApplicable(0), ac1Phase(1), ac2Phase(2), ac3Phase(3), dcc(4), chaDeMo(5) } (0..7)
+ReservationResponseCode ::= ENUMERATED {ok, invalid-EVSE-ID, payment-type-not-supported, payment-error, authentication-error, insufficient-power-availability }
+
+Reservation-ID ::= VisibleString (SIZE(8))
+
+PreReservation-ID ::= Reservation-ID
+
+Reservation-Password ::= VisibleString (SIZE(8))
+
+
+StationDetails ::= UTF8String (SIZE(1..32))
+
+SupportedPaymentTypes ::= BIT STRING { contract(0), externalIdentification (1) } (SIZE(2))
+
+TimestampUTC ::= INTEGER { utcStartOf2013(0), oneSecondAfterUTCStartOf2013(1) }
+
+UpdateResponseCode ::= ENUMERATED { ok, unknown-Reservation-ID, mismatching-Reservation-Password, invalid-Arrival-Time, invalid-Departure-Time }
+
+StatusResponseCode ::= ENUMERATED { charging-Spot-Occupied, charging-Spot-Unoccupied, charging-Ongoing, reservation-Limit-Exceeded, reservation-Cancelled, unknown-Reservation-ID, expired-Reservation-ID }
+
+END
\ No newline at end of file
Index: EVCSN/EVCSN_PDU_Descriptions.asn
===================================================================
--- EVCSN/EVCSN_PDU_Descriptions.asn (nonexistent)
+++ EVCSN/EVCSN_PDU_Descriptions.asn (working copy)
@@ -0,0 +1,102 @@
+-- Point of Interest (POI) notification for charging spot
+-- for electric vehicle
+-- EVCSN Message definition
+-- ASN.1 Start Definition
+
+EVCSN-PDU-Descriptions {
+itu-t (0) identified-organization (4) etsi (0) itsDomain (5)
+wg1 (1) ts (101556) evcsn (1) version (1)
+}
+
+DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+IMPORTS
+ ItsPduHeader,
+ StationID,
+ TimestampIts,
+ ReferencePosition
+FROM ITS-Container {
+ itu-t (0) identified-organization (4) etsi (0) itsDomain (5) wg1 (1) ts (102894) cdd (2) version (1)
+};
+
+-- Root Message PDU: EvcsnPdu
+
+EvcsnPdu ::= SEQUENCE {
+ header ItsPduHeader,
+ evcsn EVChargingSpotNotificationPOIMessage
+}
+
+EVChargingSpotNotificationPOIMessage ::= SEQUENCE {
+ poiHeader ItsPOIHeader, -- Specific POI Message Header
+ evcsnData ItsEVCSNData -- Electric Vehicle Charging Spot Data Elements
+}
+
+ItsPOIHeader ::= SEQUENCE {
+ poiType POIType, -- set to "EV charging station POI ID = 1"
+ timeStamp TimestampIts,
+ relayCapable BOOLEAN
+}
+
+
+ItsEVCSNData ::= SEQUENCE {
+ totalNumberOfStations NumberStations,
+ chargingStationsData SEQUENCE (SIZE(1..256)) OF ItsChargingStationData
+}
+
+ItsChargingStationData ::= SEQUENCE {
+ chargingStationID StationID,
+ utilityDistributorId UTF8String (SIZE(1..32)) OPTIONAL,
+ providerID UTF8String (SIZE(1..32)) OPTIONAL,
+ chargingStationLocation ReferencePosition,
+ address UTF8String OPTIONAL,
+ phoneNumber NumericString (SIZE(1..16)) OPTIONAL,
+ accessibility UTF8String (SIZE(1..32)),
+ digitalMap DigitalMap OPTIONAL,
+ openingDaysHours UTF8String,
+ pricing UTF8String,
+ bookingContactInfo UTF8String OPTIONAL,
+ payment UTF8String OPTIONAL,
+ chargingSpotsAvailable ItsChargingSpots,
+ ...
+}
+
+
+ItsChargingSpots ::= SEQUENCE (SIZE(1..16)) OF ItsChargingSpotDataElements
+
+
+ItsChargingSpotDataElements ::= SEQUENCE {
+ type ChargingSpotType,
+ evEquipmentID UTF8String OPTIONAL,
+ typeOfReceptacle TypeOfReceptacle,
+ energyAvailability UTF8String,
+ parkingPlacesData ParkingPlacesData OPTIONAL
+}
+
+DigitalMap ::= SEQUENCE (SIZE(1..256)) OF ReferencePosition
+
+ChargingSpotType ::= BIT STRING {
+ standardChargeMode1(0),
+ standardChargeMode2(1),
+ standardOrFastChargeMode3(2),
+ fastChargeWithExternalCharger(3),
+ quickDrop(8),
+ inductiveChargeWhileStationary(12),
+ inductiveChargeWhileDriving(14)
+}
+
+TypeOfReceptacle ::= BIT STRING
+
+ParkingPlacesData ::= SEQUENCE (SIZE(1..4)) OF SpotAvailability
+
+SpotAvailability ::= SEQUENCE {
+ maxWaitingTimeMinutes INTEGER (0..1400), -- 0 if available or max waiting
+ -- time (minutes)
+ blocking BOOLEAN -- true if the spot can be blocked
+}
+
+POIType ::= INTEGER(0..65535)
+NumberStations ::= INTEGER(1..256)
+
+END
\ No newline at end of file
Index: IS/AddGrpC.asn
===================================================================
--- IS/AddGrpC.asn (nonexistent)
+++ IS/AddGrpC.asn (working copy)
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
+-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^- +-- ^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-
+-- +--
...@@ -115,7 +386,7 @@ Index: AddGrpC.asn ...@@ -115,7 +386,7 @@ Index: AddGrpC.asn
+ +
+END +END
Property changes on: AddGrpC.asn Property changes on: IS/AddGrpC.asn
___________________________________________________________________ ___________________________________________________________________
Added: svn:eol-style Added: svn:eol-style
## -0,0 +1 ## ## -0,0 +1 ##
...@@ -129,10 +400,10 @@ Added: svn:mime-type ...@@ -129,10 +400,10 @@ Added: svn:mime-type
## -0,0 +1 ## ## -0,0 +1 ##
+text/plain +text/plain
\ No newline at end of property \ No newline at end of property
Index: AddGrpC_noCircular.asn Index: IS/AddGrpC_noCircular.asn
=================================================================== ===================================================================
--- AddGrpC_noCircular.asn (nonexistent) --- IS/AddGrpC_noCircular.asn (nonexistent)
+++ AddGrpC_noCircular.asn (working copy) +++ IS/AddGrpC_noCircular.asn (working copy)
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+--FIXME RGY moved here from file SPAT_MAP_ISO_TS_19091.asn +--FIXME RGY moved here from file SPAT_MAP_ISO_TS_19091.asn
+ +
...@@ -165,7 +436,7 @@ Index: AddGrpC_noCircular.asn ...@@ -165,7 +436,7 @@ Index: AddGrpC_noCircular.asn
+ +
+END +END
Property changes on: AddGrpC_noCircular.asn Property changes on: IS/AddGrpC_noCircular.asn
___________________________________________________________________ ___________________________________________________________________
Added: svn:eol-style Added: svn:eol-style
## -0,0 +1 ## ## -0,0 +1 ##
...@@ -179,10 +450,10 @@ Added: svn:mime-type ...@@ -179,10 +450,10 @@ Added: svn:mime-type
## -0,0 +1 ## ## -0,0 +1 ##
+text/plain +text/plain
\ No newline at end of property \ No newline at end of property
Index: EfcModule.asn Index: IS/EfcModule.asn
=================================================================== ===================================================================
--- EfcModule.asn (nonexistent) --- IS/EfcModule.asn (nonexistent)
+++ EfcModule.asn (working copy) +++ IS/EfcModule.asn (working copy)
@@ -0,0 +1,139 @@ @@ -0,0 +1,139 @@
+-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-- ISO TS 14906 +-- ISO TS 14906
...@@ -324,7 +595,7 @@ Index: EfcModule.asn ...@@ -324,7 +595,7 @@ Index: EfcModule.asn
+} +}
+END +END
Property changes on: EfcModule.asn Property changes on: IS/EfcModule.asn
___________________________________________________________________ ___________________________________________________________________
Added: svn:eol-style Added: svn:eol-style
## -0,0 +1 ## ## -0,0 +1 ##
...@@ -338,10 +609,10 @@ Added: svn:mime-type ...@@ -338,10 +609,10 @@ Added: svn:mime-type
## -0,0 +1 ## ## -0,0 +1 ##
+text/plain +text/plain
\ No newline at end of property \ No newline at end of property
Index: ETSI_TS_103301.asn Index: IS/ETSI_TS_103301.asn
=================================================================== ===================================================================
--- ETSI_TS_103301.asn (revision 1297) --- IS/ETSI_TS_103301.asn (revision 1297)
+++ ETSI_TS_103301.asn (nonexistent) +++ IS/ETSI_TS_103301.asn (nonexistent)
@@ -1,146 +0,0 @@ @@ -1,146 +0,0 @@
--- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- ETSI TS 103 301 --- ETSI TS 103 301
...@@ -490,7 +761,7 @@ Index: ETSI_TS_103301.asn ...@@ -490,7 +761,7 @@ Index: ETSI_TS_103301.asn
-END -END
- -
Property changes on: ETSI_TS_103301.asn Property changes on: IS/ETSI_TS_103301.asn
___________________________________________________________________ ___________________________________________________________________
Deleted: svn:eol-style Deleted: svn:eol-style
## -1 +0,0 ## ## -1 +0,0 ##
...@@ -504,10 +775,10 @@ Deleted: svn:mime-type ...@@ -504,10 +775,10 @@ Deleted: svn:mime-type
## -1 +0,0 ## ## -1 +0,0 ##
-text/plain -text/plain
\ No newline at end of property \ No newline at end of property
Index: IS_DSRC.asn Index: IS/IS_DSRC.asn
=================================================================== ===================================================================
--- IS_DSRC.asn (nonexistent) --- IS/IS_DSRC.asn (nonexistent)
+++ IS_DSRC.asn (working copy) +++ IS/IS_DSRC.asn (working copy)
@@ -0,0 +1,1906 @@ @@ -0,0 +1,1906 @@
+--FIXME RGY moved here from file SPAT_MAP_ISO_TS_19091.asn +--FIXME RGY moved here from file SPAT_MAP_ISO_TS_19091.asn
+ +
...@@ -2416,7 +2687,7 @@ Index: IS_DSRC.asn ...@@ -2416,7 +2687,7 @@ Index: IS_DSRC.asn
+ +
+END +END
Property changes on: IS_DSRC.asn Property changes on: IS/IS_DSRC.asn
___________________________________________________________________ ___________________________________________________________________
Added: svn:eol-style Added: svn:eol-style
## -0,0 +1 ## ## -0,0 +1 ##
...@@ -2430,10 +2701,10 @@ Added: svn:mime-type ...@@ -2430,10 +2701,10 @@ Added: svn:mime-type
## -0,0 +1 ## ## -0,0 +1 ##
+text/plain +text/plain
\ No newline at end of property \ No newline at end of property
Index: IS_DSRC_REGION_noCircular.asn Index: IS/IS_DSRC_REGION_noCircular.asn
=================================================================== ===================================================================
--- IS_DSRC_REGION_noCircular.asn (nonexistent) --- IS/IS_DSRC_REGION_noCircular.asn (nonexistent)
+++ IS_DSRC_REGION_noCircular.asn (working copy) +++ IS/IS_DSRC_REGION_noCircular.asn (working copy)
@@ -0,0 +1,419 @@ @@ -0,0 +1,419 @@
+--FIXME RGY moved here from file SPAT_MAP_ISO_TS_19091.asn +--FIXME RGY moved here from file SPAT_MAP_ISO_TS_19091.asn
+ +
...@@ -2855,7 +3126,7 @@ Index: IS_DSRC_REGION_noCircular.asn ...@@ -2855,7 +3126,7 @@ Index: IS_DSRC_REGION_noCircular.asn
+} +}
+END +END
Property changes on: IS_DSRC_REGION_noCircular.asn Property changes on: IS/IS_DSRC_REGION_noCircular.asn
___________________________________________________________________ ___________________________________________________________________
Added: svn:eol-style Added: svn:eol-style
## -0,0 +1 ## ## -0,0 +1 ##
...@@ -2869,10 +3140,10 @@ Added: svn:mime-type ...@@ -2869,10 +3140,10 @@ Added: svn:mime-type
## -0,0 +1 ## ## -0,0 +1 ##
+text/plain +text/plain
\ No newline at end of property \ No newline at end of property
Index: IS_REGION.asn Index: IS/IS_REGION.asn
=================================================================== ===================================================================
--- IS_REGION.asn (nonexistent) --- IS/IS_REGION.asn (nonexistent)
+++ IS_REGION.asn (working copy) +++ IS/IS_REGION.asn (working copy)
@@ -0,0 +1,110 @@