Newer
Older
+ c_PICS_Z6_D2,
+ c_PICS_Z6_D3
}
} // End of PICS_DENM_PARMS_UC1_RWW
} // End of group denmUseCase1
modulepar DenmEventsParmsUseCaseRsu PICS_DENM_EVENTS_RSU := {
- PICS_DENM_PARMS_UC1_RWW,
- PICS_DENM_PARMS_UC1_RWW,
- PICS_DENM_PARMS_UC1_RWW
+ c_PICS_DENM_PARMS_UC1_RWW,
+ c_PICS_DENM_PARMS_UC1_RWW,
+ c_PICS_DENM_PARMS_UC1_RWW
} // End of PICS_DENM_EVENTS_RSU
} // End of group denmEvents
intersections := {
{ // Start of intersection #0
name := "PICS_Z1_M1_SL",
- id := PICS_Z1_M1_SL_IDX,
+ id := c_PICS_Z1_M1_SL_IDX,
revision := 0,
- refPoint := PICS_Z1_M1_SL_RP,
+ refPoint := c_PICS_Z1_M1_SL_RP,
laneWidth := omit,
speedLimits := omit,
laneSet := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z1_M1_SL_LANE10,
+ nodeList := c_PICS_Z1_M1_SL_LANE10,
connectsTo := {
{
connectingLane := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z1_M1_SL_LANE20,
+ nodeList := c_PICS_Z1_M1_SL_LANE20,
connectsTo := omit,
overlays := omit,
regional := omit
intersections := {
{ // Start of intersection #0
name := "PICS_Z2_M1_SL",
- id := PICS_Z2_M1_SL_IDX,
+ id := c_PICS_Z2_M1_SL_IDX,
revision := 0,
- refPoint := PICS_Z2_M1_SL_RP,
+ refPoint := c_PICS_Z2_M1_SL_RP,
laneWidth := omit,
speedLimits := omit,
laneSet := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z2_M1_SL_LANE10,
+ nodeList := c_PICS_Z2_M1_SL_LANE10,
connectsTo := {
{
connectingLane := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z2_M1_SL_LANE20,
+ nodeList := c_PICS_Z2_M1_SL_LANE20,
connectsTo := omit,
overlays := omit,
regional := omit
intersections := {
{ // Start of intersection #0
name := "PICS_Z3_M1_SL",
- id := PICS_Z3_M1_SL_IDX,
+ id := c_PICS_Z3_M1_SL_IDX,
revision := 0,
- refPoint := PICS_Z3_M1_SL_RP,
+ refPoint := c_PICS_Z3_M1_SL_RP,
laneWidth := omit,
speedLimits := omit,
laneSet := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z3_M1_SL_LANE10,
+ nodeList := c_PICS_Z3_M1_SL_LANE10,
connectsTo := {
{
connectingLane := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z3_M1_SL_LANE20,
+ nodeList := c_PICS_Z3_M1_SL_LANE20,
connectsTo := omit,
overlays := omit,
regional := omit
intersections := {
{ // Start of intersection #0
name := "PICS_Z4_M1_SL",
- id := PICS_Z4_M1_SL_IDX,
+ id := c_PICS_Z4_M1_SL_IDX,
revision := 0,
- refPoint := PICS_Z4_M1_SL_RP,
+ refPoint := c_PICS_Z4_M1_SL_RP,
laneWidth := omit,
speedLimits := omit,
laneSet := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z4_M1_SL_LANE10,
+ nodeList := c_PICS_Z4_M1_SL_LANE10,
connectsTo := {
{
connectingLane := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z4_M1_SL_LANE20,
+ nodeList := c_PICS_Z4_M1_SL_LANE20,
connectsTo := omit,
overlays := omit,
regional := omit
intersections := {
{ // Start of intersection #0
name := "PICS_Z5_M1_SL",
- id := PICS_Z5_M1_SL_IDX,
+ id := c_PICS_Z5_M1_SL_IDX,
revision := 0,
- refPoint := PICS_Z5_M1_SL_RP,
+ refPoint := c_PICS_Z5_M1_SL_RP,
laneWidth := omit,
speedLimits := omit,
laneSet := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z5_M1_SL_LANE10,
+ nodeList := c_PICS_Z5_M1_SL_LANE10,
connectsTo := {
{
connectingLane := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z5_M1_SL_LANE20,
+ nodeList := c_PICS_Z5_M1_SL_LANE20,
connectsTo := omit,
overlays := omit,
regional := omit
intersections := {
{ // Start of intersection #0
name := "PICS_Z6_M1_SL",
- id := PICS_Z6_M1_SL_IDX,
+ id := c_PICS_Z6_M1_SL_IDX,
revision := 0,
- refPoint := PICS_Z6_M1_SL_RP,
+ refPoint := c_PICS_Z6_M1_SL_RP,
laneWidth := omit,
speedLimits := omit,
laneSet := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z6_M1_SL_LANE10,
+ nodeList := c_PICS_Z6_M1_SL_LANE10,
connectsTo := {
{
connectingLane := {
regional := omit
},
maneuvers := omit,
- nodeList := PICS_Z6_M1_SL_LANE20,
+ nodeList := c_PICS_Z6_M1_SL_LANE20,
connectsTo := omit,
overlays := omit,
regional := omit
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
} // End of group mapemZone6
modulepar MapemParmListRsu PICS_MAPEM_PARMS_RSUs := {
- PICS_Z1_M1_SL, // RSU #1
- PICS_Z2_M1_SL/*{
+ c_PICS_Z1_M1_SL, // RSU #1
+ c_PICS_Z2_M1_SL/*{
intersections := omit,
roadSegments := omit
}*/, // RSU #2
- PICS_Z2_M1_SL, // RSU #3
- PICS_Z5_M1_SL, // RSU #4
- PICS_Z4_M1_SL, // RSU #5
+ c_PICS_Z2_M1_SL, // RSU #3
+ c_PICS_Z5_M1_SL, // RSU #4
+ c_PICS_Z4_M1_SL, // RSU #5
{
intersections := omit,
roadSegments := omit
}, // RSU #6
- PICS_Z6_M1_SL, // RSU #7
- PICS_Z3_M1_SL // RSU #8
+ c_PICS_Z6_M1_SL, // RSU #7
+ c_PICS_Z3_M1_SL // RSU #8
} // End of PICS_MAPEM_PARMS_RSU
} // End of group mapemEvents
intersections := {
{
name := "PICS_SPATEM_PARMS_SG_50",
- id := PICS_Z1_M1_SL_IDX,
+ id := c_PICS_Z1_M1_SL_IDX,
revision := 0,
status := int2bit(0, 16),
moy := 0, // To be updated in real-time
@@ -3733,7 +3737,7 @@
} // End of type PICS_Z1_S1_SL
modulepar SignalGroupParmList PICS_Z1_S1_SL_LIST := {
- PICS_Z1_S1_SL
+ c_PICS_Z1_S1_SL
} // End of type PICS_Z1_S1_SL_LIST
} // End of group spatemZone1
intersections := {
{
name := "PICS_SPATEM_PARMS_SG_50",
- id := PICS_Z2_M1_SL_IDX,
+ id := c_PICS_Z2_M1_SL_IDX,
revision := 0,
status := int2bit(0, 16),
moy := 0, // To be updated in real-time
@@ -3823,7 +3827,7 @@
} // End of type PICS_Z2_S1_SL
modulepar SignalGroupParmList PICS_Z2_S1_SL_LIST := {
- PICS_Z2_S1_SL
+ c_PICS_Z2_S1_SL
} // End of type PICS_Z2_S1_SL_LIST
} // End of group spatemZone2
intersections := {
{
name := "PICS_SPATEM_PARMS_SG_50",
- id := PICS_Z3_M1_SL_IDX,
+ id := c_PICS_Z3_M1_SL_IDX,
revision := 0,
status := int2bit(0, 16),
moy := 0, // To be updated in real-time
@@ -3913,7 +3917,7 @@
} // End of type PICS_Z3_S1_SL
modulepar SignalGroupParmList PICS_Z3_S1_SL_LIST := {
- PICS_Z3_S1_SL
+ c_PICS_Z3_S1_SL
} // End of type PICS_Z3_S1_SL_LIST
} // End of group spatemZone3
intersections := {
{
name := "PICS_SPATEM_PARMS_SG_50",
- id := PICS_Z4_M1_SL_IDX,
+ id := c_PICS_Z4_M1_SL_IDX,
revision := 0,
status := int2bit(0, 16),
moy := 0, // To be updated in real-time
@@ -4003,7 +4007,7 @@
} // End of type PICS_Z4_S1_SL
modulepar SignalGroupParmList PICS_Z4_S1_SL_LIST := {
- PICS_Z4_S1_SL
+ c_PICS_Z4_S1_SL
} // End of type PICS_Z4_S1_SL_LIST
} // End of group spatemZone4
intersections := {
{
name := "PICS_SPATEM_PARMS_SG_50",
- id := PICS_Z5_M1_SL_IDX,
+ id := c_PICS_Z5_M1_SL_IDX,
revision := 0,
status := int2bit(0, 16),
moy := 0, // To be updated in real-time
@@ -4093,7 +4097,7 @@
} // End of type PICS_Z5_S1_SL
modulepar SignalGroupParmList PICS_Z5_S1_SL_LIST := {
- PICS_Z5_S1_SL
+ c_PICS_Z5_S1_SL
} // End of type PICS_Z5_S1_SL_LIST
} // End of group spatemZone5
intersections := {
{
name := "PICS_SPATEM_PARMS_SG_50",
- id := PICS_Z6_M1_SL_IDX,
+ id := c_PICS_Z6_M1_SL_IDX,
revision := 0,
status := int2bit(0, 16),
moy := 0, // To be updated in real-time
@@ -4183,19 +4187,19 @@
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
} // End of type PICS_Z6_S1_SL
modulepar SignalGroupParmList PICS_Z6_S1_SL_LIST := {
- PICS_Z6_S1_SL
+ c_PICS_Z6_S1_SL
} // End of type PICS_Z6_S1_SL_LIST
} // End of group spatemZone6
modulepar SpatemParmRsu PICS_SPATEM_PARMS_RSUs := {
- PICS_Z1_S1_SL_LIST, // RSU #1
- PICS_Z2_S1_SL_LIST/*{}*/, // RSU #2
- PICS_Z2_S1_SL_LIST, // RSU #3
- PICS_Z5_S1_SL_LIST, // RSU #4
- PICS_Z4_S1_SL_LIST, // RSU #5
+ c_PICS_Z1_S1_SL_LIST, // RSU #1
+ c_PICS_Z2_S1_SL_LIST/*{}*/, // RSU #2
+ c_PICS_Z2_S1_SL_LIST, // RSU #3
+ c_PICS_Z5_S1_SL_LIST, // RSU #4
+ c_PICS_Z4_S1_SL_LIST, // RSU #5
{}, // RSU #6
- PICS_Z6_S1_SL_LIST, // RSU #7
+ c_PICS_Z6_S1_SL_LIST, // RSU #7
{} // RSU #8
} // End of PICS_SPATEM_PARMS_RSUs
} // End of PICS_DENM_POSITION_CONFIDENCE_ELLIPSE
modulepar Altitude PICS_IVIM_ALTITUDE := {
- altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
+ altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
} // End of PICS_DENM_ALTITUDE
} // End of group ivimCommonParams
modulepar ReferencePosition PICS_Z1_I1_POS1_RP := {
latitude := 435527493,
longitude := 103006446,
- positionConfidenceEllipse := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
- altitude := PICS_IVIM_ALTITUDE
+ positionConfidenceEllipse := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+ altitude := c_PICS_IVIM_ALTITUDE
} // End of PICS_Z1_I1_POS1_RP
modulepar GlcPart PICS_Z1_I1_POS1_GP_1 := {
iviContainers := {
{
glc := {
- referencePosition := PICS_Z1_I1_POS1_RP,
+ referencePosition := c_PICS_Z1_I1_POS1_RP,
referencePositionTime := omit,
referencePositionHeading := omit,
referencePositionSpeed := omit,
parts := {
- PICS_Z1_I1_POS1_GP_1,
- PICS_Z1_I1_POS1_GP_2
+ c_PICS_Z1_I1_POS1_GP_1,
+ c_PICS_Z1_I1_POS1_GP_2
}
}
},
modulepar ReferencePosition PICS_Z2_I1_POS1_RP := {
latitude := 435512756,
longitude := 103002535,
- positionConfidenceEllipse := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
- altitude := PICS_IVIM_ALTITUDE
+ positionConfidenceEllipse := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+ altitude := c_PICS_IVIM_ALTITUDE
} // End of PICS_Z2_I1_POS1_RP
modulepar GlcPart PICS_Z2_I1_POS1_GP_1 := {
iviContainers := {
{
glc := {
- referencePosition := PICS_Z2_I1_POS1_RP,
+ referencePosition := c_PICS_Z2_I1_POS1_RP,
referencePositionTime := omit,
referencePositionHeading := omit,
referencePositionSpeed := omit,
parts := {
- PICS_Z2_I1_POS1_GP_1,
- PICS_Z2_I1_POS1_GP_2
+ c_PICS_Z2_I1_POS1_GP_1,
+ c_PICS_Z2_I1_POS1_GP_2
}
}
},
modulepar ReferencePosition PICS_Z3_I1_POS1_RP := {
latitude := 435533069,
longitude := 103024528,
- positionConfidenceEllipse := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
- altitude := PICS_IVIM_ALTITUDE
+ positionConfidenceEllipse := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+ altitude := c_PICS_IVIM_ALTITUDE
} // End of PICS_Z3_I1_POS1_RP
modulepar GlcPart PICS_Z3_I1_POS1_GP_1 := {
iviContainers := {
{
glc := {
- referencePosition := PICS_Z3_I1_POS1_RP,
+ referencePosition := c_PICS_Z3_I1_POS1_RP,
referencePositionTime := omit,
referencePositionHeading := omit,
referencePositionSpeed := omit,
parts := {
- PICS_Z3_I1_POS1_GP_1,
- PICS_Z3_I1_POS1_GP_2
+ c_PICS_Z3_I1_POS1_GP_1,
+ c_PICS_Z3_I1_POS1_GP_2
}
}
},
modulepar ReferencePosition PICS_Z4_I1_POS1_RP := {
latitude := 435563484,
longitude := 103042973,
- positionConfidenceEllipse := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
- altitude := PICS_IVIM_ALTITUDE
+ positionConfidenceEllipse := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+ altitude := c_PICS_IVIM_ALTITUDE
} // End of PICS_Z4_I1_POS1_RP
modulepar GlcPart PICS_Z4_I1_POS1_GP_1 := {
iviContainers := {
{
glc := {
- referencePosition := PICS_Z4_I1_POS1_RP,
+ referencePosition := c_PICS_Z4_I1_POS1_RP,
referencePositionTime := omit,
referencePositionHeading := omit,
referencePositionSpeed := omit,
parts := {
- PICS_Z4_I1_POS1_GP_1,
- PICS_Z4_I1_POS1_GP_2
+ c_PICS_Z4_I1_POS1_GP_1,
+ c_PICS_Z4_I1_POS1_GP_2
}
}
},
modulepar ReferencePosition PICS_Z5_I1_POS1_RP := {
latitude := 435582342,
longitude := 103065544,
- positionConfidenceEllipse := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
- altitude := PICS_IVIM_ALTITUDE
+ positionConfidenceEllipse := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+ altitude := c_PICS_IVIM_ALTITUDE
} // End of PICS_Z5_I1_POS1_RP
modulepar GlcPart PICS_Z5_I1_POS1_GP_1 := {
iviContainers := {
{
glc := {
- referencePosition := PICS_Z5_I1_POS1_RP,
+ referencePosition := c_PICS_Z5_I1_POS1_RP,
referencePositionTime := omit,
referencePositionHeading := omit,
referencePositionSpeed := omit,
parts := {
- PICS_Z5_I1_POS1_GP_1,
- PICS_Z5_I1_POS1_GP_2
+ c_PICS_Z5_I1_POS1_GP_1,
+ c_PICS_Z5_I1_POS1_GP_2
}
}
},
modulepar ReferencePosition PICS_Z6_I1_POS1_RP := {
latitude := 435551186,
longitude := 103033248,
- positionConfidenceEllipse := PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
- altitude := PICS_IVIM_ALTITUDE
+ positionConfidenceEllipse := c_PICS_IVIM_POSITION_CONFIDENCE_ELLIPSE ,
+ altitude := c_PICS_IVIM_ALTITUDE
} // End of PICS_Z6_I1_POS1_RP
modulepar GlcPart PICS_Z6_I1_POS1_GP_1 := {
iviContainers := {
{
glc := {
- referencePosition := PICS_Z6_I1_POS1_RP,
+ referencePosition := c_PICS_Z6_I1_POS1_RP,
referencePositionTime := omit,
referencePositionHeading := omit,
referencePositionSpeed := omit,
parts := {
- PICS_Z6_I1_POS1_GP_1,
- PICS_Z6_I1_POS1_GP_2
+ c_PICS_Z6_I1_POS1_GP_1,
+ c_PICS_Z6_I1_POS1_GP_2
}
}
},
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
} // End of group ivimZone6
modulepar IvimParmListRsu PICS_IVIM_PARMS_RSUs := {
- PICS_Z1_I1_POS1, // RSU #1
- PICS_Z2_I1_POS1,/*{
+ c_PICS_Z1_I1_POS1, // RSU #1
+ c_PICS_Z2_I1_POS1,/*{
provider := omit,
iviIdentificationNumber := omit,
iviContainers := omit
},*/ // RSU #2 // RSU #3
- PICS_Z5_I1_POS1, // RSU #4
- PICS_Z4_I1_POS1, // RSU #5
+ c_PICS_Z5_I1_POS1, // RSU #4
+ c_PICS_Z4_I1_POS1, // RSU #5
{
provider := omit,
iviIdentificationNumber := omit,
iviContainers := omit
}, // RSU #6
- PICS_Z6_I1_POS1, // RSU #7
+ c_PICS_Z6_I1_POS1, // RSU #7
{
provider := omit,
iviIdentificationNumber := omit,
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
@@ -5656,50 +5660,10 @@
modulepar UInt32 PICS_EVCSN_ITS_AID := 100; // FIXME Find the correct value
- modulepar ItsChargingSpotDataElements PICS_CHARGING_SPOT_DATA_01 := {
- type_ := ChargingSpotType_standardOrFastChargeMode3_,
- evEquipmentID := omit,
- typeOfReceptacle := '000'B,
- energyAvailability := "all",
- parkingPlacesData := omit
- } // End of PICS_CHARGING_SPOT_DATA_01
-
} // End of group poimCommonParams
- group poimZone1 {
-
- modulepar ReferencePosition PICS_POI_LOCATION_01 := {
- latitude := 435582150,
- longitude := 103065170,
- positionConfidenceEllipse := {
- semiMajorConfidence := 100,
- semiMinorConfidence := 100,
- semiMajorOrientation := 0
- },
- altitude := {
- altitudeValue := AltitudeValue_referenceEllipsoidSurface_,
- altitudeConfidence := alt_000_01
- }
- } // End of PICS_POI_LOCATION_01
-
- modulepar ItsChargingStationData PICS_ITS_CHARGING := {
- chargingStationID := 9876,
- utilityDistributorId := omit,
- providerID := omit,
- chargingStationLocation := PICS_POI_LOCATION_01,
- address_ := omit,
- phoneNumber := omit,
- accessibility := "open",
- digitalMap := omit,
- openingDaysHours := "full",
- pricing := "2.00",
- bookingContactInfo := omit,
- payment := omit,
- chargingSpotsAvailable := { PICS_CHARGING_SPOT_DATA_01 }
- }
- }
modulepar PoimParmListRsu PICS_EVCSN_PARMS_RSUs := {
- PICS_ITS_CHARGING // RSU #1
+ c_PICS_ITS_CHARGING // RSU #1
}
} // End of group poimEvents
Index: AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn
===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_Templates.ttcn (working copy)
@@ -2,6 +2,7 @@
// LibCommon
import from LibCommon_BasicTypesAndValues all;
+ import from LibCommon_DataStrings all;
// LibIts
import from ITS_Container language "ASN.1:1997" all;
@@ -13,11 +14,11 @@
import from IVI language "ASN.1:1997" all;
import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
import from SSEM_PDU_Descriptions language "ASN.1:1997" all;
- import from DSRC language "ASN.1:1997" all;
+ import from IS_DSRC language "ASN.1:1997" all;
// LibItsCommon
import from LibItsCommon_Functions all;
- import from LibCommon_DataStrings all;
+ import from LibItsCommon_ASN1_NamedNumbers all;
// LibItsGeoNetworking
import from LibItsGeoNetworking_TestSystem all;
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
@@ -400,21 +401,21 @@
}
template (value) ItsPOIHeader m_itsPOIHeader(
- in template (value) POIType p_poiType := 1,
+ in template (value) POIType p_poiType := 1,
in template (value) TimestampIts p_timeStamp,
- in template (value) boolean p_relayCapable := true
+ in template (value) boolean p_relayCapable := true
) := {
- poiType := p_poiType,
+ poiType := p_poiType,
timeStamp := p_timeStamp,
- relayCapable := p_relayCapable
+ relayCapable := p_relayCapable
}
template (value) ItsEVCSNData m_itsEVCSNData(
- in template (value) NumberStations p_totalNumberOfStations := 1,
- in template (value) ItsChargingStationDatas p_itsChargingStationDatas
+ in template (value) NumberStations p_totalNumberOfStations := 1,
+ in template (value) ItsEVCSNData.chargingStationsData p_chargingStationsData
) := {
- totalNumberOfStations := p_totalNumberOfStations,
- chargingStationsData := p_itsChargingStationDatas
+ totalNumberOfStations := p_totalNumberOfStations,
+ chargingStationsData := p_chargingStationsData
}
} // End of group evcsnTemplates
Index: AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn
===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_TestCases.ttcn (working copy)
@@ -180,7 +180,7 @@
*/
testcase TC_RSUSIMU_BV_02() runs on ItsRSUsSimulator system ItsRSUsSimulatorSystem {
// Local variables
- const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1
+ const RectangularRegions c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1
var VehiclesSimulator v_vehicles := {};
var integer v_stationID;
var boolean v_isInDetectionZone;
@@ -339,7 +339,7 @@
) runs on ItsRSUsSimulator {
// Local variables
- const RectangularRegions c_detectionArea := { PICS_UC6_CAM_DETECTION_AREA_Z2 }; // PICS_UC6_CAM_DETECTION_AREA_Z1
+ const RectangularRegions c_detectionArea := { valueof(PICS_UC6_CAM_DETECTION_AREA_Z2) }; // PICS_UC6_CAM_DETECTION_AREA_Z1
var GeoNetworkingInd v_gnInd;
var template (value) CAM v_camSimu;
var ThreeDLocation v_location;
Index: AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn
===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn (working copy)
@@ -2,7 +2,7 @@
// LibIts
import from ITS_Container language "ASN.1:1997" all;
- import from DSRC language "ASN.1:1997" all;
+ import from IS_DSRC language "ASN.1:1997" all;
// LibItsGeoNetworking
import from LibItsGeoNetworking_TestSystem all;
@@ -53,7 +53,7 @@
/**
* @desc List of MovementState per intersection and per RSU
*/
- var template (value) MovementListPerIntersectionRsu vc_states;
+ var template (omit) MovementListPerIntersectionRsu vc_states;
/**
* @desc The SPATEM message to use in SignalGroupParmList
*/
Index: AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn
===================================================================
--- AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (revision 2627)
+++ AtsRSUsSimulator/ItsRSUsSimulator_TypesAndValues.ttcn (working copy)
@@ -13,7 +13,8 @@
import from IVI language "ASN.1:1997" all;
import from EVCSN_PDU_Descriptions language "ASN.1:1997" all;
import from SSEM_PDU_Descriptions language "ASN.1:1997" all;
- import from DSRC language "ASN.1:1997" all;
+ import from IS_DSRC language "ASN.1:1997" all;
+ import from IS_DSRC_REGION_noCircular language "ASN.1:1997" all;
import from EfcDsrcApplication language "ASN.1:1997" all;
// LibItsGeoNetworking
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
@@ -180,8 +181,6 @@
*/
group ivimDataStructures {
- type record length (1 .. 8) of IviContainer IviContainers;
-
/**
* @desc Describe the parameter for each IVIM event
*/
@@ -188,7 +187,7 @@
type record IvimParm {
Provider provider optional,
IviIdentificationNumber iviIdentificationNumber optional,
- IviContainers iviContainers optional
+ IviStructure.optional_ iviContainers optional
} // End of type IvimParm
/**
@@ -206,8 +205,6 @@
*/
group evcsnDataStructures {
- type record length (1 .. 256) of ItsChargingStationData ItsChargingStationDatas;
-
/**
* @desc List of evcsn parms per RSU
* <pre>