X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=arducontrol%2Fmonitor.c;h=4adc9377ee5da54a78c5aba88aa3497302f8cd94;hb=de977f33ed5c55b2b45c8dcae0c0687bd0cbf1e6;hp=679c62a1b2e1bd4617d6da240a7ad0fb53673bf3;hpb=0ea90da32943b1fae28a3e872f0a9a41b75de4ae;p=model-railway-devices.git diff --git a/arducontrol/monitor.c b/arducontrol/monitor.c index 679c62a..4adc937 100644 --- a/arducontrol/monitor.c +++ b/arducontrol/monitor.c @@ -1,5 +1,5 @@ #include "adc.h" -#include "interface.h" +#include "commands.h" #include "monitor.h" #include "output.h" #include "serial.h" @@ -17,15 +17,15 @@ volatile uint16_t input_voltage_sum = 0; volatile uint8_t adc_state = 0; volatile uint16_t adc_value = 0; -uint16_t track_current_milliamps(); -uint16_t input_voltage_millivolts(); +uint16_t track_current_milliamps(void); +uint16_t input_voltage_millivolts(void); -void monitor_init() +void monitor_init(void) { adc_init(); } -void monitor_check() +void monitor_check(void) { if(!(adc_state&1)) { @@ -66,7 +66,7 @@ void monitor_check() } } -uint8_t monitor_command() +uint8_t monitor_command(const uint8_t *cmd_buf, uint8_t cmd_length) { if(cmd_buf[0]==READ_TRACK_CURRENT) { @@ -110,7 +110,7 @@ uint8_t monitor_command() return COMMAND_OK; } -uint16_t track_current_milliamps() +uint16_t track_current_milliamps(void) { uint16_t value = track_current_sum; @@ -127,7 +127,7 @@ uint16_t track_current_milliamps() } } -uint16_t input_voltage_millivolts() +uint16_t input_voltage_millivolts(void) { uint16_t value = input_voltage_sum;