codec update

src/codec/AbstractDecoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/AbstractEncoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitDecoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitEncoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitInputStream.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitInputStream.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitOutputStream.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/BitOutputStream.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteDecoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteEncoderChannel.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteStream.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/ByteStream.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/CoderChannel.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/DecoderChannel.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXICoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -976,6 +976,10 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] */
 		state->grammarStack[state->stackIndex] = 394;
 		return 0;
+	case 92:
+		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}Certificate)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}Certificate)] */
+		state->grammarStack[state->stackIndex] = 98;
+		return 0;
 	case 534:
 		/* First(xsi:type)StartTag[CHARACTERS[INTEGER]] --> Element[CHARACTERS[INTEGER]] */
 	case 410:
@@ -986,10 +990,6 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* First(xsi:type)StartTag[CHARACTERS[INTEGER]] --> Element[CHARACTERS[INTEGER]] */
 		state->grammarStack[state->stackIndex] = 243;
 		return 0;
-	case 92:
-		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}Certificate)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}Certificate)] */
-		state->grammarStack[state->stackIndex] = 98;
-		return 0;
 	case 82:
 		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}RootCertificateID)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}RootCertificateID)] */
 		state->grammarStack[state->stackIndex] = 86;
@@ -1400,6 +1400,8 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] */
 	case 62:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVSEStatusCode)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVSEStatusCode)] */
+	case 91:
+		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractSignatureEncryptedPrivateKey)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractSignatureEncryptedPrivateKey)] */
 	case 451:
 		/* Element[CHARACTERS[ENUMERATION]] --> Element[CHARACTERS[ENUMERATION]] */
 	case 500:
@@ -1542,8 +1544,6 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}DC_EVSEStatus)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}DC_EVSEStatus)] */
 	case 282:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}BulkChargingComplete), START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ChargingComplete)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}BulkChargingComplete), START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ChargingComplete)] */
-	case 51:
-		/* Element[END_ELEMENT] --> Element[END_ELEMENT] */
 	case 588:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgHeader}SessionID)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgHeader}SessionID)] */
 	case 610:
@@ -1602,6 +1602,8 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[CHARACTERS[DATETIME]] --> Element[CHARACTERS[DATETIME]] */
 	case 593:
 		/* Element[END_ELEMENT] --> Element[END_ELEMENT] */
+	case 126:
+		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] */
 	case 172:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}PMaxScheduleID)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}PMaxScheduleID)] */
 	case 517:
@@ -1674,6 +1676,8 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] --> Element[START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] */
 	case 206:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVSEMaximumPowerLimit), START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVSEMaximumVoltageLimit)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVSEMaximumPowerLimit), START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVSEMaximumVoltageLimit)] */
+	case 34:
+		/* Element[END_ELEMENT] --> Element[END_ELEMENT] */
 	case 112:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractID)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractID)] */
 	case 13:
@@ -1682,6 +1686,8 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}KeyName), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}KeyValue), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}RetrievalMethod), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}X509Data), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}PGPData), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}SPKIData), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}MgmtData), START_ELEMENT_GENERIC, CHARACTERS_GENERIC[STRING]] --> Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}KeyName), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}KeyValue), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}RetrievalMethod), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}X509Data), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}PGPData), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}SPKIData), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}MgmtData), START_ELEMENT_GENERIC, CHARACTERS_GENERIC[STRING]] */
 	case 557:
 		/* Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}KeyInfo), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}Object), END_ELEMENT] --> Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}KeyInfo), START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}Object), END_ELEMENT] */
+	case 51:
+		/* Element[END_ELEMENT] --> Element[END_ELEMENT] */
 	case 343:
 		/* Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}X509SerialNumber)] --> Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}X509SerialNumber)] */
 	case 575:
@@ -1798,8 +1804,6 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[CHARACTERS[STRING]] --> Element[CHARACTERS[STRING]] */
 	case 419:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ChargingProfileEntryMaxPower)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ChargingProfileEntryMaxPower)] */
-	case 91:
-		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractSignatureEncryptedPrivateKey)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractSignatureEncryptedPrivateKey)] */
 	case 531:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}EVSEID)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}EVSEID)] */
 	case 321:
@@ -1968,8 +1972,6 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}XPath), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] --> Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}XPath), START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] */
 	case 46:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVRESSConditioning), START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVErrorCode)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVRESSConditioning), START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVErrorCode)] */
-	case 153:
-		/* Element[CHARACTERS[INTEGER]] --> Element[CHARACTERS[INTEGER]] */
 	case 262:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}BulkChargingComplete), START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ChargingComplete)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}BulkChargingComplete), START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ChargingComplete)] */
 	case 237:
@@ -2124,8 +2126,6 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}SalesTariffEntry), END_ELEMENT] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}SalesTariffEntry), END_ELEMENT] */
 	case 516:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ParameterSetID), END_ELEMENT] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ParameterSetID), END_ELEMENT] */
-	case 126:
-		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] */
 	case 120:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractEncryptionEncryptedPrivateKey)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractEncryptionEncryptedPrivateKey)] */
 	case 394:
@@ -2134,8 +2134,6 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[CHARACTERS[ENUMERATION]] --> Element[CHARACTERS[ENUMERATION]] */
 	case 602:
 		/* Element[START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] --> Element[START_ELEMENT_GENERIC, END_ELEMENT, CHARACTERS_GENERIC[STRING]] */
-	case 34:
-		/* Element[END_ELEMENT] --> Element[END_ELEMENT] */
 	case 59:
 		/* Element[CHARACTERS[ENUMERATION]] --> Element[CHARACTERS[ENUMERATION]] */
 	case 457:
@@ -2170,6 +2168,8 @@ int exiMoveToElementContentRule(exi_state_t* state) {
 		/* Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}Transform), END_ELEMENT] --> Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}Transform), END_ELEMENT] */
 	case 594:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}DC_EVStatus)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}DC_EVStatus)] */
