Skip to content

Commit

Permalink
On branch j2735-2024-upgrade
Browse files Browse the repository at this point in the history 
Your branch is up to date with 'origin/j2735-2024-upgrade'.

Changes to be committed:
	modified:   src/tmx/Asn_J2735/include/asn_j2735_r2024/DSRCmsgID.h
	modified:   src/tmx/Asn_J2735/include/asn_j2735_r2024/NodeOffsetPointXY.h
	modified:   src/tmx/Asn_J2735/src/r2024/BasicSafetyMessage.c
	modified:   src/tmx/TmxApi/tmx/messages/IvpJ2735.c
	modified:   src/tmx/TmxApi/tmx/messages/IvpJ2735.h
	modified:   src/tmx/TmxApi/tmx/messages/SaeJ2735Traits.hpp
	modified:   src/tmx/tmx.doxyfile
  • Loading branch information
@jwillmartin
jwillmartin committed Mar 8, 2024
1 parent 1277235 commit ad53e99
Show file tree
Hide file tree
Showing 7 changed files with 288 additions and 111 deletions.
134 changes: 67 additions & 67 deletions src/tmx/Asn_J2735/include/asn_j2735_r2024/DSRCmsgID.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@ extern "C" {
typedef long DSRCmsgID_t;

/* Implementation */
#define DSRCmsgID_reservedMessageId_D ((DSRCmsgID_t)0)
#define DSRCmsgID_alaCarteMessage_D ((DSRCmsgID_t)1)
#define DSRCmsgID_basicSafetyMessage_D ((DSRCmsgID_t)2)
#define DSRCmsgID_basicSafetyMessageVerbose_D ((DSRCmsgID_t)3)
#define DSRCmsgID_commonSafetyRequest_D ((DSRCmsgID_t)4)
#define DSRCmsgID_emergencyVehicleAlert_D ((DSRCmsgID_t)5)
#define DSRCmsgID_intersectionCollision_D ((DSRCmsgID_t)6)
#define DSRCmsgID_mapData_D ((DSRCmsgID_t)7)
#define DSRCmsgID_nmeaCorrections_D ((DSRCmsgID_t)8)
#define DSRCmsgID_probeDataManagement_D ((DSRCmsgID_t)9)
#define DSRCmsgID_probeVehicleData_D ((DSRCmsgID_t)10)
#define DSRCmsgID_roadSideAlert_D ((DSRCmsgID_t)11)
#define DSRCmsgID_rtcmCorrections_D ((DSRCmsgID_t)12)
#define DSRCmsgID_signalPhaseAndTimingMessage_D ((DSRCmsgID_t)13)
#define DSRCmsgID_signalRequestMessage_D ((DSRCmsgID_t)14)
#define DSRCmsgID_signalStatusMessage_D ((DSRCmsgID_t)15)
#define DSRCmsgID_travelerInformation_D ((DSRCmsgID_t)16)
#define DSRCmsgID_uperFrame_D ((DSRCmsgID_t)17)
// #define DSRCmsgID_reservedMessageId_D ((DSRCmsgID_t)0)
// #define DSRCmsgID_alaCarteMessage_D ((DSRCmsgID_t)1)
// #define DSRCmsgID_basicSafetyMessage_D ((DSRCmsgID_t)2)
// #define DSRCmsgID_basicSafetyMessageVerbose_D ((DSRCmsgID_t)3)
// #define DSRCmsgID_commonSafetyRequest_D ((DSRCmsgID_t)4)
// #define DSRCmsgID_emergencyVehicleAlert_D ((DSRCmsgID_t)5)
// #define DSRCmsgID_intersectionCollision_D ((DSRCmsgID_t)6)
// #define DSRCmsgID_mapData_D ((DSRCmsgID_t)7)
// #define DSRCmsgID_nmeaCorrections_D ((DSRCmsgID_t)8)
// #define DSRCmsgID_probeDataManagement_D ((DSRCmsgID_t)9)
// #define DSRCmsgID_probeVehicleData_D ((DSRCmsgID_t)10)
// #define DSRCmsgID_roadSideAlert_D ((DSRCmsgID_t)11)
// #define DSRCmsgID_rtcmCorrections_D ((DSRCmsgID_t)12)
// #define DSRCmsgID_signalPhaseAndTimingMessage_D ((DSRCmsgID_t)13)
// #define DSRCmsgID_signalRequestMessage_D ((DSRCmsgID_t)14)
// #define DSRCmsgID_signalStatusMessage_D ((DSRCmsgID_t)15)
// #define DSRCmsgID_travelerInformation_D ((DSRCmsgID_t)16)
// #define DSRCmsgID_uperFrame_D ((DSRCmsgID_t)17)
extern asn_per_constraints_t asn_PER_type_DSRCmsgID_constr_1;
extern asn_TYPE_descriptor_t asn_DEF_DSRCmsgID;
asn_struct_free_f DSRCmsgID_free;
Expand All @@ -55,55 +55,55 @@ per_type_decoder_f DSRCmsgID_decode_uper;
per_type_encoder_f DSRCmsgID_encode_uper;
per_type_decoder_f DSRCmsgID_decode_aper;
per_type_encoder_f DSRCmsgID_encode_aper;
#define DSRCmsgID_mapData ((DSRCmsgID_t)18)
#define DSRCmsgID_signalPhaseAndTimingMessage ((DSRCmsgID_t)19)
#define DSRCmsgID_basicSafetyMessage ((DSRCmsgID_t)20)
#define DSRCmsgID_commonSafetyRequest ((DSRCmsgID_t)21)
#define DSRCmsgID_emergencyVehicleAlert ((DSRCmsgID_t)22)
#define DSRCmsgID_intersectionCollision ((DSRCmsgID_t)23)
#define DSRCmsgID_nmeaCorrections ((DSRCmsgID_t)24)
#define DSRCmsgID_probeDataManagement ((DSRCmsgID_t)25)
#define DSRCmsgID_probeVehicleData ((DSRCmsgID_t)26)
#define DSRCmsgID_roadSideAlert ((DSRCmsgID_t)27)
#define DSRCmsgID_rtcmCorrections ((DSRCmsgID_t)28)
#define DSRCmsgID_signalRequestMessage ((DSRCmsgID_t)29)
#define DSRCmsgID_signalStatusMessage ((DSRCmsgID_t)30)
#define DSRCmsgID_travelerInformation ((DSRCmsgID_t)31)
#define DSRCmsgID_personalSafetyMessage ((DSRCmsgID_t)32)
#define DSRCmsgID_roadSafetyMessage ((DSRCmsgID_t)33)
#define DSRCmsgID_roadWeatherMessage ((DSRCmsgID_t)34)
#define DSRCmsgID_probeDataConfigMessage ((DSRCmsgID_t)35)
#define DSRCmsgID_probeDataReportMessage ((DSRCmsgID_t)36)
#define DSRCmsgID_tollAdvertisementMessage ((DSRCmsgID_t)37)
#define DSRCmsgID_tollUsageMessage ((DSRCmsgID_t)38)
#define DSRCmsgID_tollUsageAckMessage ((DSRCmsgID_t)39)
#define DSRCmsgID_cooperativeControlMessage ((DSRCmsgID_t)40)
#define DSRCmsgID_sensorDataSharingMessage ((DSRCmsgID_t)41)
#define DSRCmsgID_maneuverSharingAndCoordinatingMessage ((DSRCmsgID_t)42)
#define DSRCmsgID_roadGeometryAndAttributes ((DSRCmsgID_t)43)
#define DSRCmsgID_personalSafetyMessage2 ((DSRCmsgID_t)44)
#define DSRCmsgID_trafficSignalPhaseAndTiming ((DSRCmsgID_t)45)
#define DSRCmsgID_signalControlAndPrioritizationRequest ((DSRCmsgID_t)46)
#define DSRCmsgID_signalControlAndPrioritizationStatus ((DSRCmsgID_t)47)
#define DSRCmsgID_roadUserChargingConfigMessage ((DSRCmsgID_t)48)
#define DSRCmsgID_roadUserChargingReportMessage ((DSRCmsgID_t)49)
#define DSRCmsgID_trafficLightStatusMessage ((DSRCmsgID_t)50)
#define DSRCmsgID_testMessage00 ((DSRCmsgID_t)240)
#define DSRCmsgID_testMessage01 ((DSRCmsgID_t)241)
#define DSRCmsgID_testMessage02 ((DSRCmsgID_t)242)
#define DSRCmsgID_testMessage03 ((DSRCmsgID_t)243)
#define DSRCmsgID_testMessage04 ((DSRCmsgID_t)244)
#define DSRCmsgID_testMessage05 ((DSRCmsgID_t)245)
#define DSRCmsgID_testMessage06 ((DSRCmsgID_t)246)
#define DSRCmsgID_testMessage07 ((DSRCmsgID_t)247)
#define DSRCmsgID_testMessage08 ((DSRCmsgID_t)248)
#define DSRCmsgID_testMessage09 ((DSRCmsgID_t)249)
#define DSRCmsgID_testMessage10 ((DSRCmsgID_t)250)
#define DSRCmsgID_testMessage11 ((DSRCmsgID_t)251)
#define DSRCmsgID_testMessage12 ((DSRCmsgID_t)252)
#define DSRCmsgID_testMessage13 ((DSRCmsgID_t)253)
#define DSRCmsgID_testMessage14 ((DSRCmsgID_t)254)
#define DSRCmsgID_testMessage15 ((DSRCmsgID_t)255)
// #define DSRCmsgID_mapData ((DSRCmsgID_t)18)
// #define DSRCmsgID_signalPhaseAndTimingMessage ((DSRCmsgID_t)19)
// #define DSRCmsgID_basicSafetyMessage ((DSRCmsgID_t)20)
// #define DSRCmsgID_commonSafetyRequest ((DSRCmsgID_t)21)
// #define DSRCmsgID_emergencyVehicleAlert ((DSRCmsgID_t)22)
// #define DSRCmsgID_intersectionCollision ((DSRCmsgID_t)23)
// #define DSRCmsgID_nmeaCorrections ((DSRCmsgID_t)24)
// #define DSRCmsgID_probeDataManagement ((DSRCmsgID_t)25)
// #define DSRCmsgID_probeVehicleData ((DSRCmsgID_t)26)
// #define DSRCmsgID_roadSideAlert ((DSRCmsgID_t)27)
// #define DSRCmsgID_rtcmCorrections ((DSRCmsgID_t)28)
// #define DSRCmsgID_signalRequestMessage ((DSRCmsgID_t)29)
// #define DSRCmsgID_signalStatusMessage ((DSRCmsgID_t)30)
// #define DSRCmsgID_travelerInformation ((DSRCmsgID_t)31)
// #define DSRCmsgID_personalSafetyMessage ((DSRCmsgID_t)32)
// #define DSRCmsgID_roadSafetyMessage ((DSRCmsgID_t)33)
// #define DSRCmsgID_roadWeatherMessage ((DSRCmsgID_t)34)
// #define DSRCmsgID_probeDataConfigMessage ((DSRCmsgID_t)35)
// #define DSRCmsgID_probeDataReportMessage ((DSRCmsgID_t)36)
// #define DSRCmsgID_tollAdvertisementMessage ((DSRCmsgID_t)37)
// #define DSRCmsgID_tollUsageMessage ((DSRCmsgID_t)38)
// #define DSRCmsgID_tollUsageAckMessage ((DSRCmsgID_t)39)
// #define DSRCmsgID_cooperativeControlMessage ((DSRCmsgID_t)40)
// #define DSRCmsgID_sensorDataSharingMessage ((DSRCmsgID_t)41)
// #define DSRCmsgID_maneuverSharingAndCoordinatingMessage ((DSRCmsgID_t)42)
// #define DSRCmsgID_roadGeometryAndAttributes ((DSRCmsgID_t)43)
// #define DSRCmsgID_personalSafetyMessage2 ((DSRCmsgID_t)44)
// #define DSRCmsgID_trafficSignalPhaseAndTiming ((DSRCmsgID_t)45)
// #define DSRCmsgID_signalControlAndPrioritizationRequest ((DSRCmsgID_t)46)
// #define DSRCmsgID_signalControlAndPrioritizationStatus ((DSRCmsgID_t)47)
// #define DSRCmsgID_roadUserChargingConfigMessage ((DSRCmsgID_t)48)
// #define DSRCmsgID_roadUserChargingReportMessage ((DSRCmsgID_t)49)
// #define DSRCmsgID_trafficLightStatusMessage ((DSRCmsgID_t)50)
// #define DSRCmsgID_testMessage00 ((DSRCmsgID_t)240)
// #define DSRCmsgID_testMessage01 ((DSRCmsgID_t)241)
// #define DSRCmsgID_testMessage02 ((DSRCmsgID_t)242)
// #define DSRCmsgID_testMessage03 ((DSRCmsgID_t)243)
// #define DSRCmsgID_testMessage04 ((DSRCmsgID_t)244)
// #define DSRCmsgID_testMessage05 ((DSRCmsgID_t)245)
// #define DSRCmsgID_testMessage06 ((DSRCmsgID_t)246)
// #define DSRCmsgID_testMessage07 ((DSRCmsgID_t)247)
// #define DSRCmsgID_testMessage08 ((DSRCmsgID_t)248)
// #define DSRCmsgID_testMessage09 ((DSRCmsgID_t)249)
// #define DSRCmsgID_testMessage10 ((DSRCmsgID_t)250)
// #define DSRCmsgID_testMessage11 ((DSRCmsgID_t)251)
// #define DSRCmsgID_testMessage12 ((DSRCmsgID_t)252)
// #define DSRCmsgID_testMessage13 ((DSRCmsgID_t)253)
// #define DSRCmsgID_testMessage14 ((DSRCmsgID_t)254)
// #define DSRCmsgID_testMessage15 ((DSRCmsgID_t)255)

#ifdef __cplusplus
}
Expand Down
19 changes: 17 additions & 2 deletions src/tmx/Asn_J2735/include/asn_j2735_r2024/NodeOffsetPointXY.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@
#include "Node-XY-28b.h"
#include "Node-XY-32b.h"
#include "Node-LLmD-64b.h"
#include "RegionalExtension.h"
// #include "RegionalExtension.h"
#include "constr_CHOICE.h"
#include "asn_SEQUENCE_OF.h"

