Skip to content

Commit

Permalink
modified: src/tmx/Asn_J2735/include/asn_j2735_r2020/RegionalExtension.h
Browse files Browse the repository at this point in the history 
	modified:   src/tmx/Asn_J2735/src/r2020/RegionalExtension.c
	modified:   src/tmx/TmxUtils/test/J2735MessageTest.cpp
	modified:   src/v2i-hub/SpatPlugin/src/NTCIP1202.cpp
  • Loading branch information
@jwillmartin
jwillmartin committed Oct 30, 2023
1 parent 9e991c0 commit 44b52df
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 18 deletions.
1 change: 1 addition & 0 deletions src/tmx/Asn_J2735/include/asn_j2735_r2020/RegionalExtension.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ typedef struct Reg_Position3D {
union Reg_Position3D__regExtValue_u {
Position3D_addGrpB_t Position3D_addGrpB;
Position3D_addGrpC_t Position3D_addGrpC;
Position3D_addGrpCarma_t Position3D_addGrpCarma;
} choice;

/* Context for parsing across buffer boundaries */
Expand Down
17 changes: 9 additions & 8 deletions src/tmx/Asn_J2735/src/r2020/RegionalExtension.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@

#include "RegionalExtension.h"

static const long asn_VAL_10_DSRC_addGrpCarma = 128;
static const asn_ioc_cell_t asn_IOS_Reg_BasicSafetyMessage_1_rows[] = {
{ "&id", aioc__value, &asn_DEF_RegionId, &asn_VAL_10_DSRC_addGrpCarma },
{ "&Type", aioc__type, &asn_DEF_BasicSafetyMessage_addGrpCarma }
};
static const asn_ioc_set_t asn_IOS_Reg_BasicSafetyMessage_1[] = {
{ 1, 2, asn_IOS_Reg_BasicSafetyMessage_1_rows }
};
static const long asn_VAL_3_addGrpB = 2;
static const asn_ioc_cell_t asn_IOS_Reg_LaneDataAttribute_1_rows[] = {
{ "&id", aioc__value, &asn_DEF_RegionId, &asn_VAL_3_addGrpB },
Expand Down Expand Up @@ -82,6 +74,15 @@ static const asn_ioc_cell_t asn_IOS_Reg_MovementEvent_1_rows[] = {
static const asn_ioc_set_t asn_IOS_Reg_MovementEvent_1[] = {
{ 1, 2, asn_IOS_Reg_MovementEvent_1_rows }
};
static const long asn_VAL_10_DSRC_addGrpCarma = 128;
static const asn_ioc_cell_t asn_IOS_Reg_BasicSafetyMessage_1_rows[] = {
{ "&id", aioc__value, &asn_DEF_RegionId, &asn_VAL_10_DSRC_addGrpCarma },
{ "&Type", aioc__type, &asn_DEF_BasicSafetyMessage_addGrpCarma }
};
static const asn_ioc_set_t asn_IOS_Reg_BasicSafetyMessage_1[] = {
{ 1, 2, asn_IOS_Reg_BasicSafetyMessage_1_rows }
};

static int
memb_regionId_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,
asn_app_constraint_failed_f *ctfailcb, void *app_key) {
Expand Down
19 changes: 10 additions & 9 deletions src/tmx/TmxUtils/test/J2735MessageTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,9 @@ TEST_F(J2735MessageTest, EncodeBasicSafetyMessage_PartII)
auto partIICnt = (BSMpartIIExtension_t*) calloc(1, sizeof(BSMpartIIExtension_t));
partIICnt->partII_Id = 1;
partIICnt->partII_Value.present = BSMpartIIExtension__partII_Value_PR_SpecialVehicleExtensions;
auto specialVEx= (SpecialVehicleExtensions_t*) calloc(1, sizeof(SpecialVehicleExtensions_t));
auto emergencyDetails= (EmergencyDetails_t*) calloc(1, sizeof(EmergencyDetails_t));

auto specialVEx = (SpecialVehicleExtensions_t*) calloc(1, sizeof(SpecialVehicleExtensions_t));
auto emergencyDetails = (EmergencyDetails_t*) calloc(1, sizeof(EmergencyDetails_t));
emergencyDetails->lightsUse = LightbarInUse_inUse;
auto resp_type = (ResponseType_t*) calloc(1, sizeof(ResponseType_t));
*resp_type = ResponseType_emergency;
Expand All @@ -540,20 +541,20 @@ TEST_F(J2735MessageTest, EncodeBasicSafetyMessage_PartII)
message->partII = bsmPartII;

// BSM regional extension
auto regional = (BasicSafetyMessage::BasicSafetyMessage__regional *)calloc(1, sizeof(BasicSafetyMessage::BasicSafetyMessage__regional));
auto reg_bsm = (Reg_BasicSafetyMessage *)calloc(1, sizeof(Reg_BasicSafetyMessage));
auto regional = (BasicSafetyMessage::BasicSafetyMessage__regional*) calloc(1, sizeof(BasicSafetyMessage::BasicSafetyMessage__regional));
auto reg_bsm = (Reg_BasicSafetyMessage_t*) calloc(1, sizeof(Reg_BasicSafetyMessage_t));
reg_bsm->regionId = 128;
reg_bsm->regExtValue.present = Reg_BasicSafetyMessage__regExtValue_PR_BasicSafetyMessage_addGrpCarma;

auto carma_bsm_data = (BasicSafetyMessage_addGrpCarma_t *)calloc(1, sizeof(BasicSafetyMessage_addGrpCarma_t));
auto carma_bsm_destination_points = (BasicSafetyMessage_addGrpCarma::BasicSafetyMessage_addGrpCarma__routeDestinationPoints *)calloc(1, sizeof(BasicSafetyMessage_addGrpCarma::BasicSafetyMessage_addGrpCarma__routeDestinationPoints));
auto point = (Position3D_t *)calloc(1, sizeof(Position3D_t));
auto carma_bsm_data = (BasicSafetyMessage_addGrpCarma_t*) calloc(1, sizeof(BasicSafetyMessage_addGrpCarma_t));
auto carma_bsm_destination_points = (BasicSafetyMessage_addGrpCarma::BasicSafetyMessage_addGrpCarma__routeDestinationPoints*) calloc(1, sizeof(BasicSafetyMessage_addGrpCarma::BasicSafetyMessage_addGrpCarma__routeDestinationPoints));
auto point = (Position3D_t*) calloc(1, sizeof(Position3D_t));
auto dummy_lat = 12;
auto dummy_long = 1312;
point->lat = dummy_lat;
point->Long = dummy_long;
asn_sequence_add(&carma_bsm_destination_points->list.array, point);
auto point2 = (Position3D_t *)calloc(1, sizeof(Position3D_t));
auto point2 = (Position3D_t*) calloc(1, sizeof(Position3D_t));
point2->lat = dummy_lat + 1000;
point2->Long = dummy_long + 1000;
asn_sequence_add(&carma_bsm_destination_points->list.array, point2);
Expand All @@ -579,7 +580,7 @@ TEST_F(J2735MessageTest, EncodeBasicSafetyMessage_PartII)
ASSERT_EQ(LightbarInUse_inUse, decoded_bsm_ptr->partII->list.array[0]->partII_Value.choice.SpecialVehicleExtensions.vehicleAlerts->lightsUse);
ASSERT_EQ(SirenInUse_inUse, decoded_bsm_ptr->partII->list.array[0]->partII_Value.choice.SpecialVehicleExtensions.vehicleAlerts->sirenUse);
auto decoded_regional = (BasicSafetyMessage::BasicSafetyMessage__regional *)calloc(1, sizeof(BasicSafetyMessage::BasicSafetyMessage__regional));
auto decoded_reg_bsm = (Reg_BasicSafetyMessage *)calloc(1, sizeof(Reg_BasicSafetyMessage));
auto decoded_reg_bsm = (Reg_BasicSafetyMessage_t *)calloc(1, sizeof(Reg_BasicSafetyMessage_t));
auto decode_carma_bsm_data = (BasicSafetyMessage_addGrpCarma_t *)calloc(1, sizeof(BasicSafetyMessage_addGrpCarma_t));
decoded_regional = decoded_bsm_ptr->regional;
decoded_reg_bsm = decoded_regional->list.array[0];
Expand Down
2 changes: 1 addition & 1 deletion src/v2i-hub/SpatPlugin/src/NTCIP1202.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ void Ntcip1202::populateVehicleSignalGroup(MovementState *movement, int phase)
if (getVehicleMaxTime(phase) > 0)
{
stateTimeSpeed->timing->maxEndTime = (TimeMark_t *) calloc(1, sizeof(TimeMark_t));
*(stateTimeSpeed->timing->maxEndTime) = getAdjustedTime(getVehicleMaxTime(phase));
*(stateTimeSpeed->timing->maxEndTime) = 36111; //getAdjustedTime(getVehicleMaxTime(phase));
}

//we only get a phase number 1-16 from ped detect, assume its a ped phase
Expand Down

0 comments on commit 44b52df

Please sign in to comment.