+	case 153:
+		/* Element[CHARACTERS[INTEGER]] --> Element[CHARACTERS[INTEGER]] */
 	case 151:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}PMaxSchedule)] --> Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}PMaxSchedule)] */
 	case 261:

src/codec/EXICoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIDecoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIEncoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -4661,8 +4661,6 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* FirstStartTag[CHARACTERS[ENUMERATION]] */
 	case 603:
 		/* FirstStartTag[CHARACTERS[LIST]] */
-	case 92:
-		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}Certificate)] */
 	case 518:
 		/* First(xsi:type)StartTag[CHARACTERS[INTEGER]] */
 	case 42:
@@ -4709,6 +4707,8 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 678:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
+	case 52:
+		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 104:
 		/* FirstStartTag[CHARACTERS[BINARY_BASE64]] */
 	case 116:
@@ -4825,6 +4825,8 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* First(xsi:type)StartTag[CHARACTERS[STRING]] */
 	case 480:
 		/* First(xsi:type)StartTag[CHARACTERS[INTEGER]] */
+	case 92:
+		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}Certificate)] */
 	case 651:
 		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 342:
@@ -4953,8 +4955,6 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ServiceID)] */
 	case 230:
 		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}MeterID)] */
-	case 52:
-		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 82:
 		/* FirstStartTag[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}RootCertificateID)] */
 	case 623:
@@ -5081,6 +5081,8 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		return 0;
 	case 599:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] */
+	case 91:
+		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractSignatureEncryptedPrivateKey)] */
 	case 62:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}EVSEStatusCode)] */
 	case 451:
@@ -5193,6 +5195,8 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[ENUMERATION]] */
 	case 654:
 		/* Element[CHARACTERS[DATETIME]] */
+	case 126:
+		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] */
 	case 172:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}PMaxScheduleID)] */
 	case 36:
@@ -5325,8 +5329,6 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[STRING]] */
 	case 419:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ChargingProfileEntryMaxPower)] */
-	case 91:
-		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractSignatureEncryptedPrivateKey)] */
 	case 531:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}EVSEID)] */
 	case 321:
@@ -5401,8 +5403,6 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}PMaxScheduleEntry)] */
 	case 338:
 		/* Element[START_ELEMENT({http://www.w3.org/2000/09/xmldsig#}Transform)] */
-	case 153:
-		/* Element[CHARACTERS[INTEGER]] */
 	case 237:
 		/* Element[CHARACTERS[BINARY_BASE64]] */
 	case 347:
@@ -5489,8 +5489,6 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}ServiceID)] */
 	case 64:
 		/* Element[CHARACTERS[ENUMERATION]] */
-	case 126:
-		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ResponseCode)] */
 	case 120:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}ContractEncryptionEncryptedPrivateKey)] */
 	case 394:
@@ -5513,6 +5511,8 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}EVRequestedEnergyTransferType)] */
 	case 594:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgBody}DC_EVStatus)] */
+	case 153:
+		/* Element[CHARACTERS[INTEGER]] */
 	case 151:
 		/* Element[START_ELEMENT({urn:iso:15118:2:2010:MsgDataTypes}PMaxSchedule)] */
 	case 680:

src/codec/EXIEncoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderDecoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderDecoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderEncoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXIHeaderEncoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/EXITypes.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -59,8 +59,8 @@ extern "C" {
 /* EXI stream */
 #define BYTE_ARRAY 1
 #define FILE_STREAM 2
-#define EXI_STREAM BYTE_ARRAY 
-/*#define EXI_STREAM FILE_STREAM*/
+#define EXI_STREAM BYTE_ARRAY
+/*  #define EXI_STREAM FILE_STREAM */
 
 #define EXI_ELEMENT_STACK_SIZE 16
 

src/codec/EncoderChannel.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/MethodsBag.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/MethodsBag.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/NameTableEntries.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/NameTableEntries.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/StringTable.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/StringTable.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/UCSString.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/UCSString.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/appHandCodec/appHand_EXIDecoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -109,6 +109,32 @@ static int _decodeListValues(bitstream_t* stream, exi_datatype_t dt, uint16_t le
 
 	return 0;
 }
+static int _decodeListIntegerValues(bitstream_t* stream, exi_integer_type_t dt, uint16_t len) {
+	unsigned int i;
+
+	integer_t iv;
+
+	for(i = 0; i<len; i++) {
+		switch(dt) {
+		case UNSIGNED_INTEGER_8:
+		case UNSIGNED_INTEGER_16:
+		case UNSIGNED_INTEGER_32:
+		case UNSIGNED_INTEGER_64:
+			errn = decodeUnsignedInteger(stream, &iv);
+			break;
+		case INTEGER_8:
+		case INTEGER_16:
+		case INTEGER_32:
+		case INTEGER_64:
+			errn = decodeInteger(stream, &iv);
+			break;
+		default:
+			return EXI_UNSUPPORTED_LIST_VALUE_TYPE;
+		}
+	}
+
+	return 0;
+}
 
 
 int exiappHandInitDecoder(bitstream_t* stream, exi_state_t* state, exi_name_table_runtime_t runtimeTable) {
@@ -116,7 +142,7 @@ int exiappHandInitDecoder(bitstream_t* stream, exi_state_t* state, exi_name_tabl
 	state->stackIndex = 0;
 	state->grammarStack[0] = DOCUMENT;
 	/* string table */
-	/* state->nameTablePrepopulated = exiappHandNameTablePrepopulated; */
+	state->nameTablePrepopulated = exiappHandNameTablePrepopulated;
 	state->nameTableRuntime = runtimeTable;
 	/* decode header */
 	return readEXIHeader(stream);
@@ -131,30 +157,28 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[STRING]] */
 	case 124:
 		/* Element[CHARACTERS[STRING]] */
-	case 96:
-		/* Element[CHARACTERS[FLOAT]] */
-	case 88:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 139:
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 46:
 		/* Element[CHARACTERS[ENUMERATION]] */
 	case 22:
 		/* Element[START_ELEMENT(ProtocolNamespace)] */
+	case 86:
+		/* Element[CHARACTERS[DATETIME]] */
+	case 92:
+		/* Element[CHARACTERS[FLOAT]] */
 	case 134:
 		/* Element[CHARACTERS[STRING]] */
-	case 98:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 120:
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
+	case 100:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 54:
 		/* Element[CHARACTERS[STRING]] */
 	case 68:
 		/* Element[CHARACTERS[STRING]] */
 	case 72:
 		/* Element[CHARACTERS[STRING]] */
-	case 100:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 21:
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 78:
@@ -163,14 +187,20 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 52:
 		/* Element[CHARACTERS[LIST]] */
-	case 82:
-		/* Element[CHARACTERS[BOOLEAN]] */
-	case 84:
-		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 102:
+		/* Element[CHARACTERS[DATETIME]] */
+	case 96:
+		/* Element[CHARACTERS[FLOAT]] */
 	case 60:
 		/* Element[CHARACTERS[LIST]] */
+	case 82:
+		/* Element[CHARACTERS[BOOLEAN]] */
+	case 88:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 116:
 		/* Element[CHARACTERS[INTEGER]] */
+	case 98:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 128:
 		/* Element[CHARACTERS[INTEGER]] */
 	case 13:
@@ -185,8 +215,8 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[INTEGER]] */
 	case 66:
 		/* Element[CHARACTERS[LIST]] */
-	case 92:
-		/* Element[CHARACTERS[FLOAT]] */
+	case 94:
+		/* Element[CHARACTERS[STRING]] */
 	case 112:
 		/* Element[CHARACTERS[INTEGER]] */
 	case 58:
@@ -203,6 +233,8 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[STRING]] */
 	case 108:
 		/* Element[CHARACTERS[BINARY_HEX]] */
+	case 84:
+		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 106:
 		/* Element[CHARACTERS[DATETIME]] */
 	case 11:
@@ -215,8 +247,6 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[STRING]] */
 	case 62:
 		/* Element[CHARACTERS[STRING]] */
-	case 102:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 130:
 		/* Element[CHARACTERS[STRING]] */
 	case 126:
@@ -231,14 +261,10 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 80:
 		/* Element[CHARACTERS[BINARY_BASE64]] */
-	case 86:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 56:
 		/* Element[CHARACTERS[STRING]] */
 	case 132:
 		/* Element[CHARACTERS[DATETIME]] */
-	case 94:
-		/* Element[CHARACTERS[STRING]] */
 	case 18:
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 		errn = decodeNBitUnsignedInteger(stream, 2, &eventCode2);
@@ -352,38 +378,38 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 57:
 		/* FirstStartTag[CHARACTERS[STRING]] */
+	case 97:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 135:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 5:
 		/* FirstStartTag[START_ELEMENT(ProtocolNamespace)] */
+	case 91:
+		/* FirstStartTag[CHARACTERS[FLOAT]] */
 	case 111:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
-	case 103:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 7:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 89:
-		/* FirstStartTag[CHARACTERS[DECIMAL]] */
 	case 123:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 61:
 		/* FirstStartTag[CHARACTERS[STRING]] */
+	case 99:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 73:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 53:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 91:
-		/* FirstStartTag[CHARACTERS[FLOAT]] */
-	case 99:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
+	case 93:
+		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 59:
 		/* FirstStartTag[CHARACTERS[LIST]] */
 	case 63:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 93:
-		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 115:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
+	case 101:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 71:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 77:
@@ -392,26 +418,20 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 121:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
-	case 101:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
-	case 95:
-		/* FirstStartTag[CHARACTERS[FLOAT]] */
 	case 17:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 83:
+		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 117:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
 	case 3:
 		/* FirstStartTag[START_ELEMENT(AppProtocol)] */
+	case 87:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 79:
 		/* FirstStartTag[CHARACTERS[BINARY_BASE64]] */
-	case 85:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
-	case 97:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 67:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 87:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 137:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 81:
@@ -436,10 +456,12 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* FirstStartTag[START_ELEMENT(ResponseCode)] */
 	case 20:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
-	case 83:
-		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 85:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 125:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
+	case 103:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 138:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 15:
@@ -448,10 +470,14 @@ static int exiDecodeNext2Event(bitstream_t* stream, exi_state_t* state,
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 131:
 		/* FirstStartTag[CHARACTERS[DATETIME]] */
+	case 89:
+		/* FirstStartTag[CHARACTERS[DECIMAL]] */
 	case 107:
 		/* FirstStartTag[CHARACTERS[BINARY_HEX]] */
 	case 127:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
+	case 95:
+		/* FirstStartTag[CHARACTERS[FLOAT]] */
 		errn = decodeNBitUnsignedInteger(stream, 3, &eventCode2);
 		switch (eventCode2) {
 		case 0:
@@ -506,42 +532,42 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[STRING]] */
 	case 57:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 96:
-		/* Element[CHARACTERS[FLOAT]] */
+	case 97:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 135:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
-	case 88:
-		/* Element[CHARACTERS[DATETIME]] */
+	case 91:
+		/* FirstStartTag[CHARACTERS[FLOAT]] */
 	case 111:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
 	case 139:
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
-	case 103:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 46:
 		/* Element[CHARACTERS[ENUMERATION]] */
+	case 86:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 7:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 89:
-		/* FirstStartTag[CHARACTERS[DECIMAL]] */
+	case 92:
+		/* Element[CHARACTERS[FLOAT]] */
 	case 134:
 		/* Element[CHARACTERS[STRING]] */
 	case 123:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 61:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 98:
-		/* Element[CHARACTERS[DATETIME]] */
+	case 99:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 120:
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 73:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 53:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 91:
-		/* FirstStartTag[CHARACTERS[FLOAT]] */
-	case 99:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
+	case 93:
+		/* FirstStartTag[CHARACTERS[STRING]] */
+	case 100:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 54:
 		/* Element[CHARACTERS[STRING]] */
 	case 59:
@@ -552,12 +578,10 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[STRING]] */
 	case 63:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 93:
-		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 115:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
-	case 100:
-		/* Element[CHARACTERS[DATETIME]] */
+	case 101:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 21:
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 71:
@@ -574,36 +598,36 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 52:
 		/* Element[CHARACTERS[LIST]] */
-	case 101:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
-	case 95:
-		/* FirstStartTag[CHARACTERS[FLOAT]] */
+	case 102:
+		/* Element[CHARACTERS[DATETIME]] */
+	case 96:
+		/* Element[CHARACTERS[FLOAT]] */
 	case 17:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
-	case 82:
-		/* Element[CHARACTERS[BOOLEAN]] */
+	case 83:
+		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 117:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
-	case 84:
-		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 87:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 60:
 		/* Element[CHARACTERS[LIST]] */
 	case 79:
 		/* FirstStartTag[CHARACTERS[BINARY_BASE64]] */
-	case 85:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
+	case 82:
+		/* Element[CHARACTERS[BOOLEAN]] */
+	case 88:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 116:
 		/* Element[CHARACTERS[INTEGER]] */
-	case 97:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
+	case 98:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 128:
 		/* Element[CHARACTERS[INTEGER]] */
 	case 67:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 13:
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
-	case 87:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 90:
 		/* Element[CHARACTERS[DECIMAL]] */
 	case 137:
@@ -620,8 +644,8 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[LIST]] */
 	case 51:
 		/* FirstStartTag[CHARACTERS[LIST]] */
-	case 92:
-		/* Element[CHARACTERS[FLOAT]] */
+	case 94:
+		/* Element[CHARACTERS[STRING]] */
 	case 112:
 		/* Element[CHARACTERS[INTEGER]] */
 	case 58:
@@ -642,6 +666,8 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* FirstStartTag[CHARACTERS[LIST]] */
 	case 108:
 		/* Element[CHARACTERS[BINARY_HEX]] */
+	case 84:
+		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 129:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 106:
@@ -652,16 +678,16 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[STRING]] */
 	case 20:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
-	case 83:
-		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 85:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 125:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 64:
 		/* Element[CHARACTERS[STRING]] */
 	case 62:
 		/* Element[CHARACTERS[STRING]] */
-	case 102:
-		/* Element[CHARACTERS[DATETIME]] */
+	case 103:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 138:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 130:
@@ -682,8 +708,8 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 80:
 		/* Element[CHARACTERS[BINARY_BASE64]] */
-	case 86:
-		/* Element[CHARACTERS[DATETIME]] */
+	case 89:
+		/* FirstStartTag[CHARACTERS[DECIMAL]] */
 	case 56:
 		/* Element[CHARACTERS[STRING]] */
 	case 107:
@@ -692,8 +718,8 @@ int exiappHandDecodeNextEvent(bitstream_t* stream, exi_state_t* state,
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
 	case 132:
 		/* Element[CHARACTERS[DATETIME]] */
-	case 94:
-		/* Element[CHARACTERS[STRING]] */
+	case 95:
+		/* FirstStartTag[CHARACTERS[FLOAT]] */
 	case 18:
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 		errn = decodeNBitUnsignedInteger(stream, 1, &state->eventCode);

src/codec/appHandCodec/appHand_EXIDecoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/appHandCodec/appHand_EXIEncoder.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>
@@ -201,7 +201,7 @@ int exiappHandInitEncoder(bitstream_t* stream, exi_state_t* state, exi_name_tabl
 	state->stackIndex = 0;
 	state->grammarStack[0] = DOCUMENT;
 	/* string tables */
-	/* state->nameTablePrepopulated = exiappHandNameTablePrepopulated; */
+	state->nameTablePrepopulated = exiappHandNameTablePrepopulated;
 	state->nameTableRuntime = runtimeTable;
 	/* encode header */
 	return writeEXIHeader(stream);
@@ -834,30 +834,28 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[STRING]] */
 	case 124:
 		/* Element[CHARACTERS[STRING]] */
-	case 96:
-		/* Element[CHARACTERS[FLOAT]] */
-	case 88:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 139:
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 46:
 		/* Element[CHARACTERS[ENUMERATION]] */
 	case 22:
 		/* Element[START_ELEMENT(ProtocolNamespace)] */
+	case 86:
+		/* Element[CHARACTERS[DATETIME]] */
+	case 92:
+		/* Element[CHARACTERS[FLOAT]] */
 	case 134:
 		/* Element[CHARACTERS[STRING]] */
-	case 98:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 120:
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
+	case 100:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 54:
 		/* Element[CHARACTERS[STRING]] */
 	case 68:
 		/* Element[CHARACTERS[STRING]] */
 	case 72:
 		/* Element[CHARACTERS[STRING]] */
-	case 100:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 21:
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 78:
@@ -866,14 +864,20 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 52:
 		/* Element[CHARACTERS[LIST]] */
-	case 82:
-		/* Element[CHARACTERS[BOOLEAN]] */
-	case 84:
-		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 102:
+		/* Element[CHARACTERS[DATETIME]] */
+	case 96:
+		/* Element[CHARACTERS[FLOAT]] */
 	case 60:
 		/* Element[CHARACTERS[LIST]] */
+	case 82:
+		/* Element[CHARACTERS[BOOLEAN]] */
+	case 88:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 116:
 		/* Element[CHARACTERS[INTEGER]] */
+	case 98:
+		/* Element[CHARACTERS[DATETIME]] */
 	case 128:
 		/* Element[CHARACTERS[INTEGER]] */
 	case 13:
@@ -888,8 +892,8 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[INTEGER]] */
 	case 66:
 		/* Element[CHARACTERS[LIST]] */
-	case 92:
-		/* Element[CHARACTERS[FLOAT]] */
+	case 94:
+		/* Element[CHARACTERS[STRING]] */
 	case 112:
 		/* Element[CHARACTERS[INTEGER]] */
 	case 58:
@@ -906,6 +910,8 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[STRING]] */
 	case 108:
 		/* Element[CHARACTERS[BINARY_HEX]] */
+	case 84:
+		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 106:
 		/* Element[CHARACTERS[DATETIME]] */
 	case 11:
