aboutsummaryrefslogtreecommitdiffstats
path: root/src/avr/usbserial.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2017-06-16 13:57:11 -0400
committerKevin O'Connor <kevin@koconnor.net>2017-06-29 13:33:58 -0400
commit44f2a2a9521ee295acbe44cf0d2a5dedd179fd37 (patch)
tree6bbfa1dba60ab005667c8334cc8cfdf6fab90bea /src/avr/usbserial.c
parent292453d3060abf81e13aeb7bc7d76d3c3709da79 (diff)
downloadkutter-44f2a2a9521ee295acbe44cf0d2a5dedd179fd37.tar.gz
kutter-44f2a2a9521ee295acbe44cf0d2a5dedd179fd37.tar.xz
kutter-44f2a2a9521ee295acbe44cf0d2a5dedd179fd37.zip
command: Move low-level sendf transmission into board code
Export a new console_sendf() function from the board code instead of console_get_output() and console_push_output(). This enables more flexibility in how the board specific code produces output. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/avr/usbserial.c')
-rw-r--r--src/avr/usbserial.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/avr/usbserial.c b/src/avr/usbserial.c
index 78ef719e..7be94a67 100644
--- a/src/avr/usbserial.c
+++ b/src/avr/usbserial.c
@@ -7,6 +7,8 @@
#include <avr/interrupt.h> // USART0_RX_vect
#include <string.h> // memmove
#include "../lib/pjrc_usb_serial/usb_serial.h"
+#include "command.h" // command_dispatch
+#include "pgm.h" // READP
#include "sched.h" // DECL_INIT
#define USBSERIAL_BUFFER_SIZE 64
@@ -62,7 +64,7 @@ console_task(void)
DECL_TASK(console_task);
// Return an output buffer that the caller may fill with transmit messages
-char *
+static char *
console_get_output(uint8_t len)
{
if (len > sizeof(transmit_buf))
@@ -71,9 +73,22 @@ console_get_output(uint8_t len)
}
// Accept the given number of bytes added to the transmit buffer
-void
+static void
console_push_output(uint8_t len)
{
usb_serial_write((void*)transmit_buf, len);
usb_serial_flush_output();
}
+
+// Encode and transmit a "response" message
+void
+console_sendf(const struct command_encoder *ce, va_list args)
+{
+ uint8_t buf_len = READP(ce->max_size);
+ char *buf = console_get_output(buf_len);
+ if (!buf)
+ return;
+ uint8_t msglen = command_encodef(buf, buf_len, ce, args);
+ command_add_frame(buf, msglen);
+ console_push_output(msglen);
+}