|
|
@@ -33,11 +33,12 @@
|
|
|
#include "MessageHandler.h"
|
|
|
#include "sqlite3.h"
|
|
|
|
|
|
+
|
|
|
+
|
|
|
#ifndef SPEC_LATEST_SUPPORTED
|
|
|
#define SPEC_LATEST_SUPPORTED 13
|
|
|
#endif
|
|
|
|
|
|
-
|
|
|
#define Debug
|
|
|
//#define ARRAY_SIZE(A) (sizeof(A) / sizeof(A[0]))
|
|
|
#define PASS 1
|
|
|
@@ -52,7 +53,6 @@ pthread_t pid;
|
|
|
extern int server_sign;
|
|
|
|
|
|
extern void CheckSystemValue(void);
|
|
|
-//extern int TransactionMessageAttemptsGet(void);
|
|
|
extern int FirstHeartBeatResponse(void);
|
|
|
extern void OCPP_get_TableAuthlocalAllData(void);
|
|
|
extern int TransactionMessageAttemptsGet(void);
|
|
|
@@ -89,10 +89,6 @@ struct StartTime
|
|
|
unsigned int bootNotification;
|
|
|
}startTime;
|
|
|
|
|
|
-#if 0
|
|
|
-unsigned char *SendBuffer;
|
|
|
-int SendBufLen=(1024*4);//(1024*3);
|
|
|
-#endif
|
|
|
int SendBufLen=(1024*4);//(1024*3);
|
|
|
unsigned char SendBuffer[1024*4]={0};
|
|
|
static int ConnectionEstablished=0;
|
|
|
@@ -101,6 +97,9 @@ static int TransactionQueueInterval = 10;//3;
|
|
|
static int TransactionQueueNum = 0;
|
|
|
static int OfflineTransactionQueueNum = 0; // Number of offline transactions
|
|
|
static int OfflineTransaction = 0;
|
|
|
+static int IsUsing = FALSE;
|
|
|
+
|
|
|
+
|
|
|
int defaultWaitingTime = 10; //10 second
|
|
|
char OcppPath[160]={0};
|
|
|
char OcppProtocol[10]={0},OcppHost[50]={0}, OcppTempPath[50]={0};
|
|
|
@@ -714,7 +713,7 @@ void* ConnectWsServer(void* data) //int ConnectWsServer()
|
|
|
|
|
|
memset(&ContextInfo, 0, sizeof(struct lws_context_creation_info));
|
|
|
|
|
|
- if((GetOcppServerURL()==0) || (GetOcppPort() == 0) || (GetOcppPath()==0) )
|
|
|
+ if((GetOcppServerURL()==0) || (GetOcppPort() == 0) || (GetOcppPath()==0))
|
|
|
{
|
|
|
//result = FAIL;
|
|
|
DEBUG_ERROR("OCPP URL is NULL or OCPP Port is zero or OCPP Path is NULL\n");
|
|
|
@@ -865,24 +864,6 @@ if(fp == NULL) {
|
|
|
return FALSE;
|
|
|
}
|
|
|
|
|
|
-#if 0
|
|
|
-if(fgetc(fp)==EOF)
|
|
|
-{
|
|
|
- //DEBUG_INFO("It is end of file");
|
|
|
- fclose(fp);
|
|
|
- memset(rmFileCmd, 0, sizeof rmFileCmd);
|
|
|
- if((access("/Storage/OCPP/TransactionRelatedQueue",F_OK))!=-1)
|
|
|
- {
|
|
|
- sprintf(rmFileCmd,"rm -f %s","/Storage/OCPP/TransactionRelatedQueue");
|
|
|
- system(rmFileCmd);
|
|
|
- }
|
|
|
-
|
|
|
- result = FALSE;
|
|
|
-
|
|
|
- return result;
|
|
|
-}
|
|
|
-#endif
|
|
|
-
|
|
|
if( fgets (str, 1200, fp)!=NULL ) {
|
|
|
/* writing content to stdout */
|
|
|
//DEBUG_INFO("str=%s",str);
|
|
|
@@ -1525,25 +1506,44 @@ void CheckTransactionPacket(char *uuid)
|
|
|
|
|
|
}
|
|
|
|
|
|
-/* type: 0 (showqueue ); type: 1(showfront); type: 2(delq) type: 3 (sentqueue) type: 4 (addq) type: 5(store queue to /Storage/OCPP/ )*/
|
|
|
+//---- type: 0 (showqueue ); type: 1(showfront); type: 2(delq) type: 3 (sentqueue) type: 4 (addq) type: 5(store queue to /Storage/OCPP/ ) ---//
|
|
|
int queue_operation(int type, char *frontUUID, char *frontData)
|
|
|
{
|
|
|
-
|
|
|
- pthread_mutex_unlock(&lock_sentData);
|
|
|
- pthread_mutex_lock(&lock_sentData);
|
|
|
int result=0;
|
|
|
- if(type == 0) // show items in queue
|
|
|
- result = showqueue();
|
|
|
- else if(type == 1) // show first item
|
|
|
- result = showfront(frontUUID, frontData);
|
|
|
- else if(type == 2) // delete item
|
|
|
- result = delq();
|
|
|
- else if(type == 3) // sent items in queue
|
|
|
- result = sentqueue();
|
|
|
- else if(type == 4) // add items to the queue
|
|
|
- result = addq(frontUUID, frontData);
|
|
|
-
|
|
|
- pthread_mutex_unlock(&lock_sentData);
|
|
|
+ while(1)
|
|
|
+ {
|
|
|
+ if (!IsUsing )
|
|
|
+ {
|
|
|
+ IsUsing = TRUE;
|
|
|
+ //pthread_mutex_unlock(&lock_sentData);
|
|
|
+ //pthread_mutex_lock(&lock_sentData);
|
|
|
+
|
|
|
+ if(type == 0) // show items in queue
|
|
|
+ {
|
|
|
+ result = showqueue();
|
|
|
+ }
|
|
|
+ else if(type == 1) // show first item
|
|
|
+ {
|
|
|
+ result = showfront(frontUUID, frontData);
|
|
|
+ }
|
|
|
+ else if(type == 2) // delete item
|
|
|
+ {
|
|
|
+ result = delq();
|
|
|
+ }
|
|
|
+ else if(type == 3) // sent items in queue
|
|
|
+ {
|
|
|
+ result = sentqueue();
|
|
|
+ }
|
|
|
+ else if(type == 4) // add items to the queue
|
|
|
+ {
|
|
|
+ result = addq(frontUUID, frontData);
|
|
|
+ }
|
|
|
+
|
|
|
+ //pthread_mutex_unlock(&lock_sentData);
|
|
|
+ IsUsing = FALSE;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
return result;
|
|
|
}
|
|
|
@@ -1722,10 +1722,9 @@ int main(void)
|
|
|
|
|
|
for(;;)
|
|
|
{
|
|
|
- while(ConnectionEstablished==0)
|
|
|
+ while((ConnectionEstablished==0)&&(GetInternetConn() == 1)) // Check InternetConn 0: disconnected, 1: connected
|
|
|
{
|
|
|
SetOcppConnStatus(FALSE);
|
|
|
-
|
|
|
if((time((time_t*)NULL)-startTime.connect)>=60)
|
|
|
{
|
|
|
#ifdef Debug
|
|
|
@@ -1739,6 +1738,7 @@ int main(void)
|
|
|
// Check System Value, process offline Transaction
|
|
|
CheckSystemValue();
|
|
|
lws_service(context, 10000);//timeout_ms
|
|
|
+ usleep(5000);
|
|
|
}
|
|
|
|
|
|
if(( (BootNotificationInterval != 0 && ((time((time_t*)NULL)-startTime.bootNotification)>=BootNotificationInterval) ) || ((time((time_t*)NULL)-startTime.bootNotification)>=defaultWaitingTime) ) && ((server_sign == FALSE)/*|| (server_pending == TRUE)*/))
|
Edward Lien