@@ -918,8 +924,6 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[STRING]] */
 	case 62:
 		/* Element[CHARACTERS[STRING]] */
-	case 102:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 130:
 		/* Element[CHARACTERS[STRING]] */
 	case 126:
@@ -934,14 +938,10 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 80:
 		/* Element[CHARACTERS[BINARY_BASE64]] */
-	case 86:
-		/* Element[CHARACTERS[DATETIME]] */
 	case 56:
 		/* Element[CHARACTERS[STRING]] */
 	case 132:
 		/* Element[CHARACTERS[DATETIME]] */
-	case 94:
-		/* Element[CHARACTERS[STRING]] */
 	case 18:
 		/* Element[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 		/* 1st level and 2nd level event code */
@@ -958,38 +958,38 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 57:
 		/* FirstStartTag[CHARACTERS[STRING]] */
+	case 97:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 135:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 5:
 		/* FirstStartTag[START_ELEMENT(ProtocolNamespace)] */
+	case 91:
+		/* FirstStartTag[CHARACTERS[FLOAT]] */
 	case 111:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
-	case 103:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 7:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 89:
-		/* FirstStartTag[CHARACTERS[DECIMAL]] */
 	case 123:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 61:
 		/* FirstStartTag[CHARACTERS[STRING]] */
+	case 99:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 73:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 53:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 91:
-		/* FirstStartTag[CHARACTERS[FLOAT]] */
-	case 99:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
+	case 93:
+		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 59:
 		/* FirstStartTag[CHARACTERS[LIST]] */
 	case 63:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 93:
-		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 115:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
+	case 101:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 71:
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 77:
@@ -998,26 +998,20 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 121:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
-	case 101:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
-	case 95:
-		/* FirstStartTag[CHARACTERS[FLOAT]] */
 	case 17:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 83:
+		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
 	case 117:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
 	case 3:
 		/* FirstStartTag[START_ELEMENT(AppProtocol)] */
+	case 87:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 79:
 		/* FirstStartTag[CHARACTERS[BINARY_BASE64]] */
-	case 85:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
-	case 97:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 67:
 		/* FirstStartTag[CHARACTERS[STRING]] */
-	case 87:
-		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 137:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 81:
@@ -1042,10 +1036,12 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* FirstStartTag[START_ELEMENT(ResponseCode)] */
 	case 20:
 		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
-	case 83:
-		/* FirstStartTag[CHARACTERS[NBIT_UNSIGNED_INTEGER]] */
+	case 85:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 125:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
+	case 103:
+		/* FirstStartTag[CHARACTERS[DATETIME]] */
 	case 138:
 		/* FirstStartTag[CHARACTERS[UNSIGNED_INTEGER]] */
 	case 15:
@@ -1054,10 +1050,14 @@ static int _exiEncodeEndElementUndeclared(bitstream_t* stream, exi_state_t* stat
 		/* FirstStartTag[CHARACTERS[STRING]] */
 	case 131:
 		/* FirstStartTag[CHARACTERS[DATETIME]] */
+	case 89:
+		/* FirstStartTag[CHARACTERS[DECIMAL]] */
 	case 107:
 		/* FirstStartTag[CHARACTERS[BINARY_HEX]] */
 	case 127:
 		/* FirstStartTag[CHARACTERS[INTEGER]] */
+	case 95:
+		/* FirstStartTag[CHARACTERS[FLOAT]] */
 		/* 1st level and 2nd level event code */
 		encodeNBitUnsignedInteger(stream, 1, 1);
 		encodeNBitUnsignedInteger(stream, 3, 0);

src/codec/appHandCodec/appHand_EXIEncoder.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 0.6
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/appHandCodec/appHand_NameTableEntries.c

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 2012-01-13 
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/codec/appHandCodec/appHand_NameTableEntries.h

@@ -19,7 +19,7 @@
 /*******************************************************************
  *
  * @author Daniel.Peintner.EXT@siemens.com
- * @version 2012-01-13 
+ * @version 2012-01-31 
  * @contact Joerg.Heuer@siemens.com
  *
  * <p>Code generated by EXIdizer</p>

src/test/evse_serviceMethods.c

@@ -468,7 +468,7 @@ int	currentDemand(struct MessageHeaderType* header, struct CurrentDemandReqType*
 
 	f.Multiplier = 0;
 	f.Unit = V_unitSymbolType;
-	f.Value = 400;
+	f.Value = 300;
 
 	result->EVSEPresentVoltage=f;
 
@@ -479,7 +479,7 @@ int	currentDemand(struct MessageHeaderType* header, struct CurrentDemandReqType*
 
 	result->EVSECurrentLimitAchieved=0;
 
-	result->EVSEVoltageLimitAchieved=1;
+	result->EVSEVoltageLimitAchieved=0;
 
 	result->EVSEPowerLimitAchieved=0;
 

src/test/main_codec.c

@@ -44,8 +44,6 @@
 #include "EXITypes.h"
 #include "ByteStream.h"
 
-#define DEBUG 1
-
 #if EXI_STREAM == BYTE_ARRAY
 /* 64 kilobytes = 65 536 bytes */
 /* 1 megabyte = 1 048 576 bytes*/
@@ -63,7 +61,9 @@ uint32_t codepoints[ARRAY_SIZE_STRINGS];
 char charsNamespaceURI[ARRAY_SIZE_STRINGS_ASCII];
 char charsLocalName[ARRAY_SIZE_STRINGS_ASCII];
 
-void debugValue(exi_value_t* val) ;
+#if EXI_DEBUG == EXI_DEBUG_ON
+static void debugValue(exi_value_t* val);
+#endif /*EXI_DEBUG*/
 
 int main_codec(int argc, char *argv[]) {
 
@@ -87,14 +87,18 @@ int main_codec(int argc, char *argv[]) {
 	/* BINARY memory setup */
 	bytes_t bytes = { ARRAY_SIZE_BYTES, bytesData, 0 };
 
+#if EXI_DEBUG == EXI_DEBUG_ON
 	const char * localName;
 	const char * namespaceURI;
+#endif /*EXI_DEBUG*/
 	int noEndOfDocument = 1; /* true */
 
 	/* STRING memory setup */
 	string_ucs_t string = { ARRAY_SIZE_STRINGS, codepoints, 0 };
-	string_ascii_t stringNamespaceURI = { ARRAY_SIZE_STRINGS_ASCII, charsNamespaceURI };
-	string_ascii_t stringLocalName = { ARRAY_SIZE_STRINGS_ASCII, charsLocalName };
+	string_ascii_t stringNamespaceURI = { ARRAY_SIZE_STRINGS_ASCII,
+			charsNamespaceURI };
+	string_ascii_t stringLocalName =
+			{ ARRAY_SIZE_STRINGS_ASCII, charsLocalName };
 	qn.namespaceURI = stringNamespaceURI;
 	qn.localName = stringLocalName;
 
@@ -122,7 +126,7 @@ int main_codec(int argc, char *argv[]) {
 	iStream.pos = &posDecode;
 #endif /* EXI_STREAM == BYTE_ARRAY */
 #if EXI_STREAM == FILE_STREAM
-	iStream.file = fopen(argv[1],"rb");
+	iStream.file = fopen(argv[1], "rb");
 #endif /* EXI_STREAM == FILE_STREAM */
 
 	iStream.buffer = 0;
@@ -136,7 +140,7 @@ int main_codec(int argc, char *argv[]) {
 	oStream.pos = &posEncode;
 #endif
 #if EXI_STREAM == FILE_STREAM
-	oStream.file = fopen(argv[2],"wb");
+	oStream.file = fopen(argv[2], "wb");
 #endif /* EXI_STREAM == FILE_STREAM */
 	oStream.buffer = 0;
 	oStream.capacity = 8;
@@ -153,240 +157,280 @@ int main_codec(int argc, char *argv[]) {
 	errn = exiInitNameTableRuntime(&runtimeTableEncode);
 	exiInitEncoder(&oStream, &stateEncode, runtimeTableEncode);
 
-	if (DEBUG) {
-		printf("[DECODE] >>> EXI  >>> [ENCODE] \n");
-	}
+#if EXI_DEBUG == EXI_DEBUG_ON
+	printf("[DECODE] >>> EXI  >>> [ENCODE] \n");
+#endif /*EXI_DEBUG*/
 
 	do {
 		if (errn < 0) {
-			if (DEBUG) {
-				printf("[Encode-ERROR] %d \n", errn);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf("[Encode-ERROR] %d \n", errn);
+#endif /*EXI_DEBUG*/
 			return errn;
 		}
 
-		errn = exiDecodeNextEvent(&iStream, &stateDecode, &event);
+		errn = exiDecodeNextEvent(&iStream, &stateDecode,
+				&event);
 		if (errn < 0) {
-			if (DEBUG) {
-				printf("[Decode-ERROR] %d \n", errn);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf("[Decode-ERROR] %d \n", errn);
+#endif /*EXI_DEBUG*/
 			return errn;
 		}
 
 		switch (event) {
 		case START_DOCUMENT:
 			/* decode */
-			errn = exiDecodeStartDocument(&iStream, &stateDecode);
+			errn = exiDecodeStartDocument(&iStream,
+					&stateDecode);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-SD] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-SD] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				printf(">> START_DOCUMENT \n");
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf(">> START_DOCUMENT \n");
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeStartDocument(&oStream, &stateEncode);
+			errn = exiEncodeStartDocument(&oStream,
+					&stateEncode);
 			break;
 		case END_DOCUMENT:
 			/* decode */
-			errn = exiDecodeEndDocument(&iStream, &stateDecode);
+			errn = exiDecodeEndDocument(&iStream,
+					&stateDecode);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-ED] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-ED] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				printf(">> END_DOCUMENT \n");
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf(">> END_DOCUMENT \n");
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeEndDocument(&oStream, &stateEncode);
+			errn = exiEncodeEndDocument(&oStream,
+					&stateEncode);
 			/* signalize end of document */
 			noEndOfDocument = 0; /* false */
 			break;
 		case START_ELEMENT:
 			/* decode */
-			errn = exiDecodeStartElement(&iStream, &stateDecode, &eqn);
+			errn = exiDecodeStartElement(&iStream,
+					&stateDecode, &eqn);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-SE] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-SE] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				exiGetLocalName(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, eqn.localPart, &localName);
-				exiGetUri(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, &namespaceURI);
-				printf(">> SE {%s}%s \n", namespaceURI, localName);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			exiGetLocalName(&(stateDecode.nameTablePrepopulated),
+					&(stateDecode.nameTableRuntime), eqn.namespaceURI,
+					eqn.localPart, &localName);
+			exiGetUri(&(stateDecode.nameTablePrepopulated),
+					&(stateDecode.nameTableRuntime), eqn.namespaceURI,
+					&namespaceURI);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeStartElement(&oStream, &stateEncode, &eqn);
+			errn = exiEncodeStartElement(&oStream,
+					&stateEncode, &eqn);
 			break;
 		case START_ELEMENT_GENERIC:
 			/* decode */
-			errn = exiDecodeStartElementGeneric(&iStream, &stateDecode, &qn);
+			errn = exiDecodeStartElementGeneric(&iStream,
+					&stateDecode, &qn);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-SEgen] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-SEgen] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				printf(">> SE_Gen {%s}%s \n", stringNamespaceURI.chars, stringLocalName.chars);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf(">> SE_Gen {%s}%s \n", stringNamespaceURI.chars,
+					stringLocalName.chars);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeStartElementGeneric(&oStream, &stateEncode,
-					&stringNamespaceURI, &stringLocalName);
+			errn = exiEncodeStartElementGeneric(&oStream,
+					&stateEncode, &stringNamespaceURI, &stringLocalName);
 			break;
 		case END_ELEMENT:
 			/* decode */
-			errn = exiDecodeEndElement(&iStream, &stateDecode, &eqn);
+			errn = exiDecodeEndElement(&iStream,
+					&stateDecode, &eqn);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-EE] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-EE] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				printf("<< EE \n");
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf("<< EE \n");
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeEndElement(&oStream, &stateEncode);
+			errn
+					= exiEncodeEndElement(&oStream,
+							&stateEncode);
 			break;
 		case END_ELEMENT_UNDECLARED:
 			/* decode */
