mirror
/
SP8EBC-ParaTNC
kopia lustrzana https://github.com/SP8EBC/ParaTNC
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Changes in modbus-rtu quality factors and getters

pull/2/head
Mateusz Lubecki 2020-10-25 21:21:25 +01:00
rodzic 61d04d0710
commit 4c42099847
5 zmienionych plików z 191 dodań i 54 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
src/wx_handler.c
Wyświetl plik

@ -299,19 +299,19 @@ void wx_pool_anemometer(void) {
rte_wx_max_windspeed = umb_get_windgusts();
#else
#ifdef _MODBUS_RTU
#if defined(_MODBUS_RTU) && !defined(_RTU_SLAVE_FULL_WIND_DATA)
// get the value from modbus registers
modbus_retval = rtu_get_wind_speed(&scaled_windspeed);
// check if this value has been processed w/o errors
if (modbus_retval == MODBUS_RET_OK || modbus_retval == MODBUS_RET_DEGRADED) {
if (modbus_retval == MODBUS_RET_OK) {
// if yes continue to further processing
modbus_retval = rtu_get_wind_direction(&rte_wx_winddirection_last);
}
// the second IF to check if the return value was the same for wind direction
if (modbus_retval != MODBUS_RET_OK && modbus_retval != MODBUS_RET_DEGRADED) {
if (modbus_retval == MODBUS_RET_OK || modbus_retval == MODBUS_RET_DEGRADED) {
// if the value is not available (like modbus is not configured as a source
// for wind data) get the value from internal sensors..
#ifdef _INTERNAL_AS_BACKUP
@ -319,8 +319,21 @@ void wx_pool_anemometer(void) {
scaled_windspeed = analog_anemometer_get_ms_from_pulse(rte_wx_windspeed_pulses);
#endif
}
#elif defined(_MODBUS_RTU) && defined(_RTU_SLAVE_FULL_WIND_DATA)
// get the value from modbus registers
modbus_retval = rtu_get_wind_direction(&rte_wx_average_winddirection);
// check if this value has been processed w/o errors
if (modbus_retval == MODBUS_RET_OK || modbus_retval == MODBUS_RET_DEGRADED) {
// if yes continue to further processing
modbus_retval = rtu_get_wind_gusts(&rte_wx_max_windspeed);
modbus_retval = rtu_get_wind_speed(&rte_wx_winddirection_last);
}
#endif
#ifndef _RTU_SLAVE_FULL_WIND_DATA
// check how many times before the pool function was called
if (wx_wind_pool_call_counter < WIND_AVERAGE_LEN) {
// if it was called less time than a length of buffers, the average length
@ -396,6 +409,8 @@ void wx_pool_anemometer(void) {
if (rte_wx_average_winddirection < 0)
rte_wx_average_winddirection += 360;
#endif
#if defined (_MODBUS_RTU)
if (modbus_retval == MODBUS_RET_OK) {
rte_wx_wind_qf = AN_WIND_QF_FULL;
@ -403,6 +418,9 @@ void wx_pool_anemometer(void) {
else if (modbus_retval == MODBUS_RET_DEGRADED) {
rte_wx_wind_qf = AN_WIND_QF_DEGRADED;
}
else if (modbus_retval == MODBUS_RET_NOT_AVALIABLE) {
rte_wx_wind_qf = AN_WIND_QF_NOT_AVALIABLE;
}
else {
#ifdef _INTERNAL_AS_BACKUP
rte_wx_wind_qf = analog_anemometer_get_qf();

2
system/include/modbus_rtu/rtu_configuration.h
Wyświetl plik

@ -17,7 +17,7 @@
#define RTU_NUMBER_OF_ERRORS_TO_TRIG_STATUS 24
#define RTU_POOL_QUEUE_LENGHT 4
#define RTU_POOL_QUEUE_LENGHT 6
#define MODBUS_RTU_MAX_REGISTERS_AT_ONCE 6 // according to RTU standard 125

1
system/include/modbus_rtu/rtu_getters.h
Wyświetl plik

@ -14,6 +14,7 @@ int32_t rtu_get_temperature(float* out);
int32_t rtu_get_pressure(float* out);
int32_t rtu_get_wind_direction(uint16_t* out);
int32_t rtu_get_wind_speed(uint16_t* out);
int32_t rtu_get_wind_gusts(uint16_t* out);
int32_t rtu_get_humidity(int8_t* out);
#endif /* INCLUDE_MODBUS_RTU_RTU_GETTERS_H_ */

216
system/src/modbus_rtu/rtu_getters.c
Wyświetl plik

@ -86,20 +86,25 @@ int32_t rtu_get_temperature(float* out) {
// copy the raw value from modbus register data
raw_register_value = source->registers_values[0];
// rescale the raw value to target value in degrees C
*out = (
scaling_a * (float)raw_register_value * (float)raw_register_value +
scaling_b * (float)raw_register_value +
scaling_c
) /
scaling_d;
// check when the value has been updated
if (main_get_master_time() - last_update_timestam > RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
retval = MODBUS_RET_NOT_AVALIABLE;
}
else {
retval = MODBUS_RET_OK;
if (main_get_master_time() - rte_wx_last_modbus_rx_error_timestamp < RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
}
else {
retval = MODBUS_RET_OK;
}
// rescale the raw value to target value in degrees C
*out = (
scaling_a * (float)raw_register_value * (float)raw_register_value +
scaling_b * (float)raw_register_value +
scaling_c
) /
scaling_d;
}
}
@ -176,20 +181,25 @@ int32_t rtu_get_pressure(float* out) {
// copy the raw value from modbus register data
raw_register_value = source->registers_values[0];
// rescale the raw value to target value in degrees C
*out = (
scaling_a * (float)raw_register_value * (float)raw_register_value +
scaling_b * (float)raw_register_value +
scaling_c
) /
scaling_d;
// check when the value has been updated
if (main_get_master_time() - last_update_timestam > RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
retval = MODBUS_RET_NOT_AVALIABLE;
}
else {
retval = MODBUS_RET_OK;
if (main_get_master_time() - rte_wx_last_modbus_rx_error_timestamp < RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
}
else {
retval = MODBUS_RET_OK;
}
// rescale the raw value to target value in degrees C
*out = (
scaling_a * (float)raw_register_value * (float)raw_register_value +
scaling_b * (float)raw_register_value +
scaling_c
) /
scaling_d;
}
}
@ -265,20 +275,25 @@ int32_t rtu_get_wind_direction(uint16_t* out) {
// copy the raw value from modbus register data
raw_register_value = source->registers_values[0];
// rescale the raw value to target value in degrees C
*out = (uint16_t)(
scaling_a * (uint16_t)raw_register_value * (uint16_t)raw_register_value +
scaling_b * (uint16_t)raw_register_value +
scaling_c
) /
scaling_d;
// check when the value has been updated
if (main_get_master_time() - last_update_timestam > RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
retval = MODBUS_RET_NOT_AVALIABLE;
}
else {
retval = MODBUS_RET_OK;
if (main_get_master_time() - rte_wx_last_modbus_rx_error_timestamp < RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
}
else {
retval = MODBUS_RET_OK;
}
// rescale the raw value to target value in degrees C
*out = (uint16_t)(
scaling_a * (uint16_t)raw_register_value * (uint16_t)raw_register_value +
scaling_b * (uint16_t)raw_register_value +
scaling_c
) /
scaling_d;
}
}
@ -354,20 +369,118 @@ int32_t rtu_get_wind_speed(uint16_t* out) {
// copy the raw value from modbus register data
raw_register_value = source->registers_values[0];
// rescale the raw value to target value in .1m/s incremenets
*out = (uint16_t) (10 * (
scaling_a * (uint16_t)raw_register_value * (uint16_t)raw_register_value +
scaling_b * (uint16_t)raw_register_value +
scaling_c
) /
scaling_d);
// check when the value has been updated
if (main_get_master_time() - last_update_timestam > RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_NOT_AVALIABLE;
}
else {
if (main_get_master_time() - rte_wx_last_modbus_rx_error_timestamp < RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
}
else {
retval = MODBUS_RET_OK;
}
// rescale the raw value to target value in .1m/s incremenets
*out = (uint16_t) (10 * (
scaling_a * (uint16_t)raw_register_value * (uint16_t)raw_register_value +
scaling_b * (uint16_t)raw_register_value +
scaling_c
) /
scaling_d);
}
}
return retval;
}
int32_t rtu_get_wind_gusts(uint16_t* out) {
int32_t retval = MODBUS_RET_UNINITIALIZED;
rtu_register_data_t* source = 0;
uint16_t raw_register_value = 0;
uint16_t scaling_a, scaling_b, scaling_c, scaling_d;
// the timestamp of last update of the register value
uint32_t last_update_timestam = 0;
#ifdef _MODBUS_RTU
#ifdef _RTU_SLAVE_WIND_GUSTS_SOURCE
#if (_RTU_SLAVE_WIND_GUSTS_SOURCE == 1)
source = &RTU_GETTERS_F1_NAME;
scaling_a = _RTU_SLAVE_SCALING_A_1;
scaling_b = _RTU_SLAVE_SCALING_B_1;
scaling_c = _RTU_SLAVE_SCALING_C_1;
scaling_d = _RTU_SLAVE_SCALING_D_1;
last_update_timestam = rte_wx_rtu_pool_queue.last_call_to_function[0];
#elif (_RTU_SLAVE_WIND_GUSTS_SOURCE == 2)
source = &RTU_GETTERS_F2_NAME;
scaling_a = _RTU_SLAVE_SCALING_A_2;
scaling_b = _RTU_SLAVE_SCALING_B_2;
scaling_c = _RTU_SLAVE_SCALING_C_2;
scaling_d = _RTU_SLAVE_SCALING_D_2;
last_update_timestam = rte_wx_rtu_pool_queue.last_call_to_function[1];
#elif (_RTU_SLAVE_WIND_GUSTS_SOURCE == 3)
source = &RTU_GETTERS_F3_NAME;
scaling_a = _RTU_SLAVE_SCALING_A_3;
scaling_b = _RTU_SLAVE_SCALING_B_3;
scaling_c = _RTU_SLAVE_SCALING_C_3;
scaling_d = _RTU_SLAVE_SCALING_D_3;
last_update_timestam = rte_wx_rtu_pool_queue.last_call_to_function[2];
#elif (_RTU_SLAVE_WIND_GUSTS_SOURCE == 4)
source = &RTU_GETTERS_F4_NAME;
scaling_a = _RTU_SLAVE_SCALING_A_4;
scaling_b = _RTU_SLAVE_SCALING_B_4;
scaling_c = _RTU_SLAVE_SCALING_C_4;
scaling_d = _RTU_SLAVE_SCALING_D_4;
last_update_timestam = rte_wx_rtu_pool_queue.last_call_to_function[3];
#elif (_RTU_SLAVE_WIND_GUSTS_SOURCE == 5)
source = &RTU_GETTERS_F5_NAME;
scaling_a = _RTU_SLAVE_SCALING_A_5;
scaling_b = _RTU_SLAVE_SCALING_B_5;
scaling_c = _RTU_SLAVE_SCALING_C_5;
scaling_d = _RTU_SLAVE_SCALING_D_5;
last_update_timestam = rte_wx_rtu_pool_queue.last_call_to_function[4];
#elif (_RTU_SLAVE_WIND_GUSTS_SOURCE == 6)
source = &RTU_GETTERS_F6_NAME;
scaling_a = _RTU_SLAVE_SCALING_A_6;
scaling_b = _RTU_SLAVE_SCALING_B_6;
scaling_c = _RTU_SLAVE_SCALING_C_6;
scaling_d = _RTU_SLAVE_SCALING_D_6;
last_update_timestam = rte_wx_rtu_pool_queue.last_call_to_function[5];
#else
#error "Wrong Modbus Configuration"
#endif
#else
retval = MODBUS_RET_NOT_AVALIABLE;
#endif
#endif
if (retval == MODBUS_RET_UNINITIALIZED && source != 0) {
// copy the raw value from modbus register data
raw_register_value = source->registers_values[0];
// check when the value has been updated
if (main_get_master_time() - last_update_timestam > RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
retval = MODBUS_RET_NOT_AVALIABLE;
}
else {
retval = MODBUS_RET_OK;
if (main_get_master_time() - rte_wx_last_modbus_rx_error_timestamp < RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
}
else {
retval = MODBUS_RET_OK;
}
// rescale the raw value to target value in .1m/s incremenets
*out = (uint16_t) (10 * (
scaling_a * (uint16_t)raw_register_value * (uint16_t)raw_register_value +
scaling_b * (uint16_t)raw_register_value +
scaling_c
) /
scaling_d);
}
}
@ -429,20 +542,25 @@ int32_t rtu_get_humidity(int8_t* out) {
// copy the raw value from modbus register data
raw_register_value = source->registers_values[0];
// rescale the raw value to target value in percents
*out = (int8_t) (
scaling_a * (uint16_t)raw_register_value * (uint16_t)raw_register_value +
scaling_b * (uint16_t)raw_register_value +
scaling_c
/
scaling_d);
// check when the value has been updated
if (main_get_master_time() - last_update_timestam > RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
retval = MODBUS_RET_NOT_AVALIABLE;
}
else {
retval = MODBUS_RET_OK;
if (main_get_master_time() - rte_wx_last_modbus_rx_error_timestamp < RTU_MAXIMUM_VALUE_AGE) {
retval = MODBUS_RET_DEGRADED;
}
else {
retval = MODBUS_RET_OK;
}
// rescale the raw value to target value in percents
*out = (int8_t) (
scaling_a * (uint16_t)raw_register_value * (uint16_t)raw_register_value +
scaling_b * (uint16_t)raw_register_value +
scaling_c
/
scaling_d);
}
}

2
system/src/modbus_rtu/rtu_serial_io.c
Wyświetl plik

@ -216,7 +216,7 @@ int32_t rtu_serial_pool(rtu_pool_queue_t* queue, srl_context_t* serial_context)
if (queue->it >= RTU_POOL_QUEUE_LENGHT) {
queue->it = 0;
// all queued modbus function has been queued
// all queued modbus functions have been serviced
rtu_pool = RTU_POOL_STOP;
}