diff --git a/.cproject b/.cproject
index 051a90d..06c4b41 100644
--- a/.cproject
+++ b/.cproject
@@ -32,8 +32,6 @@
diff --git a/src/service/v2g_service.h b/src/service/v2g_service.h
index d8c1d3f..60b64e1 100644
--- a/src/service/v2g_service.h
+++ b/src/service/v2g_service.h
@@ -31,7 +31,7 @@ extern "C" {
#define V2G_SERVICE_H_
#include "v2g_serviceDataTypes.h"
-#include "../codec/EXITypes.h"
+#include "EXITypes.h"
struct v2gService
{
diff --git a/src/service/v2g_serviceClientDataTransmitter.h b/src/service/v2g_serviceClientDataTransmitter.h
index 5d5ee25..3210656 100644
--- a/src/service/v2g_serviceClientDataTransmitter.h
+++ b/src/service/v2g_serviceClientDataTransmitter.h
@@ -31,7 +31,7 @@ extern "C" {
#ifndef V2G_SERVICECLIENTDATATRANSMITTER_H_
#define V2G_SERVICECLIENTDATATRANSMITTER_H_
-#include "../codec/EXITypes.h"
+#include "EXITypes.h"
/* This method has to be implemented!
* This method sends EXI stream (outStream) to the EVSE and receives response stream (inStream)*/
diff --git a/src/service/v2g_serviceClientStubs.c b/src/service/v2g_serviceClientStubs.c
index dc83a0d..79544ea 100644
--- a/src/service/v2g_serviceClientStubs.c
+++ b/src/service/v2g_serviceClientStubs.c
@@ -30,9 +30,9 @@
#include "v2g_serviceClientStubs.h"
#include "v2g_serviceDataSerializiation.h"
#include "v2g_serviceClientDataTransmitter.h"
- #include "../codec/EXITypes.h"
- #include "../codec/EXIDecoder.h"
- #include "../codec/EXIEncoder.h"
+ #include "EXITypes.h"
+ #include "EXIDecoder.h"
+ #include "EXIEncoder.h"
static int deserializeMessage(struct v2gService* service);
@@ -1903,10 +1903,7 @@ static int deserializeMessage(struct v2gService* service)
{
int noEndOfDocument = 1; /* true */
int errno;
- #ifdef DEBUG
- const char * localName;
- const char * namespaceURI;
- #endif
+
do {
exiDecodeNextEvent(&(service->inStream), &(service->stateDecode), &(service->event));
@@ -1933,7 +1930,9 @@ static int deserializeMessage(struct v2gService* service)
case END_ELEMENT:
errno = exiDecodeEndElement(&(service->inStream), &(service->stateDecode), &(service->eqn));
+
+ errno = deserializeElement(service);
break;
case CHARACTERS:
/* decode */
diff --git a/src/service/v2g_serviceDataSerialization.c b/src/service/v2g_serviceDataSerialization.c
index 2c3cfcd..a164add 100644
--- a/src/service/v2g_serviceDataSerialization.c
+++ b/src/service/v2g_serviceDataSerialization.c
@@ -28,8 +28,8 @@
#include "v2g_service.h"
#include "v2g_serviceDataTypes.h"
#include "v2g_serviceDataSerializiation.h"
-#include "../codec/EXITypes.h"
-#include "../codec/EXIEncoder.h"
+#include "EXITypes.h"
+#include "EXIEncoder.h"
@@ -62,9 +62,7 @@ static int serialize_SessionInformationType(struct SessionInformationType* type,
- /* element ID assignment of SessionID*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=35;
+
/* encode end element of SessionID */
@@ -99,9 +97,7 @@ static int serialize_SessionInformationType(struct SessionInformationType* type,
- /* element ID assignment of ServiceSessionID*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=33;
+
/* encode end element of ServiceSessionID */
@@ -137,9 +133,7 @@ static int serialize_SessionInformationType(struct SessionInformationType* type,
- /* element ID assignment of ProtocolVersion*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=25;
+
/* encode end element of ProtocolVersion */
@@ -178,9 +172,7 @@ static int serialize_EventListType(struct EventListType* type, struct v2gService
}
- /* element ID assignment of Event*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=9;
+
/* encode end element of Event */
@@ -220,9 +212,7 @@ static int serialize_NotificationType(struct NotificationType* type, struct v2gS
}
- /* element ID assignment of FaultCode*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=13;
+
/* encode end element of FaultCode */
@@ -258,9 +248,7 @@ static int serialize_NotificationType(struct NotificationType* type, struct v2gS
- /* element ID assignment of FaultMsg*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=14;
+
/* encode end element of FaultMsg */
@@ -291,9 +279,7 @@ static int serialize_NotificationType(struct NotificationType* type, struct v2gS
- /* element ID assignment of EventList*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=10;
+
/* encode end element of EventList */
@@ -329,9 +315,7 @@ static int serialize_HeaderType(struct HeaderType* type, struct v2gService* serv
- /* element ID assignment of SessionInformation*/
- service->eqn.namespaceURI=6;
- service->eqn.localPart=7;
+
/* encode end element of SessionInformation */
@@ -361,9 +345,7 @@ static int serialize_HeaderType(struct HeaderType* type, struct v2gService* serv
- /* element ID assignment of Notification*/
- service->eqn.namespaceURI=6;
- service->eqn.localPart=6;
+
/* encode end element of Notification */
@@ -402,9 +384,7 @@ static int serialize_PEVStatusType(struct PEVStatusType* type, struct v2gService
}
- /* element ID assignment of ConnectorLocked*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=4;
+
/* encode end element of ConnectorLocked */
@@ -435,9 +415,7 @@ static int serialize_PEVStatusType(struct PEVStatusType* type, struct v2gService
}
- /* element ID assignment of ChargerStandby*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=0;
+
/* encode end element of ChargerStandby */
@@ -479,9 +457,7 @@ static int serialize_SessionSetupReqType(struct SessionSetupReqType* type, struc
- /* element ID assignment of PEVID*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=26;
+
/* encode end element of PEVID */
@@ -510,9 +486,7 @@ static int serialize_SessionSetupReqType(struct SessionSetupReqType* type, struc
- /* element ID assignment of PEVStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=32;
+
/* encode end element of PEVStatus */
@@ -550,9 +524,7 @@ static int serialize_EVSEStatusType(struct EVSEStatusType* type, struct v2gServi
}
- /* element ID assignment of FatalError*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=12;
+
/* encode end element of FatalError */
@@ -583,9 +555,7 @@ static int serialize_EVSEStatusType(struct EVSEStatusType* type, struct v2gServi
}
- /* element ID assignment of EVSEStandby*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=7;
+
/* encode end element of EVSEStandby */
@@ -616,9 +586,7 @@ static int serialize_EVSEStatusType(struct EVSEStatusType* type, struct v2gServi
}
- /* element ID assignment of ConnectorLocked*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=4;
+
/* encode end element of ConnectorLocked */
@@ -649,9 +617,7 @@ static int serialize_EVSEStatusType(struct EVSEStatusType* type, struct v2gServi
}
- /* element ID assignment of PowerSwitchClosed*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=24;
+
/* encode end element of PowerSwitchClosed */
@@ -682,9 +648,7 @@ static int serialize_EVSEStatusType(struct EVSEStatusType* type, struct v2gServi
}
- /* element ID assignment of RCD*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=26;
+
/* encode end element of RCD */
@@ -715,9 +679,7 @@ static int serialize_EVSEStatusType(struct EVSEStatusType* type, struct v2gServi
}
- /* element ID assignment of ShutDownTime*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=37;
+
/* encode end element of ShutDownTime */
@@ -755,9 +717,7 @@ static int serialize_SessionSetupResType(struct SessionSetupResType* type, struc
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -790,9 +750,7 @@ static int serialize_SessionSetupResType(struct SessionSetupResType* type, struc
- /* element ID assignment of EVSEID*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=3;
+
/* encode end element of EVSEID */
@@ -820,9 +778,7 @@ static int serialize_SessionSetupResType(struct SessionSetupResType* type, struc
- /* element ID assignment of EVSEStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=7;
+
/* encode end element of EVSEStatus */
@@ -853,9 +809,7 @@ static int serialize_SessionSetupResType(struct SessionSetupResType* type, struc
}
- /* element ID assignment of TCurrent*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=63;
+
/* encode end element of TCurrent */
@@ -895,9 +849,7 @@ static int serialize_ServiceDiscoveryReqType(struct ServiceDiscoveryReqType* typ
}
- /* element ID assignment of ServiceType*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=58;
+
/* encode end element of ServiceType */
@@ -933,9 +885,7 @@ static int serialize_ServiceDiscoveryReqType(struct ServiceDiscoveryReqType* typ
- /* element ID assignment of ServiceScope*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=57;
+
/* encode end element of ServiceScope */
@@ -976,9 +926,7 @@ static int serialize_ServiceDescriptionType(struct ServiceDescriptionType* type,
- /* element ID assignment of ServiceID*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=29;
+
/* encode end element of ServiceID */
@@ -1013,9 +961,7 @@ static int serialize_ServiceDescriptionType(struct ServiceDescriptionType* type,
- /* element ID assignment of ServiceName*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=31;
+
/* encode end element of ServiceName */
@@ -1049,9 +995,7 @@ static int serialize_ServiceDescriptionType(struct ServiceDescriptionType* type,
}
- /* element ID assignment of ServiceType*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=34;
+
/* encode end element of ServiceType */
@@ -1087,9 +1031,7 @@ static int serialize_ServiceDescriptionType(struct ServiceDescriptionType* type,
- /* element ID assignment of ServiceScope*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=32;
+
/* encode end element of ServiceScope */
@@ -1106,6 +1048,8 @@ static int serialize_ServiceDescriptionType(struct ServiceDescriptionType* type,
static int serialize_ServiceListType(struct ServiceListType* type, struct v2gService* service)
{
+ int i_loop;
+
/* element ID assignment of Service*/
service->eqn.namespaceURI=5;
@@ -1116,18 +1060,20 @@ static int serialize_ServiceListType(struct ServiceListType* type, struct v2gSer
return -1;
}
-
- /* encode children of Service */
- if(serialize_ServiceDescriptionType(&(type->Service),service)<0)
+
+ for(i_loop=0;i_loop < type->arraylen.Service;i_loop++)
{
- return -1;
+ /* encode children of Service */
+ if(serialize_ServiceDescriptionType(&(type->Service[i_loop]),service)<0)
+ {
+ return -1;
+ }
+
}
+
+
+
-
-
- /* element ID assignment of Service*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=27;
/* encode end element of Service */
@@ -1165,9 +1111,7 @@ static int serialize_ServiceDiscoveryResType(struct ServiceDiscoveryResType* typ
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -1197,9 +1141,7 @@ static int serialize_ServiceDiscoveryResType(struct ServiceDiscoveryResType* typ
- /* element ID assignment of ServiceList*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=52;
+
/* encode end element of ServiceList */
@@ -1235,9 +1177,7 @@ static int serialize_ServicePaymentSelectionReqType(struct ServicePaymentSelecti
- /* element ID assignment of ServiceList*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=52;
+
/* encode end element of ServiceList */
@@ -1270,9 +1210,7 @@ static int serialize_ServicePaymentSelectionReqType(struct ServicePaymentSelecti
- /* element ID assignment of PEVPubKey*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=31;
+
/* encode end element of PEVPubKey */
@@ -1310,9 +1248,7 @@ static int serialize_ServicePaymentSelectionResType(struct ServicePaymentSelecti
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -1347,9 +1283,7 @@ static int serialize_ServicePaymentSelectionResType(struct ServicePaymentSelecti
- /* element ID assignment of MeteringAuthPubKey*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=16;
+
/* encode end element of MeteringAuthPubKey */
@@ -1390,9 +1324,7 @@ static int serialize_PaymentDetailsReqType(struct PaymentDetailsReqType* type, s
- /* element ID assignment of ContractID*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=1;
+
/* encode end element of ContractID */
@@ -1430,9 +1362,7 @@ static int serialize_PaymentDetailsResType(struct PaymentDetailsResType* type, s
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -1470,9 +1400,7 @@ static int serialize_FloatingValueType(struct FloatingValueType* type, struct v2
}
- /* element ID assignment of Multiplier*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=21;
+
/* encode end element of Multiplier */
@@ -1503,9 +1431,7 @@ static int serialize_FloatingValueType(struct FloatingValueType* type, struct v2
}
- /* element ID assignment of Unit*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=50;
+
/* encode end element of Unit */
@@ -1536,9 +1462,7 @@ static int serialize_FloatingValueType(struct FloatingValueType* type, struct v2
}
- /* element ID assignment of Value*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=51;
+
/* encode end element of Value */
@@ -1573,9 +1497,7 @@ static int serialize_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type, s
- /* element ID assignment of PEVStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=32;
+
/* encode end element of PEVStatus */
@@ -1606,9 +1528,7 @@ static int serialize_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type, s
}
- /* element ID assignment of EoC*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=10;
+
/* encode end element of EoC */
@@ -1636,9 +1556,7 @@ static int serialize_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type, s
- /* element ID assignment of EAmount*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=2;
+
/* encode end element of EAmount */
@@ -1666,9 +1584,7 @@ static int serialize_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type, s
- /* element ID assignment of PEVMaxPower*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=28;
+
/* encode end element of PEVMaxPower */
@@ -1699,9 +1615,7 @@ static int serialize_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type, s
}
- /* element ID assignment of PEVMaxPhases*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=27;
+
/* encode end element of PEVMaxPhases */
@@ -1729,9 +1643,7 @@ static int serialize_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type, s
- /* element ID assignment of PEVMaxVoltage*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=29;
+
/* encode end element of PEVMaxVoltage */
@@ -1759,9 +1671,7 @@ static int serialize_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type, s
- /* element ID assignment of PEVMinVoltage*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=30;
+
/* encode end element of PEVMinVoltage */
@@ -1799,9 +1709,7 @@ static int serialize_TariffEntryType(struct TariffEntryType* type, struct v2gSer
}
- /* element ID assignment of TariffStart*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=48;
+
/* encode end element of TariffStart */
@@ -1829,9 +1737,7 @@ static int serialize_TariffEntryType(struct TariffEntryType* type, struct v2gSer
- /* element ID assignment of TariffPMax*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=47;
+
/* encode end element of TariffPMax */
@@ -1861,9 +1767,7 @@ static int serialize_TariffEntryType(struct TariffEntryType* type, struct v2gSer
- /* element ID assignment of EPrice*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=6;
+
/* encode end element of EPrice */
@@ -1880,6 +1784,8 @@ static int serialize_TariffEntryType(struct TariffEntryType* type, struct v2gSer
static int serialize_TariffEntriesType(struct TariffEntriesType* type, struct v2gService* service)
{
+ int i_loop;
+
/* element ID assignment of TariffEntry*/
service->eqn.namespaceURI=5;
@@ -1890,18 +1796,20 @@ static int serialize_TariffEntriesType(struct TariffEntriesType* type, struct v2
return -1;
}
-
- /* encode children of TariffEntry */
- if(serialize_TariffEntryType(&(type->TariffEntry),service)<0)
+
+ for(i_loop=0;i_loop < type->arraylen.TariffEntry;i_loop++)
{
- return -1;
+ /* encode children of TariffEntry */
+ if(serialize_TariffEntryType(&(type->TariffEntry[i_loop]),service)<0)
+ {
+ return -1;
+ }
+
}
+
+
+
-
-
- /* element ID assignment of TariffEntry*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=44;
/* encode end element of TariffEntry */
@@ -1939,9 +1847,7 @@ static int serialize_TariffDescrType(struct TariffDescrType* type, struct v2gSer
}
- /* element ID assignment of TariffID*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=46;
+
/* encode end element of TariffID */
@@ -1976,9 +1882,7 @@ static int serialize_TariffDescrType(struct TariffDescrType* type, struct v2gSer
- /* element ID assignment of TariffDescription*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=41;
+
/* encode end element of TariffDescription */
@@ -2007,9 +1911,7 @@ static int serialize_TariffDescrType(struct TariffDescrType* type, struct v2gSer
- /* element ID assignment of TariffEntries*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=42;
+
/* encode end element of TariffEntries */
@@ -2025,6 +1927,8 @@ static int serialize_TariffDescrType(struct TariffDescrType* type, struct v2gSer
static int serialize_TariffTableType(struct TariffTableType* type, struct v2gService* service)
{
+ int i_loop;
+
/* element ID assignment of Currency*/
service->eqn.namespaceURI=5;
@@ -2049,9 +1953,7 @@ static int serialize_TariffTableType(struct TariffTableType* type, struct v2gSer
- /* element ID assignment of Currency*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=5;
+
/* encode end element of Currency */
@@ -2070,18 +1972,20 @@ static int serialize_TariffTableType(struct TariffTableType* type, struct v2gSer
return -1;
}
-
- /* encode children of Tariff */
- if(serialize_TariffDescrType(&(type->Tariff),service)<0)
+
+ for(i_loop=0;i_loop < type->arraylen.Tariff;i_loop++)
{
- return -1;
+ /* encode children of Tariff */
+ if(serialize_TariffDescrType(&(type->Tariff[i_loop]),service)<0)
+ {
+ return -1;
+ }
+
}
+
+
+
-
-
- /* element ID assignment of Tariff*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=39;
/* encode end element of Tariff */
@@ -2119,9 +2023,7 @@ static int serialize_PowerDiscoveryResType(struct PowerDiscoveryResType* type, s
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -2149,9 +2051,7 @@ static int serialize_PowerDiscoveryResType(struct PowerDiscoveryResType* type, s
- /* element ID assignment of EVSEStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=7;
+
/* encode end element of EVSEStatus */
@@ -2179,9 +2079,7 @@ static int serialize_PowerDiscoveryResType(struct PowerDiscoveryResType* type, s
- /* element ID assignment of EVSEVoltage*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=8;
+
/* encode end element of EVSEVoltage */
@@ -2209,9 +2107,7 @@ static int serialize_PowerDiscoveryResType(struct PowerDiscoveryResType* type, s
- /* element ID assignment of EVSEIMax*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=4;
+
/* encode end element of EVSEIMax */
@@ -2242,9 +2138,7 @@ static int serialize_PowerDiscoveryResType(struct PowerDiscoveryResType* type, s
}
- /* element ID assignment of EVSEMaxPhases*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=5;
+
/* encode end element of EVSEMaxPhases */
@@ -2279,9 +2173,7 @@ static int serialize_PowerDiscoveryResType(struct PowerDiscoveryResType* type, s
- /* element ID assignment of EnergyProvider*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=9;
+
/* encode end element of EnergyProvider */
@@ -2312,9 +2204,7 @@ static int serialize_PowerDiscoveryResType(struct PowerDiscoveryResType* type, s
- /* element ID assignment of TariffTable*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=65;
+
/* encode end element of TariffTable */
@@ -2350,9 +2240,7 @@ static int serialize_LineLockReqType(struct LineLockReqType* type, struct v2gSer
- /* element ID assignment of PEVStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=32;
+
/* encode end element of PEVStatus */
@@ -2383,9 +2271,7 @@ static int serialize_LineLockReqType(struct LineLockReqType* type, struct v2gSer
}
- /* element ID assignment of ReqLockStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=45;
+
/* encode end element of ReqLockStatus */
@@ -2423,9 +2309,7 @@ static int serialize_LineLockResType(struct LineLockResType* type, struct v2gSer
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -2453,9 +2337,7 @@ static int serialize_LineLockResType(struct LineLockResType* type, struct v2gSer
- /* element ID assignment of EVSEStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=7;
+
/* encode end element of EVSEStatus */
@@ -2493,9 +2375,7 @@ static int serialize_ChargingProfileType(struct ChargingProfileType* type, struc
}
- /* element ID assignment of ChargingProfileEntryStart*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=2;
+
/* encode end element of ChargingProfileEntryStart */
@@ -2523,9 +2403,7 @@ static int serialize_ChargingProfileType(struct ChargingProfileType* type, struc
- /* element ID assignment of ChargingProfileEntryMaxPower*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=1;
+
/* encode end element of ChargingProfileEntryMaxPower */
@@ -2560,9 +2438,7 @@ static int serialize_PowerDeliveryReqType(struct PowerDeliveryReqType* type, str
- /* element ID assignment of PEVStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=32;
+
/* encode end element of PEVStatus */
@@ -2593,9 +2469,7 @@ static int serialize_PowerDeliveryReqType(struct PowerDeliveryReqType* type, str
}
- /* element ID assignment of ReqSwitchStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=46;
+
/* encode end element of ReqSwitchStatus */
@@ -2628,9 +2502,7 @@ static int serialize_PowerDeliveryReqType(struct PowerDeliveryReqType* type, str
}
- /* element ID assignment of Tariff*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=64;
+
/* encode end element of Tariff */
@@ -2661,9 +2533,7 @@ static int serialize_PowerDeliveryReqType(struct PowerDeliveryReqType* type, str
- /* element ID assignment of ChargingProfile*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=0;
+
/* encode end element of ChargingProfile */
@@ -2702,9 +2572,7 @@ static int serialize_PowerDeliveryResType(struct PowerDeliveryResType* type, str
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -2753,9 +2621,7 @@ static int serialize_MeterInfoType(struct MeterInfoType* type, struct v2gService
- /* element ID assignment of MeterID*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=16;
+
/* encode end element of MeterID */
@@ -2791,9 +2657,7 @@ static int serialize_MeterInfoType(struct MeterInfoType* type, struct v2gService
- /* element ID assignment of MeterPubKey*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=18;
+
/* encode end element of MeterPubKey */
@@ -2824,9 +2688,7 @@ static int serialize_MeterInfoType(struct MeterInfoType* type, struct v2gService
- /* element ID assignment of MeterReading*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=19;
+
/* encode end element of MeterReading */
@@ -2860,9 +2722,7 @@ static int serialize_MeterInfoType(struct MeterInfoType* type, struct v2gService
}
- /* element ID assignment of MeterStatus*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=20;
+
/* encode end element of MeterStatus */
@@ -2896,9 +2756,7 @@ static int serialize_MeterInfoType(struct MeterInfoType* type, struct v2gService
}
- /* element ID assignment of TMeter*/
- service->eqn.namespaceURI=5;
- service->eqn.localPart=38;
+
/* encode end element of TMeter */
@@ -2937,9 +2795,7 @@ static int serialize_MeteringStatusResType(struct MeteringStatusResType* type, s
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -2972,9 +2828,7 @@ static int serialize_MeteringStatusResType(struct MeteringStatusResType* type, s
- /* element ID assignment of EVSEID*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=3;
+
/* encode end element of EVSEID */
@@ -3002,9 +2856,7 @@ static int serialize_MeteringStatusResType(struct MeteringStatusResType* type, s
- /* element ID assignment of EVSEStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=7;
+
/* encode end element of EVSEStatus */
@@ -3035,9 +2887,7 @@ static int serialize_MeteringStatusResType(struct MeteringStatusResType* type, s
}
- /* element ID assignment of TCurrent*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=63;
+
/* encode end element of TCurrent */
@@ -3065,9 +2915,7 @@ static int serialize_MeteringStatusResType(struct MeteringStatusResType* type, s
- /* element ID assignment of EVSEMaxPower*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=6;
+
/* encode end element of EVSEMaxPower */
@@ -3097,9 +2945,7 @@ static int serialize_MeteringStatusResType(struct MeteringStatusResType* type, s
- /* element ID assignment of PCurrent*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=25;
+
/* encode end element of PCurrent */
@@ -3130,9 +2976,7 @@ static int serialize_MeteringStatusResType(struct MeteringStatusResType* type, s
- /* element ID assignment of MeterInfo*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=15;
+
/* encode end element of MeterInfo */
@@ -3175,9 +3019,7 @@ static int serialize_MeteringReceiptReqType(struct MeteringReceiptReqType* type,
- /* element ID assignment of PEVID*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=26;
+
/* encode end element of PEVID */
@@ -3206,9 +3048,7 @@ static int serialize_MeteringReceiptReqType(struct MeteringReceiptReqType* type,
- /* element ID assignment of PEVStatus*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=32;
+
/* encode end element of PEVStatus */
@@ -3241,9 +3081,7 @@ static int serialize_MeteringReceiptReqType(struct MeteringReceiptReqType* type,
}
- /* element ID assignment of TCurrent*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=63;
+
/* encode end element of TCurrent */
@@ -3275,9 +3113,7 @@ static int serialize_MeteringReceiptReqType(struct MeteringReceiptReqType* type,
}
- /* element ID assignment of Tariff*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=64;
+
/* encode end element of Tariff */
@@ -3305,9 +3141,7 @@ static int serialize_MeteringReceiptReqType(struct MeteringReceiptReqType* type,
- /* element ID assignment of MeterInfo*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=15;
+
/* encode end element of MeterInfo */
@@ -3345,9 +3179,7 @@ static int serialize_MeteringReceiptResType(struct MeteringReceiptResType* type,
}
- /* element ID assignment of ResponseCode*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=47;
+
/* encode end element of ResponseCode */
@@ -3384,9 +3216,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of SessionSetupReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=59;
+
/* encode end element of SessionSetupReq */
@@ -3417,9 +3247,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of SessionSetupRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=61;
+
/* encode end element of SessionSetupRes */
@@ -3450,9 +3278,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of ServiceDiscoveryReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=48;
+
/* encode end element of ServiceDiscoveryReq */
@@ -3483,9 +3309,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of ServiceDiscoveryRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=50;
+
/* encode end element of ServiceDiscoveryRes */
@@ -3516,9 +3340,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of ServicePaymentSelectionReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=53;
+
/* encode end element of ServicePaymentSelectionReq */
@@ -3549,9 +3371,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of ServicePaymentSelectionRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=55;
+
/* encode end element of ServicePaymentSelectionRes */
@@ -3582,9 +3402,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of PaymentDetailsReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=33;
+
/* encode end element of PaymentDetailsReq */
@@ -3615,9 +3433,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of PaymentDetailsRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=35;
+
/* encode end element of PaymentDetailsRes */
@@ -3648,9 +3464,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of PowerDiscoveryReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=41;
+
/* encode end element of PowerDiscoveryReq */
@@ -3681,9 +3495,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of PowerDiscoveryRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=43;
+
/* encode end element of PowerDiscoveryRes */
@@ -3714,9 +3526,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of LineLockReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=11;
+
/* encode end element of LineLockReq */
@@ -3747,9 +3557,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of LineLockRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=13;
+
/* encode end element of LineLockRes */
@@ -3780,9 +3588,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of PowerDeliveryReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=37;
+
/* encode end element of PowerDeliveryReq */
@@ -3813,9 +3619,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of PowerDeliveryRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=39;
+
/* encode end element of PowerDeliveryRes */
@@ -3846,9 +3650,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of MeteringStatusReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=21;
+
/* encode end element of MeteringStatusReq */
@@ -3879,9 +3681,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of MeteringStatusRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=23;
+
/* encode end element of MeteringStatusRes */
@@ -3912,9 +3712,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of MeteringReceiptReq*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=17;
+
/* encode end element of MeteringReceiptReq */
@@ -3945,9 +3743,7 @@ static int serialize_BodyType(struct BodyType* type, struct v2gService* service)
- /* element ID assignment of MeteringReceiptRes*/
- service->eqn.namespaceURI=4;
- service->eqn.localPart=19;
+
/* encode end element of MeteringReceiptRes */
@@ -3983,9 +3779,7 @@ static int serialize_AnonType_V2G_Message(struct AnonType_V2G_Message* type, str
- /* element ID assignment of Header*/
- service->eqn.namespaceURI=6;
- service->eqn.localPart=4;
+
/* encode end element of Header */
@@ -4013,9 +3807,7 @@ static int serialize_AnonType_V2G_Message(struct AnonType_V2G_Message* type, str
- /* element ID assignment of Body*/
- service->eqn.namespaceURI=6;
- service->eqn.localPart=0;
+
/* encode end element of Body */
@@ -4076,5 +3868,4 @@ static int serialize_AnonType_V2G_Message(struct AnonType_V2G_Message* type, str
return 0;
- }
-
\ No newline at end of file
+ }
diff --git a/src/service/v2g_serviceDataTypes.c b/src/service/v2g_serviceDataTypes.c
index 60e2896..9291a0d 100644
--- a/src/service/v2g_serviceDataTypes.c
+++ b/src/service/v2g_serviceDataTypes.c
@@ -25,34 +25,30 @@
********************************************************************/
-#include "../codec/EXITypes.h"
+#include "EXITypes.h"
#include "v2g_serviceDataTypes.h"
static void init_SessionInformationType_SessionID(struct SessionInformationType_SessionID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_SessionInformationType_ServiceSessionID(struct SessionInformationType_ServiceSessionID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_SessionInformationType_ProtocolVersion(struct SessionInformationType_ProtocolVersion* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_SessionInformationType(struct SessionInformationType* type)
-{
-
+{
init_SessionInformationType_SessionID(&(type->SessionID));
init_SessionInformationType_ServiceSessionID(&(type->ServiceSessionID));
type->isused.ServiceSessionID=0;
@@ -62,15 +58,13 @@ static void init_SessionInformationType(struct SessionInformationType* type)
}
static void init_NotificationType_FaultMsg(struct NotificationType_FaultMsg* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_NotificationType(struct NotificationType* type)
-{
-
+{
type->isused.FaultCode=0;
init_NotificationType_FaultMsg(&(type->FaultMsg));
type->isused.FaultMsg=0;
@@ -79,8 +73,7 @@ static void init_NotificationType(struct NotificationType* type)
}
static void init_HeaderType(struct HeaderType* type)
-{
-
+{
init_SessionInformationType(&(type->SessionInformation));
init_NotificationType(&(type->Notification));
type->isused.Notification=0;
@@ -88,44 +81,38 @@ static void init_HeaderType(struct HeaderType* type)
}
static void init_SessionSetupReqType_PEVID(struct SessionSetupReqType_PEVID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_SessionSetupReqType(struct SessionSetupReqType* type)
-{
-
+{
init_SessionSetupReqType_PEVID(&(type->PEVID));
type->isused.PEVID=0;
}
static void init_SessionSetupResType_EVSEID(struct SessionSetupResType_EVSEID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_SessionSetupResType(struct SessionSetupResType* type)
-{
-
+{
init_SessionSetupResType_EVSEID(&(type->EVSEID));
}
static void init_ServiceDiscoveryReqType_ServiceScope(struct ServiceDiscoveryReqType_ServiceScope* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_ServiceDiscoveryReqType(struct ServiceDiscoveryReqType* type)
-{
-
+{
type->isused.ServiceType=0;
init_ServiceDiscoveryReqType_ServiceScope(&(type->ServiceScope));
type->isused.ServiceScope=0;
@@ -133,29 +120,25 @@ static void init_ServiceDiscoveryReqType(struct ServiceDiscoveryReqType* type)
}
static void init_ServiceDescriptionType_ServiceID(struct ServiceDescriptionType_ServiceID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_ServiceDescriptionType_ServiceName(struct ServiceDescriptionType_ServiceName* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_ServiceDescriptionType_ServiceScope(struct ServiceDescriptionType_ServiceScope* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_ServiceDescriptionType(struct ServiceDescriptionType* type)
-{
-
+{
init_ServiceDescriptionType_ServiceID(&(type->ServiceID));
init_ServiceDescriptionType_ServiceName(&(type->ServiceName));
type->isused.ServiceName=0;
@@ -167,109 +150,106 @@ static void init_ServiceDescriptionType(struct ServiceDescriptionType* type)
static void init_ServiceListType(struct ServiceListType* type)
{
+ int i_loop;
+
+ for(i_loop=0; i_loop<8;i_loop++)
+ {
+ init_ServiceDescriptionType(&(type->Service[i_loop]));
+ }
- init_ServiceDescriptionType((type->Service));
type->arraylen.Service=0;
}
static void init_ServiceDiscoveryResType(struct ServiceDiscoveryResType* type)
-{
-
+{
init_ServiceListType(&(type->ServiceList));
type->isused.ServiceList=0;
}
static void init_ServicePaymentSelectionReqType_PEVPubKey(struct ServicePaymentSelectionReqType_PEVPubKey* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_ServicePaymentSelectionReqType(struct ServicePaymentSelectionReqType* type)
-{
-
+{
init_ServiceListType(&(type->ServiceList));
init_ServicePaymentSelectionReqType_PEVPubKey(&(type->PEVPubKey));
}
static void init_ServicePaymentSelectionResType_MeteringAuthPubKey(struct ServicePaymentSelectionResType_MeteringAuthPubKey* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_ServicePaymentSelectionResType(struct ServicePaymentSelectionResType* type)
-{
-
+{
init_ServicePaymentSelectionResType_MeteringAuthPubKey(&(type->MeteringAuthPubKey));
type->isused.MeteringAuthPubKey=0;
}
static void init_PaymentDetailsReqType_ContractID(struct PaymentDetailsReqType_ContractID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_PaymentDetailsReqType(struct PaymentDetailsReqType* type)
-{
-
+{
init_PaymentDetailsReqType_ContractID(&(type->ContractID));
}
static void init_PowerDiscoveryReqType(struct PowerDiscoveryReqType* type)
-{
-
+{
}
static void init_PowerDiscoveryResType_EnergyProvider(struct PowerDiscoveryResType_EnergyProvider* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_TariffTableType_Currency(struct TariffTableType_Currency* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_TariffDescrType_TariffDescription(struct TariffDescrType_TariffDescription* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_TariffEntryType(struct TariffEntryType* type)
-{
-
+{
type->isused.EPrice=0;
}
static void init_TariffEntriesType(struct TariffEntriesType* type)
{
+ int i_loop;
+
+ for(i_loop=0; i_loop<8;i_loop++)
+ {
+ init_TariffEntryType(&(type->TariffEntry[i_loop]));
+ }
- init_TariffEntryType((type->TariffEntry));
type->arraylen.TariffEntry=0;
}
static void init_TariffDescrType(struct TariffDescrType* type)
-{
-
+{
init_TariffDescrType_TariffDescription(&(type->TariffDescription));
type->isused.TariffDescription=0;
init_TariffEntriesType(&(type->TariffEntries));
@@ -278,16 +258,20 @@ static void init_TariffDescrType(struct TariffDescrType* type)
static void init_TariffTableType(struct TariffTableType* type)
{
-
+ int i_loop;
+
init_TariffTableType_Currency(&(type->Currency));
- init_TariffDescrType((type->Tariff));
+ for(i_loop=0; i_loop<6;i_loop++)
+ {
+ init_TariffDescrType(&(type->Tariff[i_loop]));
+ }
+
type->arraylen.Tariff=0;
}
static void init_PowerDiscoveryResType(struct PowerDiscoveryResType* type)
-{
-
+{
init_PowerDiscoveryResType_EnergyProvider(&(type->EnergyProvider));
type->isused.EnergyProvider=0;
init_TariffTableType(&(type->TariffTable));
@@ -296,26 +280,22 @@ static void init_PowerDiscoveryResType(struct PowerDiscoveryResType* type)
}
static void init_LineLockReqType(struct LineLockReqType* type)
-{
-
+{
}
static void init_LineLockResType(struct LineLockResType* type)
-{
-
+{
}
static void init_ChargingProfileType(struct ChargingProfileType* type)
-{
-
+{
}
static void init_PowerDeliveryReqType(struct PowerDeliveryReqType* type)
-{
-
+{
type->isused.Tariff=0;
init_ChargingProfileType(&(type->ChargingProfile));
type->isused.ChargingProfile=0;
@@ -323,29 +303,25 @@ static void init_PowerDeliveryReqType(struct PowerDeliveryReqType* type)
}
static void init_MeteringStatusResType_EVSEID(struct MeteringStatusResType_EVSEID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_MeterInfoType_MeterID(struct MeterInfoType_MeterID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_MeterInfoType_MeterPubKey(struct MeterInfoType_MeterPubKey* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_MeterInfoType(struct MeterInfoType* type)
-{
-
+{
init_MeterInfoType_MeterID(&(type->MeterID));
type->isused.MeterID=0;
init_MeterInfoType_MeterPubKey(&(type->MeterPubKey));
@@ -357,8 +333,7 @@ static void init_MeterInfoType(struct MeterInfoType* type)
}
static void init_MeteringStatusResType(struct MeteringStatusResType* type)
-{
-
+{
init_MeteringStatusResType_EVSEID(&(type->EVSEID));
type->isused.PCurrent=0;
init_MeterInfoType(&(type->MeterInfo));
@@ -367,15 +342,13 @@ static void init_MeteringStatusResType(struct MeteringStatusResType* type)
}
static void init_MeteringReceiptReqType_PEVID(struct MeteringReceiptReqType_PEVID* type)
-{
-
+{
type->arraylen.data=0;
}
static void init_MeteringReceiptReqType(struct MeteringReceiptReqType* type)
-{
-
+{
init_MeteringReceiptReqType_PEVID(&(type->PEVID));
type->isused.PEVID=0;
type->isused.TCurrent=0;
@@ -384,8 +357,7 @@ static void init_MeteringReceiptReqType(struct MeteringReceiptReqType* type)
}
static void init_BodyType(struct BodyType* type)
-{
-
+{
init_SessionSetupReqType(&(type->SessionSetupReq));
type->isused.SessionSetupReq=0;
init_SessionSetupResType(&(type->SessionSetupRes));
@@ -421,8 +393,7 @@ static void init_BodyType(struct BodyType* type)
}
void init_AnonType_V2G_Message(struct AnonType_V2G_Message* type)
-{
-
+{
init_HeaderType(&(type->Header));
init_BodyType(&(type->Body));
diff --git a/src/service/v2g_serviceDataTypes.h b/src/service/v2g_serviceDataTypes.h
index 8025126..931d97b 100644
--- a/src/service/v2g_serviceDataTypes.h
+++ b/src/service/v2g_serviceDataTypes.h
@@ -33,7 +33,7 @@ extern "C" {
#ifndef SERVICEDATATYPES_H
#define SERVICEDATATYPES_H
-#include "../codec/EXITypes.h"
+#include "EXITypes.h"
@@ -181,7 +181,6 @@ struct arraylen_SessionInformationType_SessionID
};
-
struct SessionInformationType_SessionID
{
uint8_t data[8];
@@ -189,7 +188,6 @@ struct SessionInformationType_SessionID
};
-
struct arraylen_SessionInformationType_ServiceSessionID
{
size_t data;
@@ -197,7 +195,6 @@ struct arraylen_SessionInformationType_ServiceSessionID
};
-
struct SessionInformationType_ServiceSessionID
{
uint8_t data[8];
@@ -205,7 +202,6 @@ struct SessionInformationType_ServiceSessionID
};
-
struct selection_SessionInformationType
{
int ServiceSessionID:1;
@@ -214,7 +210,6 @@ struct selection_SessionInformationType
};
-
struct arraylen_SessionInformationType_ProtocolVersion
{
size_t data;
@@ -222,7 +217,6 @@ struct arraylen_SessionInformationType_ProtocolVersion
};
-
struct SessionInformationType_ProtocolVersion
{
uint32_t data[256];
@@ -230,7 +224,6 @@ struct SessionInformationType_ProtocolVersion
};
-
struct SessionInformationType
{
struct SessionInformationType_SessionID SessionID;
@@ -240,7 +233,6 @@ struct SessionInformationType
};
-
struct selection_NotificationType
{
int FaultCode:1;
@@ -250,7 +242,6 @@ struct selection_NotificationType
};
-
struct arraylen_NotificationType_FaultMsg
{
size_t data;
@@ -258,7 +249,6 @@ struct arraylen_NotificationType_FaultMsg
};
-
struct NotificationType_FaultMsg
{
uint32_t data[256];
@@ -266,7 +256,6 @@ struct NotificationType_FaultMsg
};
-
struct EventListType
{
enum eventEntryType Event;
@@ -274,7 +263,6 @@ struct EventListType
};
-
struct NotificationType
{
enum faultCodeType FaultCode;
@@ -284,7 +272,6 @@ struct NotificationType
};
-
struct selection_HeaderType
{
int Notification:1;
@@ -292,7 +279,6 @@ struct selection_HeaderType
};
-
struct HeaderType
{
struct SessionInformationType SessionInformation;
@@ -301,7 +287,6 @@ struct HeaderType
};
-
struct arraylen_SessionSetupReqType_PEVID
{
size_t data;
@@ -309,7 +294,6 @@ struct arraylen_SessionSetupReqType_PEVID
};
-
struct SessionSetupReqType_PEVID
{
uint32_t data[32];
@@ -317,7 +301,6 @@ struct SessionSetupReqType_PEVID
};
-
struct selection_SessionSetupReqType
{
int PEVID:1;
@@ -325,7 +308,6 @@ struct selection_SessionSetupReqType
};
-
struct PEVStatusType
{
int ConnectorLocked;
@@ -334,7 +316,6 @@ struct PEVStatusType
};
-
struct SessionSetupReqType
{
struct SessionSetupReqType_PEVID PEVID;
@@ -343,7 +324,6 @@ struct SessionSetupReqType
};
-
struct selection_BodyType
{
int SessionSetupReq:1;
@@ -368,7 +348,6 @@ struct selection_BodyType
};
-
struct arraylen_SessionSetupResType_EVSEID
{
size_t data;
@@ -376,7 +355,6 @@ struct arraylen_SessionSetupResType_EVSEID
};
-
struct SessionSetupResType_EVSEID
{
uint8_t data[32];
@@ -384,7 +362,6 @@ struct SessionSetupResType_EVSEID
};
-
struct EVSEStatusType
{
int FatalError;
@@ -397,7 +374,6 @@ struct EVSEStatusType
};
-
struct SessionSetupResType
{
enum responseCode_SessionSetupType ResponseCode;
@@ -408,7 +384,6 @@ struct SessionSetupResType
};
-
struct selection_ServiceDiscoveryReqType
{
int ServiceType:1;
@@ -417,7 +392,6 @@ struct selection_ServiceDiscoveryReqType
};
-
struct arraylen_ServiceDiscoveryReqType_ServiceScope
{
size_t data;
@@ -425,7 +399,6 @@ struct arraylen_ServiceDiscoveryReqType_ServiceScope
};
-
struct ServiceDiscoveryReqType_ServiceScope
{
uint32_t data[255];
@@ -433,7 +406,6 @@ struct ServiceDiscoveryReqType_ServiceScope
};
-
struct ServiceDiscoveryReqType
{
enum serviceTypeType ServiceType;
@@ -442,7 +414,6 @@ struct ServiceDiscoveryReqType
};
-
struct arraylen_ServiceDescriptionType_ServiceID
{
size_t data;
@@ -450,7 +421,6 @@ struct arraylen_ServiceDescriptionType_ServiceID
};
-
struct ServiceDescriptionType_ServiceID
{
uint8_t data[8];
@@ -458,7 +428,6 @@ struct ServiceDescriptionType_ServiceID
};
-
struct arraylen_ServiceDescriptionType_ServiceName
{
size_t data;
@@ -466,7 +435,6 @@ struct arraylen_ServiceDescriptionType_ServiceName
};
-
struct ServiceDescriptionType_ServiceName
{
uint32_t data[64];
@@ -474,7 +442,6 @@ struct ServiceDescriptionType_ServiceName
};
-
struct selection_ServiceDescriptionType
{
int ServiceName:1;
@@ -484,7 +451,6 @@ struct selection_ServiceDescriptionType
};
-
struct arraylen_ServiceDescriptionType_ServiceScope
{
size_t data;
@@ -492,7 +458,6 @@ struct arraylen_ServiceDescriptionType_ServiceScope
};
-
struct ServiceDescriptionType_ServiceScope
{
uint32_t data[255];
@@ -500,7 +465,6 @@ struct ServiceDescriptionType_ServiceScope
};
-
struct ServiceDescriptionType
{
struct ServiceDescriptionType_ServiceID ServiceID;
@@ -511,7 +475,6 @@ struct ServiceDescriptionType
};
-
struct arraylen_ServiceListType
{
size_t Service;
@@ -519,7 +482,6 @@ struct arraylen_ServiceListType
};
-
struct ServiceListType
{
struct ServiceDescriptionType Service[8];
@@ -527,7 +489,6 @@ struct ServiceListType
};
-
struct selection_ServiceDiscoveryResType
{
int ServiceList:1;
@@ -535,7 +496,6 @@ struct selection_ServiceDiscoveryResType
};
-
struct ServiceDiscoveryResType
{
enum responseCode_ServiceDiscoveryType ResponseCode;
@@ -544,7 +504,6 @@ struct ServiceDiscoveryResType
};
-
struct arraylen_ServicePaymentSelectionReqType_PEVPubKey
{
size_t data;
@@ -552,7 +511,6 @@ struct arraylen_ServicePaymentSelectionReqType_PEVPubKey
};
-
struct ServicePaymentSelectionReqType_PEVPubKey
{
uint8_t data[64];
@@ -560,7 +518,6 @@ struct ServicePaymentSelectionReqType_PEVPubKey
};
-
struct ServicePaymentSelectionReqType
{
struct ServiceListType ServiceList;
@@ -569,7 +526,6 @@ struct ServicePaymentSelectionReqType
};
-
struct arraylen_ServicePaymentSelectionResType_MeteringAuthPubKey
{
size_t data;
@@ -577,7 +533,6 @@ struct arraylen_ServicePaymentSelectionResType_MeteringAuthPubKey
};
-
struct ServicePaymentSelectionResType_MeteringAuthPubKey
{
uint8_t data[64];
@@ -585,7 +540,6 @@ struct ServicePaymentSelectionResType_MeteringAuthPubKey
};
-
struct selection_ServicePaymentSelectionResType
{
int MeteringAuthPubKey:1;
@@ -593,7 +547,6 @@ struct selection_ServicePaymentSelectionResType
};
-
struct ServicePaymentSelectionResType
{
enum responseCode_ServicePaymentSelectionType ResponseCode;
@@ -602,7 +555,6 @@ struct ServicePaymentSelectionResType
};
-
struct arraylen_PaymentDetailsReqType_ContractID
{
size_t data;
@@ -610,7 +562,6 @@ struct arraylen_PaymentDetailsReqType_ContractID
};
-
struct PaymentDetailsReqType_ContractID
{
uint32_t data[128];
@@ -618,7 +569,6 @@ struct PaymentDetailsReqType_ContractID
};
-
struct PaymentDetailsReqType
{
struct PaymentDetailsReqType_ContractID ContractID;
@@ -626,7 +576,6 @@ struct PaymentDetailsReqType
};
-
struct PaymentDetailsResType
{
enum responseCode_PaymentDetailsType ResponseCode;
@@ -634,7 +583,6 @@ struct PaymentDetailsResType
};
-
struct FloatingValueType
{
enum unitMultiplierType Multiplier;
@@ -644,7 +592,6 @@ struct FloatingValueType
};
-
struct PowerDiscoveryReqType
{
struct PEVStatusType PEVStatus;
@@ -658,7 +605,6 @@ struct PowerDiscoveryReqType
};
-
struct arraylen_PowerDiscoveryResType_EnergyProvider
{
size_t data;
@@ -666,7 +612,6 @@ struct arraylen_PowerDiscoveryResType_EnergyProvider
};
-
struct PowerDiscoveryResType_EnergyProvider
{
uint32_t data[256];
@@ -674,7 +619,6 @@ struct PowerDiscoveryResType_EnergyProvider
};
-
struct selection_PowerDiscoveryResType
{
int EnergyProvider:1;
@@ -683,7 +627,6 @@ struct selection_PowerDiscoveryResType
};
-
struct arraylen_TariffTableType_Currency
{
size_t data;
@@ -691,7 +634,6 @@ struct arraylen_TariffTableType_Currency
};
-
struct TariffTableType_Currency
{
uint32_t data[3];
@@ -699,7 +641,6 @@ struct TariffTableType_Currency
};
-
struct arraylen_TariffDescrType_TariffDescription
{
size_t data;
@@ -707,7 +648,6 @@ struct arraylen_TariffDescrType_TariffDescription
};
-
struct TariffDescrType_TariffDescription
{
uint32_t data[32];
@@ -715,7 +655,6 @@ struct TariffDescrType_TariffDescription
};
-
struct selection_TariffDescrType
{
int TariffDescription:1;
@@ -723,7 +662,6 @@ struct selection_TariffDescrType
};
-
struct selection_TariffEntryType
{
int EPrice:1;
@@ -731,7 +669,6 @@ struct selection_TariffEntryType
};
-
struct TariffEntryType
{
uint32_t TariffStart;
@@ -741,7 +678,6 @@ struct TariffEntryType
};
-
struct arraylen_TariffEntriesType
{
size_t TariffEntry;
@@ -749,7 +685,6 @@ struct arraylen_TariffEntriesType
};
-
struct TariffEntriesType
{
struct TariffEntryType TariffEntry[8];
@@ -757,7 +692,6 @@ struct TariffEntriesType
};
-
struct TariffDescrType
{
enum tariffIDType TariffID;
@@ -767,7 +701,6 @@ struct TariffDescrType
};
-
struct arraylen_TariffTableType
{
size_t Tariff;
@@ -775,7 +708,6 @@ struct arraylen_TariffTableType
};
-
struct TariffTableType
{
struct TariffTableType_Currency Currency;
@@ -784,7 +716,6 @@ struct TariffTableType
};
-
struct PowerDiscoveryResType
{
enum responseCode_PowerDiscoveryType ResponseCode;
@@ -798,7 +729,6 @@ struct PowerDiscoveryResType
};
-
struct LineLockReqType
{
struct PEVStatusType PEVStatus;
@@ -807,7 +737,6 @@ struct LineLockReqType
};
-
struct LineLockResType
{
enum responseCode_LineLockType ResponseCode;
@@ -816,7 +745,6 @@ struct LineLockResType
};
-
struct selection_PowerDeliveryReqType
{
int Tariff:1;
@@ -825,7 +753,6 @@ struct selection_PowerDeliveryReqType
};
-
struct ChargingProfileType
{
int64_t ChargingProfileEntryStart;
@@ -834,7 +761,6 @@ struct ChargingProfileType
};
-
struct PowerDeliveryReqType
{
struct PEVStatusType PEVStatus;
@@ -845,7 +771,6 @@ struct PowerDeliveryReqType
};
-
struct PowerDeliveryResType
{
enum responseCode_PowerDeliveryType ResponseCode;
@@ -853,14 +778,14 @@ struct PowerDeliveryResType
};
-
struct MeteringStatusReqType
{
-
+
+ int NO_MEMBER:1;
+
};
-
struct arraylen_MeteringStatusResType_EVSEID
{
size_t data;
@@ -868,7 +793,6 @@ struct arraylen_MeteringStatusResType_EVSEID
};
-
struct MeteringStatusResType_EVSEID
{
uint8_t data[32];
@@ -876,7 +800,6 @@ struct MeteringStatusResType_EVSEID
};
-
struct selection_MeteringStatusResType
{
int PCurrent:1;
@@ -885,7 +808,6 @@ struct selection_MeteringStatusResType
};
-
struct arraylen_MeterInfoType_MeterID
{
size_t data;
@@ -893,7 +815,6 @@ struct arraylen_MeterInfoType_MeterID
};
-
struct MeterInfoType_MeterID
{
uint32_t data[32];
@@ -901,7 +822,6 @@ struct MeterInfoType_MeterID
};
-
struct selection_MeterInfoType
{
int MeterID:1;
@@ -913,7 +833,6 @@ struct selection_MeterInfoType
};
-
struct arraylen_MeterInfoType_MeterPubKey
{
size_t data;
@@ -921,7 +840,6 @@ struct arraylen_MeterInfoType_MeterPubKey
};
-
struct MeterInfoType_MeterPubKey
{
uint8_t data[64];
@@ -929,7 +847,6 @@ struct MeterInfoType_MeterPubKey
};
-
struct MeterInfoType
{
struct MeterInfoType_MeterID MeterID;
@@ -941,7 +858,6 @@ struct MeterInfoType
};
-
struct MeteringStatusResType
{
enum responseCode_MeteringStatusType ResponseCode;
@@ -955,7 +871,6 @@ struct MeteringStatusResType
};
-
struct arraylen_MeteringReceiptReqType_PEVID
{
size_t data;
@@ -963,7 +878,6 @@ struct arraylen_MeteringReceiptReqType_PEVID
};
-
struct MeteringReceiptReqType_PEVID
{
uint32_t data[32];
@@ -971,7 +885,6 @@ struct MeteringReceiptReqType_PEVID
};
-
struct selection_MeteringReceiptReqType
{
int PEVID:1;
@@ -980,7 +893,6 @@ struct selection_MeteringReceiptReqType
};
-
struct MeteringReceiptReqType
{
struct MeteringReceiptReqType_PEVID PEVID;
@@ -992,7 +904,6 @@ struct MeteringReceiptReqType
};
-
struct MeteringReceiptResType
{
enum responseCode_MeteringReceiptType ResponseCode;
@@ -1000,7 +911,6 @@ struct MeteringReceiptResType
};
-
struct BodyType
{
struct SessionSetupReqType SessionSetupReq;
@@ -1025,7 +935,6 @@ struct BodyType
};
-
struct AnonType_V2G_Message
{
struct HeaderType Header;
@@ -1033,7 +942,6 @@ struct AnonType_V2G_Message
};
-
/* init method of the V2G message */
void init_AnonType_V2G_Message(struct AnonType_V2G_Message* v2gMsg);
diff --git a/src/service/v2g_serviceDispatcher.c b/src/service/v2g_serviceDispatcher.c
index 57bcb3b..16824bc 100644
--- a/src/service/v2g_serviceDispatcher.c
+++ b/src/service/v2g_serviceDispatcher.c
@@ -32,9 +32,9 @@
#include "v2g_serviceDataTypes.h"
#include "v2g_serviceMethods.h"
#include "v2g_serviceDataSerializiation.h"
-#include "../codec/EXITypes.h"
-#include "../codec/EXIDecoder.h"
-#include "../codec/EXIEncoder.h"
+#include "EXITypes.h"
+#include "EXIDecoder.h"
+#include "EXIEncoder.h"
/**
@@ -1230,10 +1230,7 @@ static int deserializeMessage(struct v2gService* service)
{
int noEndOfDocument = 1; /* true */
int errno;
-#ifdef DEBUG
- const char * localName;
- const char * namespaceURI;
-#endif
+
do {
exiDecodeNextEvent(&(service->inStream), &(service->stateDecode), &(service->event));
diff --git a/src/service/v2g_serviceMethods.h b/src/service/v2g_serviceMethods.h
index 04f9239..45d4fa0 100644
--- a/src/service/v2g_serviceMethods.h
+++ b/src/service/v2g_serviceMethods.h
@@ -1,3 +1,7 @@
+
+
+
+
/*
* Copyright (C) 2007-2010 Siemens AG
*
@@ -31,7 +35,7 @@ extern "C" {
#define SERVICEMETHODS_H
#include "v2g_serviceDataTypes.h"
-#include "../codec/EXITypes.h"
+#include "EXITypes.h"
/* service methods */
int sessionSetup(struct SessionSetupReqType* param, struct SessionSetupResType* result);