-			errn = exiDecodeEndElementUndeclared(&iStream, &stateDecode, &eqn);
+			errn = exiDecodeEndElementUndeclared(&iStream,
+					&stateDecode, &eqn);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-EE-Undecl] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-EE-Undecl] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				printf("<< EEundecl \n");
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf("<< EEundecl \n");
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeEndElement(&oStream, &stateEncode);
+			errn
+					= exiEncodeEndElement(&oStream,
+							&stateEncode);
 			break;
 		case CHARACTERS:
 			/* decode */
-			errn = exiDecodeCharacters(&iStream, &stateDecode, &val);
+			errn = exiDecodeCharacters(&iStream,
+					&stateDecode, &val);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-CH] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-CH] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				debugValue(&val);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			debugValue(&val);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeCharacters(&oStream, &stateEncode, &val);
+			errn = exiEncodeCharacters(&oStream,
+					&stateEncode, &val);
 			break;
 		case CHARACTERS_GENERIC:
 			/* decode */
-			errn = exiDecodeCharactersGeneric(&iStream, &stateDecode, &val);
+			errn = exiDecodeCharactersGeneric(&iStream,
+					&stateDecode, &val);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-CHgen] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-CHgen] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				debugValue(&val);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			debugValue(&val);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeCharacters(&oStream, &stateEncode, &val);
+			errn = exiEncodeCharacters(&oStream,
+					&stateEncode, &val);
 			break;
 		case CHARACTERS_GENERIC_UNDECLARED:
 			/* decode */
-			errn = exiDecodeCharactersGenericUndeclared(&iStream, &stateDecode, &val);
+			errn = exiDecodeCharactersGenericUndeclared(
+					&iStream, &stateDecode, &val);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-CHgenUndecl] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-CHgenUndecl] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				debugValue(&val);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			debugValue(&val);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeCharacters(&oStream, &stateEncode, &val);
+			errn = exiEncodeCharacters(&oStream,
+					&stateEncode, &val);
 			break;
 		case ATTRIBUTE:
 			/* decode */
-			errn = exiDecodeAttribute(&iStream, &stateDecode, &eqn, &val);
+			errn = exiDecodeAttribute(&iStream, &stateDecode,
+					&eqn, &val);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-AT] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-AT] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				exiGetLocalName(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, eqn.localPart, &localName);
-				exiGetUri(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, &namespaceURI);
-				printf(" AT {%s}%s \n", namespaceURI, localName);
-				debugValue(&val);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			exiGetLocalName(&(stateDecode.nameTablePrepopulated),
+					&(stateDecode.nameTableRuntime), eqn.namespaceURI,
+					eqn.localPart, &localName);
+			exiGetUri(&(stateDecode.nameTablePrepopulated),
+					&(stateDecode.nameTableRuntime), eqn.namespaceURI,
+					&namespaceURI);
+			printf(" AT {%s}%s \n", namespaceURI, localName);
+			debugValue(&val);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeAttribute(&oStream, &stateEncode, &eqn, &val);
+			errn = exiEncodeAttribute(&oStream, &stateEncode,
+					&eqn, &val);
 			break;
 		case ATTRIBUTE_XSI_NIL:
 			/* decode */
-			errn = exiDecodeAttributeXsiNil(&iStream, &stateDecode, &val);
+			errn = exiDecodeAttributeXsiNil(&iStream,
+					&stateDecode, &val);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-AT-NIL] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-AT-NIL] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				printf(" AT {xsi}nil == %i \n", val.boolean);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf(" AT {xsi}nil == %i \n", val.boolean);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeAttributeXsiNil(&oStream, &stateEncode, &val);
+			errn = exiEncodeAttributeXsiNil(&oStream,
+					&stateEncode, &val);
 			break;
 		case ATTRIBUTE_XSI_TYPE:
 			/* decode */
-			errn = exiDecodeAttributeXsiType(&iStream, &stateDecode, &val);
+			errn = exiDecodeAttributeXsiType(&iStream,
+					&stateDecode, &val);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-AT-TYPE] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-AT-TYPE] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				exiGetLocalName(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), val.eqname.namespaceURI, val.eqname.localPart, &localName);
-				exiGetUri(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), val.eqname.namespaceURI, &namespaceURI);
-				printf(" AT {type}type == {%s}%s \n", namespaceURI, localName);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			exiGetLocalName(&(stateDecode.nameTablePrepopulated),
+					&(stateDecode.nameTableRuntime), val.eqname.namespaceURI,
+					val.eqname.localPart, &localName);
+			exiGetUri(&(stateDecode.nameTablePrepopulated),
+					&(stateDecode.nameTableRuntime), val.eqname.namespaceURI,
+					&namespaceURI);
+			printf(" AT {type}type == {%s}%s \n", namespaceURI, localName);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeAttributeXsiType(&oStream, &stateEncode, &val);
+			errn = exiEncodeAttributeXsiType(&oStream,
+					&stateEncode, &val);
 			break;
 		case ATTRIBUTE_GENERIC_UNDECLARED:
 			/* decode */
-			errn = exiDecodeAttributeGenericUndeclared(&iStream, &stateDecode, &qn, &val);
+			errn = exiDecodeAttributeGenericUndeclared(
+					&iStream, &stateDecode, &qn, &val);
 			if (errn < 0) {
-				if (DEBUG) {
-					printf("[Decode-ERROR-ATgenUnd] %d \n", errn);
-				}
+#if EXI_DEBUG == EXI_DEBUG_ON
+				printf("[Decode-ERROR-ATgenUnd] %d \n", errn);
+#endif /*EXI_DEBUG*/
 				return errn;
 			}
