diff --git a/webserver/core/lib/iec_std_lib.h b/webserver/core/lib/iec_std_lib.h index 5f685e4..d77a726 100755 --- a/webserver/core/lib/iec_std_lib.h +++ b/webserver/core/lib/iec_std_lib.h @@ -57,6 +57,7 @@ * Include type defs. */ #include "iec_types_all.h" +#include extern TIME __CURRENT_TIME; extern BOOL __DEBUG; diff --git a/webserver/core/main.cpp b/webserver/core/main.cpp index 17cbeaa..f897aa4 100644 --- a/webserver/core/main.cpp +++ b/webserver/core/main.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "iec_types.h" @@ -210,16 +211,16 @@ void RecordCycletimeLatency(long cycle_time, long sleep_latency) } // pointers to IO *array[const][const] from cpp to c and back again don't work as expected, so instead callbacks -u_int8_t *bool_input_call_back(int a, int b){ return bool_input[a][b]; } -u_int8_t *bool_output_call_back(int a, int b){ return bool_output[a][b]; } -u_int8_t *byte_input_call_back(int a){ return byte_input[a]; } -u_int8_t *byte_output_call_back(int a){ return byte_output[a]; } -u_int16_t *int_input_call_back(int a){ return int_input[a]; } -u_int16_t *int_output_call_back(int a){ return int_output[a]; } -u_int32_t *dint_input_call_back(int a){ return dint_input[a]; } -u_int32_t *dint_output_call_back(int a){ return dint_output[a]; } -u_int64_t *lint_input_call_back(int a){ return lint_input[a]; } -u_int64_t *lint_output_call_back(int a){ return lint_output[a]; } +uint8_t *bool_input_call_back(int a, int b){ return bool_input[a][b]; } +uint8_t *bool_output_call_back(int a, int b){ return bool_output[a][b]; } +uint8_t *byte_input_call_back(int a){ return byte_input[a]; } +uint8_t *byte_output_call_back(int a){ return byte_output[a]; } +uint16_t *int_input_call_back(int a){ return int_input[a]; } +uint16_t *int_output_call_back(int a){ return int_output[a]; } +uint32_t *dint_input_call_back(int a){ return dint_input[a]; } +uint32_t *dint_output_call_back(int a){ return dint_output[a]; } +uint64_t *lint_input_call_back(int a){ return lint_input[a]; } +uint64_t *lint_output_call_back(int a){ return lint_output[a]; } void logger_callback(char *msg){ log(msg);} int main(int argc,char **argv)