diff --git a/firmware/build/default/production/command.o b/firmware/build/default/production/command.o index a659817..01c82fb 100644 Binary files a/firmware/build/default/production/command.o and b/firmware/build/default/production/command.o differ diff --git a/firmware/build/default/production/main.o b/firmware/build/default/production/main.o index fbc48db..10212b3 100644 Binary files a/firmware/build/default/production/main.o and b/firmware/build/default/production/main.o differ diff --git a/firmware/build/default/production/main.o.d b/firmware/build/default/production/main.o.d index c485f7b..ebd40e8 100644 --- a/firmware/build/default/production/main.o.d +++ b/firmware/build/default/production/main.o.d @@ -15,10 +15,7 @@ build/default/production/main.o.d build/default/production/main.o: main.c \ /opt/microchip/xc8/v2.36/avr/avr/include/avr/lock.h \ /opt/microchip/xc8/v2.36/avr/avr/include/avr/interrupt.h \ /opt/microchip/xc8/v2.36/avr/avr/include/string.h constants.h command.h \ - usart.h /opt/microchip/xc8/v2.36/avr/avr/include/stdio.h \ - /opt/microchip/xc8/v2.36/avr/avr/include/util/delay.h \ - /opt/microchip/xc8/v2.36/avr/avr/include/util/delay_basic.h \ - /opt/microchip/xc8/v2.36/avr/avr/include/math.h + usart.h /opt/microchip/xc8/v2.36/avr/avr/include/stdio.h /opt/microchip/xc8/v2.36/avr/avr/include/avr/io.h: @@ -59,9 +56,3 @@ command.h: usart.h: /opt/microchip/xc8/v2.36/avr/avr/include/stdio.h: - -/opt/microchip/xc8/v2.36/avr/avr/include/util/delay.h: - -/opt/microchip/xc8/v2.36/avr/avr/include/util/delay_basic.h: - -/opt/microchip/xc8/v2.36/avr/avr/include/math.h: diff --git a/firmware/command.h b/firmware/command.h index 89b31e6..d8a0dde 100644 --- a/firmware/command.h +++ b/firmware/command.h @@ -4,7 +4,6 @@ #include #include -#define EOT 0x04 #define COMMAND_SIZE 5 #define COMMAND_MAX_NAME_LENGTH 20 diff --git a/firmware/constants.h b/firmware/constants.h index 0aae073..23d5655 100644 --- a/firmware/constants.h +++ b/firmware/constants.h @@ -4,6 +4,7 @@ #define F_CPU 4000000UL #define BAUD_RATE 9600 #define BUFFER_SIZE 20 +#define EOT 0x04 #endif /* CONSTANTS_H */ diff --git a/firmware/dist/default/production/firmware.production.elf b/firmware/dist/default/production/firmware.production.elf index 467b2a1..7aba377 100755 Binary files a/firmware/dist/default/production/firmware.production.elf and b/firmware/dist/default/production/firmware.production.elf differ diff --git a/firmware/dist/default/production/firmware.production.map b/firmware/dist/default/production/firmware.production.map index b9b7c44..e0416e3 100644 --- a/firmware/dist/default/production/firmware.production.map +++ b/firmware/dist/default/production/firmware.production.map @@ -431,12 +431,12 @@ END GROUP .debug_pubnames *(.debug_pubnames) -.debug_info 0x0000000000000000 0x4097 +.debug_info 0x0000000000000000 0x408e *(.debug_info .gnu.linkonce.wi.*) .debug_info 0x0000000000000000 0x2c24 /opt/microchip/mplabx/v6.00/packs/Microchip/AVR-Dx_DFP/1.10.124/xc8/avr/lib/avrxmega4/memx-const/mapped/crtavr128da48.o - .debug_info 0x0000000000002c24 0x828 build/default/production/main.o - .debug_info 0x000000000000344c 0x6cf build/default/production/usart.o - .debug_info 0x0000000000003b1b 0x57c build/default/production/command.o + .debug_info 0x0000000000002c24 0x81f build/default/production/main.o + .debug_info 0x0000000000003443 0x6cf build/default/production/usart.o + .debug_info 0x0000000000003b12 0x57c build/default/production/command.o .debug_abbrev 0x0000000000000000 0x2e21 *(.debug_abbrev) diff --git a/firmware/main.c b/firmware/main.c index 0423575..00ce4f0 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -4,7 +4,6 @@ #include "constants.h" #include "command.h" #include "usart.h" -#include char buffer[BUFFER_SIZE]; volatile uint8_t buff_idx = 0; diff --git a/firmware/nbproject/private/private.xml b/firmware/nbproject/private/private.xml index 6807a2b..a066363 100644 --- a/firmware/nbproject/private/private.xml +++ b/firmware/nbproject/private/private.xml @@ -2,6 +2,11 @@ - + + file:/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/main.c + file:/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/constants.h + file:/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/usart.h + file:/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/usart.c + diff --git a/firmware/usart.c b/firmware/usart.c index 9eb88e1..38905cd 100644 --- a/firmware/usart.c +++ b/firmware/usart.c @@ -11,7 +11,7 @@ void USART1_Initialize(void) { PORTC.DIRSET = PIN0_bm; PORTC.DIRCLR = PIN1_bm; - /* enable reveice complete interrupt */ + /* enable receive complete interrupt */ USART1.CTRLA = USART_RXCIE_bm; /* enable transmitter and receiver */