mirror of
https://github.com/Martin-P/OpenV2G.git
synced 2024-11-18 12:53:58 +00:00
- include loop handling in serialization and datatype init
- no warnings
This commit is contained in:
sebastiankb
parent
c12d2c3e66
commit
6cc05f469c
9 changed files with 237 additions and 569 deletions
|
|
@ -32,8 +32,6 @@
|
|||
<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.294845555" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
|
||||
<option id="gnu.c.compiler.option.include.paths.773068816" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
|
||||
<listOptionValue builtIn="false" value=""${workspace_loc:/OpenV2G/src/codec}""/>
|
||||
<listOptionValue builtIn="false" value=""${workspace_loc:/OpenV2G/src}""/>
|
||||
<listOptionValue builtIn="false" value=""${workspace_loc:/OpenV2G/src/service}""/>
|
||||
<listOptionValue builtIn="false" value=""${workspace_loc:/OpenV2G/src/service}""/>
|
||||
<listOptionValue builtIn="false" value=""${workspace_loc:/OpenV2G/src/test}""/>
|
||||
</option>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ extern "C" {
|
|||
#define V2G_SERVICE_H_
|
||||
|
||||
#include "v2g_serviceDataTypes.h"
|
||||
#include "../codec/EXITypes.h"
|
||||
#include "EXITypes.h"
|
||||
|
||||
struct v2gService
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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)*/
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
@ -1934,6 +1931,8 @@ static int deserializeMessage(struct v2gService* service)
|
|||
|
||||
errno = exiDecodeEndElement(&(service->inStream), &(service->stateDecode), &(service->eqn));
|
||||
|
||||
|
||||
errno = deserializeElement(service);
|
||||
break;
|
||||
case CHARACTERS:
|
||||
/* decode */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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;
|
||||
|
|
@ -63,14 +59,12 @@ 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;
|
||||
|
|
@ -80,7 +74,6 @@ 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;
|
||||
|
|
@ -89,14 +82,12 @@ 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;
|
||||
|
||||
|
|
@ -104,28 +95,24 @@ static void init_SessionSetupReqType(struct SessionSetupReqType* type)
|
|||
|
||||
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;
|
||||
|
|
@ -134,28 +121,24 @@ 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,15 +150,19 @@ 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;
|
||||
|
||||
|
|
@ -183,14 +170,12 @@ static void init_ServiceDiscoveryResType(struct ServiceDiscoveryResType* type)
|
|||
|
||||
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));
|
||||
|
||||
|
|
@ -198,14 +183,12 @@ static void init_ServicePaymentSelectionReqType(struct ServicePaymentSelectionR
|
|||
|
||||
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;
|
||||
|
||||
|
|
@ -213,14 +196,12 @@ static void init_ServicePaymentSelectionResType(struct ServicePaymentSelectionR
|
|||
|
||||
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));
|
||||
|
||||
}
|
||||
|
|
@ -228,48 +209,47 @@ static void init_PaymentDetailsReqType(struct PaymentDetailsReqType* type)
|
|||
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));
|
||||
|
|
@ -298,24 +282,20 @@ 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;
|
||||
|
|
@ -324,28 +304,24 @@ 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));
|
||||
|
|
@ -358,7 +334,6 @@ 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));
|
||||
|
|
@ -368,14 +343,12 @@ 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;
|
||||
|
|
@ -385,7 +358,6 @@ 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));
|
||||
|
|
@ -422,7 +394,6 @@ 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));
|
||||
|
||||
|
|
|
|||
|
|
@ -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,13 +778,13 @@ struct PowerDeliveryResType
|
|||
|
||||
};
|
||||
|
||||
|
||||
struct MeteringStatusReqType
|
||||
{
|
||||
|
||||
|
||||
};
|
||||
int NO_MEMBER:1;
|
||||
|
||||
};
|
||||
|
||||
struct arraylen_MeteringStatusResType_EVSEID
|
||||
{
|
||||
|
|
@ -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;
|
||||
|
|
@ -1034,7 +943,6 @@ struct AnonType_V2G_Message
|
|||
|
||||
};
|
||||
|
||||
|
||||
/* init method of the V2G message */
|
||||
void init_AnonType_V2G_Message(struct AnonType_V2G_Message* v2gMsg);
|
||||
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue