diff options
Diffstat (limited to 'src/avr')
| -rw-r--r-- | src/avr/serial.c | 6 | ||||
| -rw-r--r-- | src/avr/usbserial.c | 19 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/avr/serial.c b/src/avr/serial.c index 8b9dd14a..5fcf54d6 100644 --- a/src/avr/serial.c +++ b/src/avr/serial.c @@ -1,6 +1,6 @@ // AVR serial port code. // -// Copyright (C) 2016 Kevin O'Connor <kevin@koconnor.net> +// Copyright (C) 2016,2017 Kevin O'Connor <kevin@koconnor.net> // // This file may be distributed under the terms of the GNU GPLv3 license. @@ -8,7 +8,7 @@ #include <string.h> // memmove #include "autoconf.h" // CONFIG_SERIAL_BAUD #include "board/io.h" // readb -#include "board/misc.h" // console_get_input +#include "board/misc.h" // console_sendf #include "command.h" // DECL_CONSTANT #include "irq.h" // irq_save #include "pgm.h" // READP @@ -161,7 +161,7 @@ console_sendf(const struct command_encoder *ce, va_list args) // Generate message char *buf = &transmit_buf[tmax]; - uint8_t msglen = command_encodef(buf, max_size, ce, args); + uint8_t msglen = command_encodef(buf, ce, args); command_add_frame(buf, msglen); // Start message transmit diff --git a/src/avr/usbserial.c b/src/avr/usbserial.c index cc7bb12c..ac60e087 100644 --- a/src/avr/usbserial.c +++ b/src/avr/usbserial.c @@ -1,20 +1,17 @@ // Wrappers for AVR usb serial. // -// Copyright (C) 2016 Kevin O'Connor <kevin@koconnor.net> +// Copyright (C) 2016,2017 Kevin O'Connor <kevin@koconnor.net> // // This file may be distributed under the terms of the GNU GPLv3 license. -#include <avr/interrupt.h> // USART0_RX_vect #include <string.h> // memmove #include "../lib/pjrc_usb_serial/usb_serial.h" +#include "board/misc.h" // console_sendf #include "command.h" // command_dispatch -#include "pgm.h" // READP #include "sched.h" // DECL_INIT -#define USBSERIAL_BUFFER_SIZE 64 -static char receive_buf[USBSERIAL_BUFFER_SIZE]; +static char receive_buf[MESSAGE_MAX]; static uint8_t receive_pos; -static char transmit_buf[USBSERIAL_BUFFER_SIZE]; void usbserial_init(void) @@ -68,13 +65,11 @@ void console_sendf(const struct command_encoder *ce, va_list args) { // Generate message - uint8_t max_size = READP(ce->max_size); - if (max_size > sizeof(transmit_buf)) - return; - uint8_t msglen = command_encodef(transmit_buf, max_size, ce, args); - command_add_frame(transmit_buf, msglen); + static char buf[MESSAGE_MAX]; + uint8_t msglen = command_encodef(buf, ce, args); + command_add_frame(buf, msglen); // Transmit message - usb_serial_write((void*)transmit_buf, msglen); + usb_serial_write((void*)buf, msglen); usb_serial_flush_output(); } |