Skip to content

P
proview
Commit a132267b authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Sev, deadband for other types than float

parent 7c5b1249
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 12 deletions
sev/lib/sev/src/sev_dbms.cpp
View file @ a132267b
...@@ -866,7 +866,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -866,7 +866,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
// Compare current value to old value // Compare current value to old value
switch ( m_items[item_idx].attr[attr_idx].type) { switch ( m_items[item_idx].attr[attr_idx].type) {
case pwr_eType_Float32: case pwr_eType_Float32:
if ( fabsf ( *(pwr_tFloat32 *)buf - *(pwr_tFloat32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tFloat32))) ||
(fabsf ( *(pwr_tFloat32 *)buf - *(pwr_tFloat32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -875,7 +876,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -875,7 +876,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
} }
break; break;
case pwr_eType_Float64: case pwr_eType_Float64:
if ( fabsf ( *(pwr_tFloat64 *)buf - *(pwr_tFloat64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tFloat64))) ||
(fabsf ( *(pwr_tFloat64 *)buf - *(pwr_tFloat64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -884,7 +886,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -884,7 +886,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
} }
break; break;
case pwr_eType_Int64: case pwr_eType_Int64:
if ( fabsf ( *(pwr_tInt64 *)buf - *(pwr_tInt64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt64))) ||
(fabsf ( *(pwr_tInt64 *)buf - *(pwr_tInt64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -893,7 +896,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -893,7 +896,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
} }
break; break;
case pwr_eType_Int32: case pwr_eType_Int32:
if ( fabsf ( *(pwr_tInt32 *)buf - *(pwr_tInt32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt32))) ||
(fabsf ( *(pwr_tInt32 *)buf - *(pwr_tInt32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -902,7 +906,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -902,7 +906,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
} }
break; break;
case pwr_eType_Int16: case pwr_eType_Int16:
if ( fabsf ( *(pwr_tInt16 *)buf - *(pwr_tInt16 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt16))) ||
(fabsf ( *(pwr_tInt16 *)buf - *(pwr_tInt16 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -912,7 +917,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -912,7 +917,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
break; break;
case pwr_eType_Int8: case pwr_eType_Int8:
case pwr_eType_Char: case pwr_eType_Char:
if ( fabsf ( *(pwr_tInt8 *)buf - *(pwr_tInt8 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt8))) ||
(fabsf ( *(pwr_tInt8 *)buf - *(pwr_tInt8 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -921,7 +927,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -921,7 +927,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
} }
break; break;
case pwr_eType_UInt64: case pwr_eType_UInt64:
if ( fabsf ( *(pwr_tUInt64 *)buf - *(pwr_tUInt64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt64))) ||
(fabsf ( *(pwr_tUInt64 *)buf - *(pwr_tUInt64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -931,7 +938,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -931,7 +938,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
break; break;
case pwr_eType_UInt32: case pwr_eType_UInt32:
case pwr_eType_Boolean: case pwr_eType_Boolean:
if ( fabsf ( *(pwr_tUInt32 *)buf - *(pwr_tUInt32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt32))) ||
(fabsf ( *(pwr_tUInt32 *)buf - *(pwr_tUInt32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -940,7 +948,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -940,7 +948,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
} }
break; break;
case pwr_eType_UInt16: case pwr_eType_UInt16:
if ( fabsf ( *(pwr_tUInt16 *)buf - *(pwr_tUInt16 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt16))) ||
(fabsf ( *(pwr_tUInt16 *)buf - *(pwr_tUInt16 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -949,7 +958,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -949,7 +958,8 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
} }
break; break;
case pwr_eType_UInt8: case pwr_eType_UInt8:
if ( fabsf ( *(pwr_tUInt8 *)buf - *(pwr_tUInt8 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt8))) ||
(fabsf ( *(pwr_tUInt8 *)buf - *(pwr_tUInt8 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
update_time_only = 1; update_time_only = 1;
} }
else { else {
...@@ -957,6 +967,15 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -957,6 +967,15 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
*(pwr_tUInt8 *)m_items[item_idx].old_value = *(pwr_tUInt8 *)buf; *(pwr_tUInt8 *)m_items[item_idx].old_value = *(pwr_tUInt8 *)buf;
} }
break; break;
case pwr_eType_String:
if ( !strncmp( (char *)buf, (char *)m_items[item_idx].old_value, m_items[item_idx].value_size)) {
update_time_only = 1;
}
else {
m_items[item_idx].deadband_active = 0;
strncpy( (char *)m_items[item_idx].old_value, (char *)buf, m_items[item_idx].value_size);
}
break;
default: ; default: ;
} }
} }
...@@ -964,11 +983,93 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx, ...@@ -964,11 +983,93 @@ int sev_dbms::store_value( pwr_tStatus *sts, int item_idx, int attr_idx,
// Compare current value to old value // Compare current value to old value
switch ( m_items[item_idx].attr[attr_idx].type) { switch ( m_items[item_idx].attr[attr_idx].type) {
case pwr_eType_Float32: case pwr_eType_Float32:
if ( fabsf ( *(pwr_tFloat32 *)buf - *(pwr_tFloat32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband) { if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tFloat32))) ||
(fabsf ( *(pwr_tFloat32 *)buf - *(pwr_tFloat32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tFloat32 *)m_items[item_idx].old_value = *(pwr_tFloat32 *)buf;
break;
case pwr_eType_Float64:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tFloat64))) ||
(fabsf ( *(pwr_tFloat64 *)buf - *(pwr_tFloat64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tFloat64 *)m_items[item_idx].old_value = *(pwr_tFloat64 *)buf;
break;
case pwr_eType_Int64:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt64))) ||
(fabsf ( *(pwr_tInt64 *)buf - *(pwr_tInt64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tInt64 *)m_items[item_idx].old_value = *(pwr_tInt64 *)buf;
break;
case pwr_eType_Int32:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt32))) ||
(fabsf ( *(pwr_tInt32 *)buf - *(pwr_tInt32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tInt32 *)m_items[item_idx].old_value = *(pwr_tInt32 *)buf;
break;
case pwr_eType_Int16:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt16))) ||
(fabsf ( *(pwr_tInt16 *)buf - *(pwr_tInt16 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tInt16 *)m_items[item_idx].old_value = *(pwr_tInt16 *)buf;
break;
case pwr_eType_Int8:
case pwr_eType_Char:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tInt8))) ||
(fabsf ( *(pwr_tInt8 *)buf - *(pwr_tInt8 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tInt8 *)m_items[item_idx].old_value = *(pwr_tInt8 *)buf;
break;
case pwr_eType_UInt64:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt64))) ||
(fabsf ( *(pwr_tUInt64 *)buf - *(pwr_tUInt64 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tUInt64 *)m_items[item_idx].old_value = *(pwr_tUInt64 *)buf;
break;
case pwr_eType_UInt32:
case pwr_eType_Boolean:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt32))) ||
(fabsf ( *(pwr_tUInt32 *)buf - *(pwr_tUInt32 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tUInt32 *)m_items[item_idx].old_value = *(pwr_tUInt32 *)buf;
break;
case pwr_eType_UInt16:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt16))) ||
(fabsf ( *(pwr_tUInt16 *)buf - *(pwr_tUInt16 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tUInt16 *)m_items[item_idx].old_value = *(pwr_tUInt16 *)buf;
break;
case pwr_eType_UInt8:
if ( (m_items[item_idx].deadband == 0 && !memcmp( buf, m_items[item_idx].old_value, sizeof(pwr_tUInt8))) ||
(fabsf ( *(pwr_tUInt8 *)buf - *(pwr_tUInt8 *)m_items[item_idx].old_value) < m_items[item_idx].deadband)) {
m_items[item_idx].deadband_active = 1;
set_jump = 1;
}
*(pwr_tUInt8 *)m_items[item_idx].old_value = *(pwr_tUInt8 *)buf;
break;
case pwr_eType_String:
if ( !strncmp( (char *)buf, (char *)m_items[item_idx].old_value, m_items[item_idx].value_size)) {
m_items[item_idx].deadband_active = 1; m_items[item_idx].deadband_active = 1;
set_jump = 1; set_jump = 1;
} }
*(pwr_tFloat32 *)m_items[item_idx].old_value = *(pwr_tFloat32 *)buf; strncpy( (char *)m_items[item_idx].old_value, (char *)buf, m_items[item_idx].value_size);
break; break;
default: ; default: ;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7