-			if (DEBUG) {
-				/* exiGetLocalName(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, eqn.localPart, &localName);
-				exiGetUri(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, &namespaceURI); */
-				printf(" AT {%s}%s \n", qn.namespaceURI.chars, qn.localName.chars);
-				debugValue(&val);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			/* exiGetLocalName(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, eqn.localPart, &localName);
+			 exiGetUri(&(stateDecode.nameTablePrepopulated), &(stateDecode.nameTableRuntime), eqn.namespaceURI, &namespaceURI); */
+			printf(" AT {%s}%s \n", qn.namespaceURI.chars, qn.localName.chars);
+			debugValue(&val);
+#endif /*EXI_DEBUG*/
 			/* encode */
-			errn = exiEncodeAttribute(&oStream, &stateEncode, &eqn, &val);
+			errn = exiEncodeAttribute(&oStream, &stateEncode,
+					&eqn, &val);
 			break;
 		default:
 			/* ERROR */
-			if (DEBUG) {
-				printf("[Unknown-Event] %d \n", event);
-			}
+#if EXI_DEBUG == EXI_DEBUG_ON
+			printf("[Unknown-Event] %d \n", event);
+#endif /*EXI_DEBUG*/
 			return EXI_ERROR_UNKOWN_EVENT;
 		}
 
@@ -406,7 +450,7 @@ int main_codec(int argc, char *argv[]) {
 
 static int _setInt32Value(integer_t* iv, int32_t* int32) {
 	int errn = 0;
-	switch(iv->type) {
+	switch (iv->type) {
 	/* Unsigned Integer */
 	case UNSIGNED_INTEGER_8:
 		*int32 = iv->val.uint8;
@@ -424,7 +468,7 @@ static int _setInt32Value(integer_t* iv, int32_t* int32) {
 	case UNSIGNED_INTEGER_64:
 		errn = EXI_UNSUPPORTED_INTEGER_VALUE;
 		break;
-	/* (Signed) Integer */
+		/* (Signed) Integer */
 	case INTEGER_8:
 		*int32 = iv->val.int8;
 		break;
@@ -440,12 +484,12 @@ static int _setInt32Value(integer_t* iv, int32_t* int32) {
 	return errn;
 }
 
-
-void debugValue(exi_value_t* val) {
+#if EXI_DEBUG == EXI_DEBUG_ON
+static void debugValue(exi_value_t* val) {
 	int i;
-	switch(val->type) {
+	switch (val->type) {
 	case INTEGER:
-		switch(val->integer.type) {
+		switch (val->integer.type) {
 		/* Unsigned Integer */
 		case UNSIGNED_INTEGER_8:
 			printf(" Value uint8 : %d \n", val->integer.val.uint8);
@@ -457,9 +501,10 @@ void debugValue(exi_value_t* val) {
 			printf(" Value uint32 : %d \n", val->integer.val.uint32);
 			break;
 		case UNSIGNED_INTEGER_64:
-			printf(" Value uint64 : %ld \n", (long unsigned int) val->integer.val.uint64);
+			printf(" Value uint64 : %ld \n",
+					(long unsigned int) val->integer.val.uint64);
 			break;
-		/* (Signed) Integer */
+			/* (Signed) Integer */
 		case INTEGER_8:
 			printf(" Value int8 : %d \n", val->integer.val.int8);
 			break;
@@ -496,4 +541,5 @@ void debugValue(exi_value_t* val) {
 		printf(" Value ?? \n");
 	}
 }
+#endif /*EXI_DEBUG*/
 

src/test/pev_service.c

@@ -798,7 +798,7 @@ static int dc_charging()
 
 	/* setup EVStatus */
 
-	EVStatus.EVRESSSOC = 89;
+	EVStatus.EVRESSSOC = 30;
 	EVStatus.EVReady = 1;
 	EVStatus.EVCabinConditioning = 1;
 	EVStatus.EVRESSConditioning = 1;
@@ -1112,12 +1112,12 @@ static int dc_charging()
 	currentDemand.DC_EVStatus = EVStatus;
 
 	float_type.Unit = A_unitSymbolType;
-	float_type.Value = 100;
+	float_type.Value = 50;
 
 	currentDemand.EVTargetCurrent = float_type;
 
 	float_type.Unit = V_unitSymbolType;
-	float_type.Value = 420;
+	float_type.Value = 400;
 
 	currentDemand.EVMaximumVoltageLimit = float_type;
 	currentDemand.isused.EVMaximumVoltageLimit = 1;
@@ -1129,7 +1129,7 @@ static int dc_charging()
 	currentDemand.isused.EVMaximumPowerLimit = 1;
 
 	float_type.Unit = A_unitSymbolType;
-	float_type.Value = 60;
+	float_type.Value = 50;
 
 	currentDemand.EVMaximumCurrentLimit = float_type;
 	currentDemand.isused.EVMaximumCurrentLimit = 1;
@@ -1139,17 +1139,16 @@ static int dc_charging()
 
 	currentDemand.ChargingComplete = 0;
 
-	float_type.Unit = s_unitSymbolType;
-	float_type.Value = 300; /* 5 min*/
-
-	currentDemand.RemainingTimeToFullSoC = float_type;
-	currentDemand.isused.RemainingTimeToFullSoC = 1;
+	/* float_type.Unit = s_unitSymbolType;
+	float_type.Value = 1200;
+	currentDemand.RemainingTimeToFullSoC = float_type; */
+	currentDemand.isused.RemainingTimeToFullSoC = 0;
 
-	float_type.Unit = s_unitSymbolType;
-	float_type.Value = 120; /* 3 min */
+	/* float_type.Unit = s_unitSymbolType;
+	float_type.Value = 1200;
 
-	currentDemand.RemainingTimeToBulkSoC = float_type;
-	currentDemand.isused.RemainingTimeToBulkSoC = 1;
+	currentDemand.RemainingTimeToBulkSoC = float_type; */
+	currentDemand.isused.RemainingTimeToBulkSoC = 0;
 
 
 	float_type.Unit = V_unitSymbolType;