From 33dd0cbd7abb31b8caa6fa6bafb9bc4c5e9b3460 Mon Sep 17 00:00:00 2001 From: sergeyyarkov Date: Tue, 25 Oct 2022 22:31:05 +0300 Subject: [PATCH] refactored --- firmware/build/default/production/command.o | Bin 7920 -> 7920 bytes firmware/build/default/production/main.o | Bin 8136 -> 8124 bytes firmware/build/default/production/main.o.d | 11 +---------- firmware/command.h | 1 - firmware/constants.h | 1 + .../production/firmware.production.elf | Bin 45784 -> 45776 bytes .../production/firmware.production.map | 8 ++++---- firmware/main.c | 1 - firmware/nbproject/private/private.xml | 7 ++++++- firmware/usart.c | 2 +- 10 files changed, 13 insertions(+), 18 deletions(-) diff --git a/firmware/build/default/production/command.o b/firmware/build/default/production/command.o index a65981795a8f966e3a68a4af4e9e6b2d24cfc820..01c82fb27a55245941a7c32063e7f4da175992d5 100644 GIT binary patch delta 39 scmexh`@wcY8H*IxS|$bt*2I*QA_it|5SxKDFEKZjfthFX1eOFT0OlYHD*ylh delta 39 scmexh`@wcY8H*J6S|$bt*2I*QA_it25SxKDFEKZjfth#n1eOFT0OnW&?B_G`&e<^J5Z|*rWj^U@O)X3ayLiAW~=%acHYeYHdNKii$(2 zTOIu2L{ShF9cl-Mn$aKp8+22oL&3qNLI-hha?-%m;(dO%kKN_9%P&M&N;!yT=?4fM91 zQshPfa=Ju*SW3Nv5e=MXnqe{xas80r{LoHvza2C4MDYzCv164U`ijuj+-FEgN_g{7 zX}jPSTd#-!&LFC23e`cmfcKLT{$-~Vwt;W;-qgv9wc7a1)MZ5ucRK|N^C4#!xs7?J z(X7x}3yeO<+ z;-;QS!oQ8q6GP^O!5+?y%UEFXtPc@bLR6=)BCfe!K?XpQqb rO7w;gL+|o=Xoc@X5As`Roj0K$IFc>VBOZW`@+9;eFF|v>nvMShyPa~1 delta 1012 zcmZXSO=uHQ5P)ZrZvJeVZPzBv&o)g=yG0WW{v&Ftco4A`@upx?Z4y&s0~%4VQYm;5 z1z`><7!|x&^bierQV;|c%)#PSdk{RT;K7R?oY}le#CKS}`QH4z_t@vTx49cbc>hUa z9b&3Ejw#oGqpPb}sZP~E$4X&(vQ{mXDh0qzblDvZZ9`BC@8E(9pijcj^wgak3v}*% zR!Y`e*Cdg%#M#uGf8L<~v&%HmN2czUWl3uxg7 zp3*t!8Mh4olRX-dLcd4Nj4+(#-a|h72olyg9NsKsxQc|OzXyTn@pHvu;S8YH$p=v9 zv*l!Y`U0SjBHk4CQqH>;_2!JX&zaeXPV{oFm)jwN=8);mtt-~oX?tj~`)DYEPRIWh zBNX*7a&hyO|F&y>myFk?6~G?FJOGXe_u3kcDdrI{qgZn0guB~0B;3>Hn~EQD_((X^ z_6_Cp9KIF~z`VWFQX2~#Ew?vp@8LJc0UM!Pu?$WM+kXVWh~f?Gw{-aJin$%^RxB6T zuUOjV-KV&by8Wzd@NMK0HI*LQDOI zxr2irVuJuC^Un^}34=!ODz+xyQZh2kiDo$XK*Ldb5uLyTK}!*Xu9-S!sm^XayD{5+WVesLva7Po+Ack)V~chUTG~B!4LW2RG{ #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 467b2a1abf005ee6221f5bfa33032964e067e79b..7aba377defe35af94b0bf05e73e7472f4c4d5eaa 100755 GIT binary patch delta 489 zcmXv~JxE(o82!$>zNfLaQKLLfKw_I15kWE3l4LNTqtZdQA`;Dy5sfG+21Io1QVO34 zLZD067i!+(SRJ|)q|l{>4hlwbaZwz_@1}a;o_qMt{m%LB{Zlo5RgKRiEvp@bRq?xHP6U1OjStkh{=X%x7-#VnCu2@-TS;GrUOf< ze1Xt|-{KFy1djh7z!AGneOuRpx)$+= zH@lKgf!XzJHnU1-P~!G9R;@UbPj3=D>`#Qy%p-|Dc-@7>w8!7*$joLcon9sNLUS?; zsih35Cii^oA&MbB+ibUoq2LimPon_HH1rp#m)unRUwYX>DSY9TN(A$KAb7;b75fq1 C?r$Fe delta 501 zcmXv~K}b|l6usxa`QN@~&SdKJjZho?5rx)-PJb57!XUzE<1S*D{4+Z6b;7h7D5&;< zau>N6HzG*T4CDu+ovSu&0vEZcMWVTzHqk1=`*eKp?mL{rJ?C-0?it&A#zGHnf9PGc zFvg#)L3D?It-F_z2uG6%>y8nL6oOK2j-m+ies-=jIT_>$*YPVtRF{hiVwlPYK`HyR zG#mJY6ut|ub<4VryGSDkNqohcVvVh2b3$ByzgWc#c()?AO~E;VR4!uj%f z#hDlJ@cr|pA-v^V)eG3*V%5brUX)qkPcl>dQ|1=iH5Z$FwRR6f;j7xd!WtLXT|DB& SbvM4bLbTr~R+lSbhvxvksd9Ay 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 */