diff --git a/include/main.h b/include/main.h index 4219339..3214142 100644 --- a/include/main.h +++ b/include/main.h @@ -4,8 +4,8 @@ #include "aprs/ax25.h" #include "drivers/serial.h" -#define SW_VER "DF09" -#define SW_DATE "22112020" +#define SW_VER "DF10" +#define SW_DATE "28122020" #define SYSTICK_TICKS_PER_SECONDS 100 #define SYSTICK_TICKS_PERIOD 10 diff --git a/include/rte_rtu.h b/include/rte_rtu.h index a4413cf..95c40a8 100644 --- a/include/rte_rtu.h +++ b/include/rte_rtu.h @@ -18,6 +18,8 @@ #include "modbus_rtu/rtu_pool_queue_t.h" #endif +#include + extern uint8_t rte_rtu_number_of_serial_io_errors; extern uint16_t rte_rtu_number_of_successfull_serial_comm; diff --git a/system/include/modbus_rtu/rtu_configuration.h b/system/include/modbus_rtu/rtu_configuration.h index 433e30d..a40fc1d 100644 --- a/system/include/modbus_rtu/rtu_configuration.h +++ b/system/include/modbus_rtu/rtu_configuration.h @@ -8,6 +8,10 @@ #ifndef INCLUDE_MODBUS_RTU_RTU_CONFIGURATION_H_ #define INCLUDE_MODBUS_RTU_RTU_CONFIGURATION_H_ +#include "station_config.h" + +#ifdef _UMB_MASTER + #define RTU_GETTERS_F1_NAME rte_wx_modbus_rtu_f1 #define RTU_GETTERS_F2_NAME rte_wx_modbus_rtu_f2 #define RTU_GETTERS_F3_NAME rte_wx_modbus_rtu_f3 @@ -15,6 +19,8 @@ #define RTU_GETTERS_F5_NAME rte_wx_modbus_rtu_f5 #define RTU_GETTERS_F6_NAME rte_wx_modbus_rtu_f6 +#endif + #define RTU_NUMBER_OF_ERRORS_TO_TRIG_STATUS 32 #define RTU_POOL_QUEUE_LENGHT 6