Mirrors_Framework/OpenPLC_v3
1
0
Fork 0
mirror of https://github.com/thiagoralves/OpenPLC_v3.git synced 2026-02-06 02:02:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #229 from r2k-in-the-vortex/master

Browse Source 
some more cast warnings reduced
This commit is contained in:
Thiago Alves
2024-04-01 16:18:48 -04:00
committed by GitHub
parent a44fea84b8 2c82b0e79c
commit 0ae689b470
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
utils/glue_generator_src/glue_generator.cpp
View File

@@ -60,20 +60,20 @@ IEC_UINT *int_input[BUFFER_SIZE];\r\n\
IEC_UINT *int_output[BUFFER_SIZE];\r\n\
\r\n\
//32bit I/O\r\n\
IEC_DINT *dint_input[BUFFER_SIZE];\r\n\
IEC_DINT *dint_output[BUFFER_SIZE];\r\n\
IEC_UDINT *dint_input[BUFFER_SIZE];\r\n\
IEC_UDINT *dint_output[BUFFER_SIZE];\r\n\
\r\n\
//64bit I/O\r\n\
IEC_LINT *lint_input[BUFFER_SIZE];\r\n\
IEC_LINT *lint_output[BUFFER_SIZE];\r\n\
IEC_ULINT *lint_input[BUFFER_SIZE];\r\n\
IEC_ULINT *lint_output[BUFFER_SIZE];\r\n\
\r\n\
//Memory\r\n\
IEC_UINT *int_memory[BUFFER_SIZE];\r\n\
IEC_DINT *dint_memory[BUFFER_SIZE];\r\n\
IEC_LINT *lint_memory[BUFFER_SIZE];\r\n\
IEC_UDINT *dint_memory[BUFFER_SIZE];\r\n\
IEC_ULINT *lint_memory[BUFFER_SIZE];\r\n\
\r\n\
//Special Functions\r\n\
IEC_LINT *special_functions[BUFFER_SIZE];\r\n\
IEC_ULINT *special_functions[BUFFER_SIZE];\r\n\
\r\n\
\r\n\
#define __LOCATED_VAR(type, name, ...) type __##name;\r\n\
@@ -176,19 +176,19 @@ void glueVar(ostream& glueVars, char *varName, char *varType)
switch (varName[3])
{
case 'X':
glueVars << "\tbool_input[" << pos1 << "][" << pos2 << "] = " << varName << ";\r\n";
glueVars << "\tbool_input[" << pos1 << "][" << pos2 << "] = (IEC_BOOL *)" << varName << ";\r\n";
break;
case 'B':
glueVars << "\tbyte_input[" << pos1 << "] = " << varName << ";\r\n";
glueVars << "\tbyte_input[" << pos1 << "] = (IEC_BYTE *)" << varName << ";\r\n";
break;
case 'W':
glueVars << "\tint_input[" << pos1 << "] = " << varName << ";\r\n";
glueVars << "\tint_input[" << pos1 << "] = (IEC_UINT *)" << varName << ";\r\n";
break;
case 'D':
glueVars << "\tdint_input[" << pos1 << "] = (IEC_DINT *)" << varName << ";\r\n";
glueVars << "\tdint_input[" << pos1 << "] = (IEC_UDINT *)" << varName << ";\r\n";
break;
case 'L':
glueVars << "\tlint_input[" << pos1 << "] = (IEC_LINT *)" << varName << ";\r\n";
glueVars << "\tlint_input[" << pos1 << "] = (IEC_ULINT *)" << varName << ";\r\n";
break;
}
}
@@ -198,19 +198,19 @@ void glueVar(ostream& glueVars, char *varName, char *varType)
switch (varName[3])
{
case 'X':
glueVars << "\tbool_output[" << pos1 << "][" << pos2 << "] = " << varName << ";\r\n";
glueVars << "\tbool_output[" << pos1 << "][" << pos2 << "] = (IEC_BOOL *)" << varName << ";\r\n";
break;
case 'B':
glueVars << "\tbyte_output[" << pos1 << "] = " << varName << ";\r\n";
glueVars << "\tbyte_output[" << pos1 << "] = (IEC_BYTE *)" << varName << ";\r\n";
break;
case 'W':
glueVars << "\tint_output[" << pos1 << "] = " << varName << ";\r\n";
glueVars << "\tint_output[" << pos1 << "] = (IEC_UINT *)" << varName << ";\r\n";
break;
case 'D':
glueVars << "\tdint_output[" << pos1 << "] = (IEC_DINT *)" << varName << ";\r\n";
glueVars << "\tdint_output[" << pos1 << "] = (IEC_UDINT *)" << varName << ";\r\n";
break;
case 'L':
glueVars << "\tlint_input[" << pos1 << "] = (IEC_LINT *)" << varName << ";\r\n";
glueVars << "\tlint_input[" << pos1 << "] = (IEC_ULINT *)" << varName << ";\r\n";
break;
}
}
@@ -220,16 +220,16 @@ void glueVar(ostream& glueVars, char *varName, char *varType)
switch (varName[3])
{
case 'W':
glueVars << "\tint_memory[" << pos1 << "] = " << varName << ";\r\n";
glueVars << "\tint_memory[" << pos1 << "] = (IEC_UINT *)" << varName << ";\r\n";
break;
case 'D':
glueVars << "\tdint_memory[" << pos1 << "] = (IEC_DINT *)" << varName << ";\r\n";
glueVars << "\tdint_memory[" << pos1 << "] = (IEC_UDINT *)" << varName << ";\r\n";
break;
case 'L':
if (pos1 > 1023)
glueVars << "\tspecial_functions[" << (pos1-1024) << "] = (IEC_LINT *)" << varName << ";\r\n";
glueVars << "\tspecial_functions[" << (pos1-1024) << "] = (IEC_ULINT *)" << varName << ";\r\n";
else
glueVars << "\tlint_memory[" << pos1 << "] = (IEC_LINT *)" << varName << ";\r\n";
glueVars << "\tlint_memory[" << pos1 << "] = (IEC_ULINT *)" << varName << ";\r\n";
break;
}
}

