#include <parse.h>
#include <rdline.h>
#include <uart.h>
-#include <clock_time.h>
#include "callout.h"
#include "main.h"
#include "cmdline.h"
-#include "DualVirtualSerial.h"
+extern const parse_ctx_t PROGMEM main_ctx[];
-/******** See in commands.c for the list of commands. */
-extern parse_pgm_ctx_t main_ctx[];
-
-int usbserial1_dev_send(char c, FILE* f)
+int cmdline_dev_send(char c, FILE* f)
{
- CDC_Device_SendByte(&VirtualSerial1_CDC_Interface, (uint8_t)c);
+ (void)f;
+ uart_send(CMDLINE_UART, c);
return 0;
}
-int usbserial1_dev_recv(FILE* f)
+int cmdline_dev_recv(FILE* f)
{
int16_t c;
- /* non-blocking ! */
- c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+
+ (void)f;
+ c = uart_recv_nowait(CMDLINE_UART);
if (c < 0)
return _FDEV_EOF;
}
-int usbserial2_dev_send(char c, FILE* f)
+int xbee_dev_send(char c, FILE* f)
{
- CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, (uint8_t)c);
+ (void)f;
+ uart_send(XBEE_UART, c);
return 0;
}
-int usbserial2_dev_recv(FILE* f)
+int xbee_dev_recv(FILE* f)
{
int16_t c;
- /* non-blocking ! */
- c = CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface);
+ (void)f;
+ c = uart_recv_nowait(XBEE_UART);
if (c < 0)
return _FDEV_EOF;
return c;
}
-
-static void
-valid_buffer(const char *buf, uint8_t size)
+void cmdline_valid_buffer(const char *buf, uint8_t size)
{
int8_t ret;
+ PGM_P ctx = (PGM_P)main_ctx;
- ret = parse(main_ctx, buf);
+ (void)size;
+ ret = parse(ctx, buf);
if (ret == PARSE_AMBIGUOUS)
printf_P(PSTR("Ambiguous command\r\n"));
else if (ret == PARSE_NOMATCH)
complete_buffer(const char *buf, char *dstbuf, uint8_t dstsize,
int16_t *state)
{
- return complete(main_ctx, buf, state, dstbuf, dstsize);
+ PGM_P ctx = (PGM_P)main_ctx;
+ return complete(ctx, buf, state, dstbuf, dstsize);
}
-static void write_char(char c)
+void cmdline_write_char(char c)
{
- usbserial1_dev_send(c, NULL);
+ cmdline_dev_send(c, NULL);
}
void cmdline_init(void)
{
- rdline_init(&xbeeboard.rdl, write_char, valid_buffer, complete_buffer);
+ rdline_init(&xbeeboard.rdl, cmdline_write_char, cmdline_valid_buffer, complete_buffer);
snprintf_P(xbeeboard.prompt, sizeof(xbeeboard.prompt), PSTR("mainboard > "));
}
i++;
else if ( !(i == 1 && c == 'p') )
i = 0;
- if (i == 3)
- bootloader();
+ if (i == 3) {
+ //bootloader();
+ reset();
+ }
}
/* log function, add a command to configure
* it dynamically */
void mylog(struct error * e, ...)
{
- va_list ap;
#ifndef HOST_VERSION
u16 stream_flags = stdout->flags;
#endif
- uint8_t i;
- time_h tv;
+ va_list ap;
+ uint8_t i, flags;
+ uint32_t ms;
if (e->severity > ERROR_SEVERITY_ERROR) {
if (xbeeboard.log_level < e->severity)
}
va_start(ap, e);
- tv = time_get_time();
- printf_P(PSTR("%d.%.3d: "), (int)tv.s, (int)(tv.us/1000UL));
+ IRQ_LOCK(flags);
+ ms = global_ms;
+ IRQ_UNLOCK(flags);
+
+ printf_P(PSTR("%d.%.3d: "), (int)(ms/1000UL), (int)(ms%1000UL));
vfprintf_P(stdout, e->text, ap);
printf_P(PSTR("\r\n"));
int8_t ret, same = 0;
int16_t c;
- c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+ c = cmdline_dev_recv(NULL);
if (c < 0)
return -1;