Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'changed' status to varGetValue #1

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+64 −25
Open

Add 'changed' status to varGetValue #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions VarTools.typ
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ TYPE
dataType : UDINT;
length : UDINT;
dimension : UINT;
changed : BOOL;
END_STRUCT;
END_TYPE
82 changes: 60 additions & 22 deletions varGetValue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ unsigned short varGetValue(unsigned long pVariable)

// Check address
varVariable_typ *ipVariable = (varVariable_typ*)pVariable;
UINT status;
UINT status = 0;

if (ipVariable->address == 0) {
// Get info if necessary
Expand All @@ -79,11 +79,15 @@ unsigned short varGetValue(unsigned long pVariable)
DINT valueDint;
UDINT valueUdint;
REAL valueReal;
STRING valueString[VAR_STRLEN_NAME+1];
UDINT valueStringLen = 0;


// Clear the Value string. It will be overwritten below

memset( ipVariable->value, 0, sizeof(ipVariable->value) );
// Lazy Clear the Value string. It will be overwritten below
valueString[0] = '\0';

// Reset changed status
ipVariable->changed = 0;


switch( ipVariable->dataType ){
Expand All @@ -97,21 +101,23 @@ unsigned short varGetValue(unsigned long pVariable)

if( *(BOOL*)(ipVariable->address) == 0 ){

strcpy( ipVariable->value, "false" );
strcpy( valueString, "false" );

}
else if( *(BOOL*)(ipVariable->address) == 1 ){

strcpy( ipVariable->value, "true" );
strcpy( valueString, "true" );

}
else{

// Invalid BOOL value.
// Use convention of non-zero == TRUE for now
strcpy( ipVariable->value, "true" );
strcpy( valueString, "true" );

}

valueStringLen = strlen( valueString );

break;

Expand All @@ -124,7 +130,9 @@ unsigned short varGetValue(unsigned long pVariable)

valueDint= *(SINT*)(ipVariable->address);

brsitoa( valueDint, (UDINT)ipVariable->value );
brsitoa( valueDint, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;

Expand All @@ -133,8 +141,10 @@ unsigned short varGetValue(unsigned long pVariable)

valueDint= *(INT*)(ipVariable->address);

brsitoa( valueDint, (UDINT)ipVariable->value );
brsitoa( valueDint, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;


Expand All @@ -143,26 +153,32 @@ unsigned short varGetValue(unsigned long pVariable)

valueDint= *(DINT*)(ipVariable->address);

brsitoa( valueDint, (UDINT)ipVariable->value );
brsitoa( valueDint, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;

case VAR_TYPE_BYTE:
case VAR_TYPE_USINT:

valueDint= *(USINT*)(ipVariable->address);

brsitoa( valueDint, (UDINT)ipVariable->value );
brsitoa( valueDint, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;

case VAR_TYPE_WORD:
case VAR_TYPE_UINT:

valueDint= *(UINT*)(ipVariable->address);

brsitoa( valueDint, (UDINT)ipVariable->value );
brsitoa( valueDint, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;

case VAR_TYPE_DWORD:
Expand All @@ -171,8 +187,10 @@ unsigned short varGetValue(unsigned long pVariable)

valueUdint= *(UDINT*)(ipVariable->address);

uitoa( valueUdint, (UDINT)ipVariable->value );
uitoa( valueUdint, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;


Expand All @@ -184,7 +202,9 @@ unsigned short varGetValue(unsigned long pVariable)

valueReal= *(REAL*)(ipVariable->address);

brsftoa( valueReal, (UDINT)ipVariable->value );
brsftoa( valueReal, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;

Expand All @@ -196,7 +216,9 @@ unsigned short varGetValue(unsigned long pVariable)

valueReal= (REAL)*(LREAL*)(ipVariable->address);

brsftoa( valueReal, (UDINT)ipVariable->value );
brsftoa( valueReal, (UDINT)valueString );

valueStringLen = strlen( valueString );

break;

Expand All @@ -206,14 +228,13 @@ unsigned short varGetValue(unsigned long pVariable)

case VAR_TYPE_STRING:

strncpy(ipVariable->value, (char*)ipVariable->address, VAR_STRLEN_VALUE);
ipVariable->value[VAR_STRLEN_VALUE] = '\0';
valueStringLen = stringlcpy( (UDINT)valueString, ipVariable->address, sizeof(valueString) );

break;

case VAR_TYPE_WSTRING:

wstring2string((UDINT)ipVariable->value, ipVariable->address, VAR_STRLEN_VALUE);
valueStringLen = wstring2string( (UDINT)valueString, ipVariable->address, sizeof(valueString) );

break;

Expand All @@ -228,16 +249,33 @@ unsigned short varGetValue(unsigned long pVariable)
case VAR_TYPE_ARRAY_OF_STRUCT:
case VAR_TYPE_TIME_OF_DAY:
case VAR_TYPE_LWORD:
case VAR_TYPE_LINT: return VAR_ERR_UNSUPPORTEDTYPE; break;
case VAR_TYPE_UNDEFINED: return VAR_ERR_PV_NOT_FOUND; break;
case VAR_TYPE_LINT:
status = VAR_ERR_UNSUPPORTEDTYPE;
break;

case VAR_TYPE_UNDEFINED:
valueStringLen = stringlcpy( (UDINT)valueString, (UDINT)"undefined", sizeof(valueStringLen) );
status = VAR_ERR_PV_NOT_FOUND;
break;

default: return VAR_ERR_INVALIDTYPE; break;
default:
status = VAR_ERR_INVALIDTYPE;
break;


} // switch(DataType) //

// Check for value changed
if( valueStringLen != strlen(ipVariable->value)
|| strcmp( valueString, ipVariable->value )) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this instead be memcmp as we know the string lengths are already the same? I am not sure if that optimization gains us much if anything.


ipVariable->changed = 1;
// Note: valueStringLen may be greater than sizeof(ipVariable->value)
strcpy(ipVariable->value, valueString);

}

return 0;
return status;


} // End Fn //
2 changes: 1 addition & 1 deletion varGetValueLreal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ switch( ipVariable->dataType ){
// We do not have a brwatof function
// So instead convert to string then use brsatof
char tempString[25]; // Max number of characters of a double is 24
wstring2string((UDINT)tempString, ipVariable->address, sizeof(tempString));
wstring2string( (UDINT)tempString, ipVariable->address, sizeof(tempString) );

*(LREAL*)pValue = brsatod((UDINT)tempString);

Expand Down
2 changes: 1 addition & 1 deletion varGetValueReal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ switch( ipVariable->dataType ){
// We do not have a brwatof function
// So instead convert to string then use brsatof
char tempString[25]; // Max number of characters of a double is 24
wstring2string((UDINT)tempString, ipVariable->address, sizeof(tempString));
wstring2string( (UDINT)tempString, ipVariable->address, sizeof(tempString));

*(REAL*)pValue = brsatof((UDINT)tempString);

Expand Down
2 changes: 1 addition & 1 deletion varSetValue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ unsigned short varSetValue(unsigned long pVariable)

case VAR_TYPE_WSTRING:

string2wstring( (UDINT)ipVariable->address, (UDINT)ipVariable->value, ipVariable->length-1 );
string2wstring( ipVariable->address, (UDINT)ipVariable->value, ipVariable->length-1 );

break;

Expand Down