2
webserver/core/interactive_server.cpp
View File

@@ -234,7 +234,7 @@ int listenToClient_interactive(int client_fd, unsigned char *buffer)
//-----------------------------------------------------------------------------
void processCommand(unsigned char *buffer, int client_fd)
{
char log_msg[1000];
char log_msg[1200];
int count_char = 0;
if (processing_command)

16
webserver/core/ladder.h
View File

@@ -70,20 +70,20 @@ extern IEC_UINT *int_input[BUFFER_SIZE];
extern IEC_UINT *int_output[BUFFER_SIZE];
//32bit I/O
extern IEC_DINT *dint_input[BUFFER_SIZE];
extern IEC_DINT *dint_output[BUFFER_SIZE];
extern IEC_UDINT *dint_input[BUFFER_SIZE];
extern IEC_UDINT *dint_output[BUFFER_SIZE];
//64bit I/O
extern IEC_LINT *lint_input[BUFFER_SIZE];
extern IEC_LINT *lint_output[BUFFER_SIZE];
extern IEC_ULINT *lint_input[BUFFER_SIZE];
extern IEC_ULINT *lint_output[BUFFER_SIZE];
//Memory
extern IEC_UINT *int_memory[BUFFER_SIZE];
extern IEC_DINT *dint_memory[BUFFER_SIZE];
extern IEC_LINT *lint_memory[BUFFER_SIZE];
extern IEC_UDINT *dint_memory[BUFFER_SIZE];
extern IEC_ULINT *lint_memory[BUFFER_SIZE];
//Special Functions
extern IEC_LINT *special_functions[BUFFER_SIZE];
extern IEC_ULINT *special_functions[BUFFER_SIZE];
//lock for the buffer
extern pthread_mutex_t bufferLock;
@@ -166,4 +166,4 @@ void dnp3StartServer(int port);
//persistent_storage.cpp
void startPstorage();
int readPersistentStorage();
void readPersistentStorage();

14
webserver/core/persistent_storage.cpp
View File

@@ -63,14 +63,14 @@ void startPstorage()
{
sprintf(log_msg, "Persistent Storage: Error creating persistent memory file!\n");
log(log_msg);
return 0;
return;
}
if (fwrite(persistentBuffer, sizeof(IEC_INT), BUFFER_SIZE, ps) < BUFFER_SIZE)
{
sprintf(log_msg, "Persistent Storage: Error writing to persistent memory file!\n");
log(log_msg);
return 0;
return;
}
fclose(ps);
@@ -102,14 +102,14 @@ void startPstorage()
{
sprintf(log_msg, "Persistent Storage: Error creating persistent memory file!\n");
log(log_msg);
return 0;
return;
}
if (fwrite(persistentBuffer, sizeof(IEC_INT), BUFFER_SIZE, fd) < BUFFER_SIZE)
{
sprintf(log_msg, "Persistent Storage: Error writing to persistent memory file!\n");
log(log_msg);
return 0;
return;
}
fclose(fd);
}
@@ -124,7 +124,7 @@ void startPstorage()
// is disabled, the persistent.file will not be found and the function will
// exit gracefully.
//-----------------------------------------------------------------------------
int readPersistentStorage()
void readPersistentStorage()
{
char log_msg[1000];
FILE *fd = fopen("persistent.file", "r");
@@ -133,7 +133,7 @@ int readPersistentStorage()
sprintf(log_msg, "Warning: Persistent Storage file not found\n");
log(log_msg);
pstorage_read = true;
return 0;
return;
}
IEC_INT persistentBuffer[BUFFER_SIZE];
@@ -143,7 +143,7 @@ int readPersistentStorage()
sprintf(log_msg, "Persistent Storage: Error while trying to read persistent.file!\n");
log(log_msg);
pstorage_read = true;
return 0;
return;
}
fclose(fd);