github-mirrors/OpenV2G
1
0
Fork 0
mirror of https://github.com/Martin-P/OpenV2G.git synced 2024-11-18 12:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix eMAID fragment encoding/decoding (issue reported in https://sourceforge.net/p/openv2g/tickets/11/)

Browse source 
git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@109 d9f2db14-54d0-4bde-b00c-16405c910529
This commit is contained in:
daniel_peintner 2017-12-12 15:47:10 +00:00
parent 09b9aedd33
commit b47721107e
6 changed files with 201 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/iso1/iso1EXIDatatypes.c
View file

@ -18,7 +18,7 @@
/******************************************************************* /*******************************************************************
* *
* @author Daniel.Peintner.EXT@siemens.com * @author Daniel.Peintner.EXT@siemens.com
* @version 2017-11-16 * @version 2017-12-12
* @contact Richard.Kuntschke@siemens.com * @contact Richard.Kuntschke@siemens.com
* *
* <p>Code generated by EXIdizer</p> * <p>Code generated by EXIdizer</p>
@ -428,6 +428,10 @@ void init_iso1EXIFragment(struct iso1EXIFragment* exiFrag) {
exiFrag->RequestedEnergyTransferMode_isUsed = 0u; exiFrag->RequestedEnergyTransferMode_isUsed = 0u;
exiFrag->SessionID_isUsed = 0u; exiFrag->SessionID_isUsed = 0u;
} }
void init_iso1EXISchemaInformedElementFragmentGrammar(struct iso1EXISchemaInformedElementFragmentGrammar* exiFrag) {
exiFrag->Id_isUsed = 0u;
exiFrag->CHARACTERS_GENERIC_isUsed = 0u;
}
#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */ #endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
void init_iso1MessageHeaderType(struct iso1MessageHeaderType* iso1MessageHeaderType) { void init_iso1MessageHeaderType(struct iso1MessageHeaderType* iso1MessageHeaderType) {

26
src/iso1/iso1EXIDatatypes.h
View file

@ -18,7 +18,7 @@
/******************************************************************* /*******************************************************************
* *
* @author Daniel.Peintner.EXT@siemens.com * @author Daniel.Peintner.EXT@siemens.com
* @version 2017-11-16 * @version 2017-12-12
* @contact Richard.Kuntschke@siemens.com * @contact Richard.Kuntschke@siemens.com
* *
* <p>Code generated by EXIdizer</p> * <p>Code generated by EXIdizer</p>
@ -2079,6 +2079,8 @@ struct iso1AnonType_V2G_Message {
#define EXIFragment_Certificate_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,certificateType is 800 */ #define EXIFragment_Certificate_BYTES_SIZE 800 /* XML schema facet maxLength for urn:iso:15118:2:2013:MsgDataTypes,certificateType is 800 */
#define EXIFragment_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR #define EXIFragment_X509IssuerName_CHARACTERS_SIZE 50 + EXTRA_CHAR
#define EXIFragment_Modulus_BYTES_SIZE 350 #define EXIFragment_Modulus_BYTES_SIZE 350
#define exiElementFrag_Id_CHARACTERS_SIZE 50 + EXTRA_CHAR
#define exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE 50 + EXTRA_CHAR
/* Global elements of EXI Document */ /* Global elements of EXI Document */
@ -2265,6 +2267,24 @@ struct iso1EXIDocument {
#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES #if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
struct iso1EXISchemaInformedElementFragmentGrammar {
/* Schema-informed Element Fragment Grammar for START_ELEMENT({urn:iso:15118:2:2013:MsgBody}eMAID) */
/* 4 ATTRIBUTE[STRING]({urn:iso:15118:2:2013:MsgDataTypes}Id) */
unsigned int Id_isUsed:1;
struct {
exi_string_character_t characters[exiElementFrag_Id_CHARACTERS_SIZE];
uint16_t charactersLen;
} Id ;
/* 247 START_ELEMENT({urn:iso:15118:2:2013:MsgBody}eMAID) */
unsigned int CHARACTERS_GENERIC_isUsed:1;
struct {
exi_string_character_t characters[exiElementFrag_CHARACTERS_GENERIC_CHARACTERS_SIZE];
uint16_t charactersLen;
} CHARACTERS_GENERIC ;
int _warning_;
};
/* Possible elements of EXI Fragment */ /* Possible elements of EXI Fragment */
struct iso1EXIFragment { struct iso1EXIFragment {
#if SAVE_MEMORY_WITH_UNNAMED_UNION == UNION_YES #if SAVE_MEMORY_WITH_UNNAMED_UNION == UNION_YES
@ -2494,7 +2514,8 @@ struct iso1EXIFragment {
struct iso1EVStatusType EVStatus ; struct iso1EVStatusType EVStatus ;
struct iso1SupportedEnergyTransferModeType SupportedEnergyTransferMode ; struct iso1SupportedEnergyTransferModeType SupportedEnergyTransferMode ;
struct iso1SignedInfoType SignedInfo ; struct iso1SignedInfoType SignedInfo ;
struct iso1EMAIDType eMAID ; /* Schema-informed Element Fragment Grammar for {urn:iso:15118:2:2013:MsgBody}eMAID */
struct iso1EXISchemaInformedElementFragmentGrammar eMAID ;
uint16_t MaxEntriesSAScheduleTuple ; uint16_t MaxEntriesSAScheduleTuple ;
iso1paymentOptionType PaymentOption ; iso1paymentOptionType PaymentOption ;
struct iso1SubCertificatesType SubCertificates ; struct iso1SubCertificatesType SubCertificates ;
@ -2839,6 +2860,7 @@ struct iso1EXIFragment {
void init_iso1EXIDocument(struct iso1EXIDocument* exiDoc); void init_iso1EXIDocument(struct iso1EXIDocument* exiDoc);
#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES #if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
void init_iso1EXIFragment(struct iso1EXIFragment* exiFrag); void init_iso1EXIFragment(struct iso1EXIFragment* exiFrag);
void init_iso1EXISchemaInformedElementFragmentGrammar(struct iso1EXISchemaInformedElementFragmentGrammar* exiFrag);
#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */ #endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
void init_iso1MessageHeaderType(struct iso1MessageHeaderType* iso1MessageHeaderType); void init_iso1MessageHeaderType(struct iso1MessageHeaderType* iso1MessageHeaderType);
void init_iso1SignatureType(struct iso1SignatureType* iso1SignatureType); void init_iso1SignatureType(struct iso1SignatureType* iso1SignatureType);

94
src/iso1/iso1EXIDatatypesDecoder.c
View file

File diff suppressed because one or more lines are too long

2
src/iso1/iso1EXIDatatypesDecoder.h
View file

@ -18,7 +18,7 @@
/******************************************************************* /*******************************************************************
* *
* @author Daniel.Peintner.EXT@siemens.com * @author Daniel.Peintner.EXT@siemens.com
* @version 2017-11-16 * @version 2017-12-12
* @contact Richard.Kuntschke@siemens.com * @contact Richard.Kuntschke@siemens.com
* *
* <p>Code generated by EXIdizer</p> * <p>Code generated by EXIdizer</p>

80
src/iso1/iso1EXIDatatypesEncoder.c
View file

File diff suppressed because one or more lines are too long

2
src/iso1/iso1EXIDatatypesEncoder.h
View file

@ -18,7 +18,7 @@
/******************************************************************* /*******************************************************************
* *
* @author Daniel.Peintner.EXT@siemens.com * @author Daniel.Peintner.EXT@siemens.com
* @version 2017-11-16 * @version 2017-12-12
* @contact Richard.Kuntschke@siemens.com * @contact Richard.Kuntschke@siemens.com
* *
* <p>Code generated by EXIdizer</p> * <p>Code generated by EXIdizer</p>