Send at least four S88 data octets per packets if possible

[model-railway-devices.git] / arducontrol / monitor.c

diff --git a/arducontrol/monitor.c b/arducontrol/monitor.c
index 679c62a1b2e1bd4617d6da240a7ad0fb53673bf3..d8f3dadded7c44b73a3f449985380e04b1f29f0f 100644 (file)
--- a/arducontrol/monitor.c
+++ b/arducontrol/monitor.c
@@ -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))
        {
@@ -45,8 +45,7 @@ void monitor_check()
                                if(!overcurrent_sent)
                                {
                                        overcurrent_sent = 1;
-                                       serial_write(0xFE);
-                                       serial_write(OVERCURRENT);
+                                       interface_send1(OVERCURRENT);
                                }
                        }
                        else
@@ -66,18 +65,20 @@ 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)
        {
+               uint8_t reply[3];
+
                if(cmd_length!=1)
                        return LENGTH_ERROR;
 
-               serial_write(0xFC);
-               serial_write(TRACK_CURRENT);
                uint16_t value = track_current_milliamps();
-               serial_write(value>>8);
-               serial_write(value);
+               reply[0] = TRACK_CURRENT;
+               reply[1] = value>>8;
+               reply[2] = value;
+               interface_send(reply, sizeof(reply));
        }
        else if(cmd_buf[0]==SET_OVERCURRENT_LIMIT)
        {
@@ -95,14 +96,16 @@ uint8_t monitor_command()
        }
        else if(cmd_buf[0]==READ_INPUT_VOLTAGE)
        {
+               uint8_t reply[3];
+
                if(cmd_length!=1)
                        return LENGTH_ERROR;
 
-               serial_write(0xFC);
-               serial_write(INPUT_VOLTAGE);
                uint16_t value = input_voltage_millivolts();
-               serial_write(value>>8);
-               serial_write(value);
+               reply[0] = INPUT_VOLTAGE;
+               reply[1] = value>>8;
+               reply[2] = value;
+               interface_send(reply, sizeof(reply));
        }
        else
                return INVALID_COMMAND;
@@ -110,7 +113,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 +130,7 @@ uint16_t track_current_milliamps()
        }
 }
 
-uint16_t input_voltage_millivolts()
+uint16_t input_voltage_millivolts(void)
 {
        uint16_t value = input_voltage_sum;