Commit 43b20ceb authored by reinaortega's avatar reinaortega
Browse files

Using XSD converted types

parent 55da9ef6
Loading
Loading
Loading
Loading
+10 −15
Original line number Diff line number Diff line
@@ -11,9 +11,12 @@ module LibItsV2G_TypesAndValues {
    import from LibCommon_BasicTypesAndValues all;
    
    // LibIts
    /*import from V2G_PDU_Descriptions language "XML" {
        type V2Gpdu
    };*/
	import from iso_15118_2_2010_MsgBody all; //language "XSD" all with {extension "File:V2G_CI_MsgBody.xsd" };
	import from iso_15118_2_2010_AppProtocol all;//language "XSD" all with {extension "File:XSD/V2G_CI_AppProtocol.xsd" };
	import from iso_15118_2_2010_MsgDataTypes all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgDataTypes.xsd" };
	import from iso_15118_2_2010_MsgDef all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgDef.xsd" };
	import from iso_15118_2_2010_MsgHeader all;//language "XSD" all with {extension "File:XSD/V2G_CI_MsgHeader.xsd" };
	import from org_w3_www__2000_09_xmldsig all;//language "XSD" all with {extension "File:XSD/xmldsig-core-schema.xsd" };
    
    group v2gPdus {
     
@@ -27,14 +30,6 @@ module LibItsV2G_TypesAndValues {

    group v2gPayload {
        
        /**
         * @desc The payload of the V2G packet
         * @remark Change it to concrete union value if necessary
         */
        type union V2Gpayload {
            V2Gpdu v2gPacket,
            octetstring otherPayload
        }
        
    } //end v2gPayload

@@ -86,11 +81,11 @@ module LibItsV2G_TypesAndValues {
        }
        
        /**
         * @desc Upper Tester message generating V2G packet
         * @desc Upper Tester message generating V2G message
         */
        type union UtV2gEvent {
            V2Gheader   v2gHeader,
            V2Gpayload  payload
        type union UtV2Gevent {
			iso_15118_2_2010_MsgDef.V2G_Message.Header   v2gHeader,
			iso_15118_2_2010_MsgDef.V2G_Message.Body     v2gBody
        }
        
    } // end utPrimitives