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

compilation fixes 1

pull/2/head
Mateusz Lubecki 2020-10-09 22:08:08 +02:00
rodzic ccb9ec8431
commit f5e37034f0
3 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
Debug/makefile
Wyświetl plik

@ -91,6 +91,5 @@ clean:
secondary-outputs: $(SECONDARY_FLASH) $(SECONDARY_SIZE) secondary-outputs: $(SECONDARY_FLASH) $(SECONDARY_SIZE)
.PHONY: all clean dependents .PHONY: all clean dependents
.SECONDARY:
-include ../makefile.targets -include ../makefile.targets

3
src/rte_wx.c
Wyświetl plik

@ -97,10 +97,11 @@ void rte_wx_init(void) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
rte_wx_pressure_history[i] = 0.0f; rte_wx_pressure_history[i] = 0.0f;
} }
#ifdef _MODBUS_RTU
rte_wx_last_modbus_exception_timestamp = 0; rte_wx_last_modbus_exception_timestamp = 0;
rte_wx_last_modbus_rx_error_timestamp = 0; rte_wx_last_modbus_rx_error_timestamp = 0;
rte_wx_last_modbus_exception = RTU_EXCEPTION_OK; rte_wx_last_modbus_exception = RTU_EXCEPTION_OK;
#endif
} }
void rte_wx_update_last_measuremenet_timers(uint16_t parameter_type) { void rte_wx_update_last_measuremenet_timers(uint16_t parameter_type) {

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

@ -167,7 +167,7 @@ int32_t rtu_serial_init(rtu_pool_queue_t* queue) {
int32_t rtu_serial_pool(rtu_pool_queue_t* queue, srl_context_t* serial_context) { int32_t rtu_serial_pool(rtu_pool_queue_t* queue, srl_context_t* serial_context) {
int32_t retval = MODBUS_RET_UNINITIALIZED; int32_t retval = MODBUS_RET_UNINITIALIZED;
#ifdef _MODBUS_RTU
int32_t result = MODBUS_RET_UNINITIALIZED; int32_t result = MODBUS_RET_UNINITIALIZED;
uint8_t output_data_lenght = 0; uint8_t output_data_lenght = 0;
@ -361,7 +361,7 @@ int32_t rtu_serial_pool(rtu_pool_queue_t* queue, srl_context_t* serial_context)
break; break;
} }
} }
#endif
return retval; return retval;
} }