#ifdef __cplusplus
extern "C" {
#endif

/* Forward declarations */
struct Reg_NodeOffsetPointXY;

/* Dependencies */
typedef enum NodeOffsetPointXY_PR {
NodeOffsetPointXY_PR_NOTHING, /* No components present */
Expand All @@ -50,7 +54,15 @@ typedef struct NodeOffsetPointXY {
Node_XY_28b_t node_XY5;
Node_XY_32b_t node_XY6;
Node_LLmD_64b_t node_LatLon;
Reg_NodeOffsetPointXY_t regional;
// Reg_NodeOffsetPointXY_t regional;

struct NodeOffsetPointXY__regional {
A_SEQUENCE_OF(struct Reg_NodeOffsetPointXY) list;

/* Context for parsing across buffer boundaries */
asn_struct_ctx_t _asn_ctx;
} *regional;

} choice;

/* Context for parsing across buffer boundaries */
Expand All @@ -67,5 +79,8 @@ extern asn_per_constraints_t asn_PER_type_NodeOffsetPointXY_constr_1;
}
#endif

/* Referred external types */
#include "RegionalExtension.h"

#endif /* _NodeOffsetPointXY_H_ */
#include "asn_internal.h"
2 changes: 1 addition & 1 deletion src/tmx/Asn_J2735/src/r2024/BasicSafetyMessage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_partII_3[] = {
{ ATF_POINTER, 0, 0,
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
0,
&asn_DEF_BSMpartIIExtension,
&asn_DEF_CCMpartIIExtension,
0,
{
#if !defined(ASN_DISABLE_OER_SUPPORT)
Expand Down
Loading

0 comments on commit ad53e99

Please sign in to comment.