diff --git a/src/board/arduino/mega2560/board.mk b/src/board/arduino/mega2560/board.mk index b846db3..75a2091 100644 --- a/src/board/arduino/mega2560/board.mk +++ b/src/board/arduino/mega2560/board.mk @@ -1,9 +1,11 @@ EC=atmega2560 PORT=$(wildcard /dev/ttyACM*) +CONSOLE_BAUD=1000000 +CFLAGS+=-D__CONSOLE_BAUD__=$(CONSOLE_BAUD) console: - sudo tio -b 9600 $(PORT) + sudo tio -b $(CONSOLE_BAUD) $(PORT) flash: $(BUILD)/ec.ihx sudo avrdude -v -v -p $(EC) -c wiring -P $(PORT) -b 115200 -D -U flash:w:$<:i diff --git a/src/board/arduino/mega2560/main.c b/src/board/arduino/mega2560/main.c index fa6f7c4..feb52f2 100644 --- a/src/board/arduino/mega2560/main.c +++ b/src/board/arduino/mega2560/main.c @@ -4,7 +4,7 @@ #include void init(void) { - uart_stdio_init(0, 9600); + uart_stdio_init(0, __CONSOLE_BAUD__); } struct Gpio LED = GPIO(B, 7); diff --git a/src/board/arduino/micro/board.mk b/src/board/arduino/micro/board.mk index bf8c208..1add97b 100644 --- a/src/board/arduino/micro/board.mk +++ b/src/board/arduino/micro/board.mk @@ -1,9 +1,11 @@ EC=atmega32u4 PORT=$(wildcard /dev/ttyACM*) +CONSOLE_BAUD=1000000 +CFLAGS+=-D__CONSOLE_BAUD__=$(CONSOLE_BAUD) console: - sudo tio -b 9600 $(PORT) + sudo tio -b $(CONSOLE_BAUD) $(PORT) flash: $(BUILD)/ec.ihx sudo avrdude -v -v -p $(EC) -c avr109 -P $(PORT) -b 115200 -D -U flash:w:$<:i diff --git a/src/board/arduino/micro/main.c b/src/board/arduino/micro/main.c index 8b47ffa..4cb9490 100644 --- a/src/board/arduino/micro/main.c +++ b/src/board/arduino/micro/main.c @@ -4,7 +4,7 @@ #include void init(void) { - uart_stdio_init(0, 9600); + uart_stdio_init(0, __CONSOLE_BAUD__); } struct Gpio LED = GPIO(C, 7); diff --git a/src/board/arduino/uno/board.mk b/src/board/arduino/uno/board.mk index 2916066..95c04e3 100644 --- a/src/board/arduino/uno/board.mk +++ b/src/board/arduino/uno/board.mk @@ -1,9 +1,11 @@ EC=atmega328p PORT=$(wildcard /dev/ttyACM*) +CONSOLE_BAUD=1000000 +CFLAGS+=-D__CONSOLE_BAUD__=$(CONSOLE_BAUD) console: - sudo tio -b 9600 $(PORT) + sudo tio -b $(CONSOLE_BAUD) $(PORT) flash: $(BUILD)/ec.ihx sudo avrdude -v -v -p $(EC) -c arduino -P $(PORT) -b 115200 -D -U flash:w:$<:i diff --git a/src/board/arduino/uno/main.c b/src/board/arduino/uno/main.c index 434b81d..c5c2533 100644 --- a/src/board/arduino/uno/main.c +++ b/src/board/arduino/uno/main.c @@ -4,7 +4,7 @@ #include void init(void) { - uart_stdio_init(0, 9600); + uart_stdio_init(0, __CONSOLE_BAUD__); } struct Gpio LED = GPIO(B, 5); diff --git a/src/common/common.mk b/src/common/common.mk new file mode 100644 index 0000000..e69de29 diff --git a/src/common/include/common/macro.h b/src/common/include/common/macro.h new file mode 100644 index 0000000..99f2f84 --- /dev/null +++ b/src/common/include/common/macro.h @@ -0,0 +1,7 @@ +#ifndef _COMMON_MACRO_H +#define _COMMON_MACRO_H + +#define xstr(s) str(s) +#define str(s) #s + +#endif // _COMMON_MACRO_H