From c3199a2f368da8cd045f8a6467cac4f4a5840c78 Mon Sep 17 00:00:00 2001 From: sergeyyarkov Date: Mon, 24 Oct 2022 21:37:28 +0300 Subject: [PATCH] constants.h --- ... 212146ffeec991dab0cd32e3c2e8920ea8a6cfeb} | 2 +- ... 24149ae6f6dc40ee845e1f05ec62e0186d78a286} | 2 +- ... 380f0a40d7a8a3863227362b3fb40d7d7daec74b} | 2 +- ...> aeaafbf5cc5feb9171be2c1d22c4d07d6caa1f3} | 2 +- ... c6de2f161d033435f41c81e929804a0e9e5ce12d} | 2 +- ... f6b89c25f653f1792d17764ea16a727ff60541c3} | 2 +- firmware/build/default/production/command.o | Bin 7912 -> 7920 bytes firmware/build/default/production/command.o.d | 4 +- firmware/build/default/production/main.o | Bin 8040 -> 8136 bytes firmware/build/default/production/main.o.d | 20 +- firmware/build/default/production/usart.o | Bin 5712 -> 5724 bytes firmware/build/default/production/usart.o.d | 5 +- firmware/command.c | 2 +- firmware/constants.h | 8 + ...r128da48_web-serial-example.production.hex | 91 ------- ...production.elf => firmware.production.elf} | Bin 45736 -> 45784 bytes .../production/firmware.production.hex | 92 +++++++ ...production.map => firmware.production.map} | 242 +++++++++--------- .../dist/default/production/memoryfile.xml | 6 +- firmware/main.c | 10 +- firmware/nbproject/Makefile-default.mk | 30 +-- .../nbproject/Makefile-genesis.properties | 8 +- firmware/nbproject/Makefile-impl.mk | 2 +- firmware/nbproject/Makefile-variables.mk | 4 +- firmware/nbproject/configurations.xml | 3 +- firmware/nbproject/private/private.xml | 5 +- firmware/usart.h | 4 +- 27 files changed, 283 insertions(+), 265 deletions(-) rename firmware/.generated_files/flags/default/{46558d6f18ce5e594cf4f83207e5eff66606cbfd => 212146ffeec991dab0cd32e3c2e8920ea8a6cfeb} (81%) rename firmware/.generated_files/flags/default/{7b1a4fd512e3b7c14c71afd05a45c40d2abbca1a => 24149ae6f6dc40ee845e1f05ec62e0186d78a286} (82%) rename firmware/.generated_files/flags/default/{3198a00c36cd2cabf97b6a2e6fd4f9ae23b6066d => 380f0a40d7a8a3863227362b3fb40d7d7daec74b} (90%) rename firmware/.generated_files/flags/default/{2132e04ebfc4be3aa562cbc95409cc42446a34a9 => aeaafbf5cc5feb9171be2c1d22c4d07d6caa1f3} (82%) rename firmware/.generated_files/flags/default/{d6ffb82d4abf5b2b0d0e0d3eafe99480876a605 => c6de2f161d033435f41c81e929804a0e9e5ce12d} (90%) rename firmware/.generated_files/flags/default/{73e95a3906d5ad527c21ed504f79c5c8b1cb86fd => f6b89c25f653f1792d17764ea16a727ff60541c3} (89%) create mode 100644 firmware/constants.h delete mode 100644 firmware/dist/default/production/avr128da48_web-serial-example.production.hex rename firmware/dist/default/production/{avr128da48_web-serial-example.production.elf => firmware.production.elf} (74%) create mode 100644 firmware/dist/default/production/firmware.production.hex rename firmware/dist/default/production/{avr128da48_web-serial-example.production.map => firmware.production.map} (79%) diff --git a/firmware/.generated_files/flags/default/46558d6f18ce5e594cf4f83207e5eff66606cbfd b/firmware/.generated_files/flags/default/212146ffeec991dab0cd32e3c2e8920ea8a6cfeb similarity index 81% rename from firmware/.generated_files/flags/default/46558d6f18ce5e594cf4f83207e5eff66606cbfd rename to firmware/.generated_files/flags/default/212146ffeec991dab0cd32e3c2e8920ea8a6cfeb index 58d661c..c1d9079 100644 --- a/firmware/.generated_files/flags/default/46558d6f18ce5e594cf4f83207e5eff66606cbfd +++ b/firmware/.generated_files/flags/default/212146ffeec991dab0cd32e3c2e8920ea8a6cfeb @@ -1 +1 @@ - $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/command.c \ No newline at end of file + $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/command.c \ No newline at end of file diff --git a/firmware/.generated_files/flags/default/7b1a4fd512e3b7c14c71afd05a45c40d2abbca1a b/firmware/.generated_files/flags/default/24149ae6f6dc40ee845e1f05ec62e0186d78a286 similarity index 82% rename from firmware/.generated_files/flags/default/7b1a4fd512e3b7c14c71afd05a45c40d2abbca1a rename to firmware/.generated_files/flags/default/24149ae6f6dc40ee845e1f05ec62e0186d78a286 index 90dc46c..392e408 100644 --- a/firmware/.generated_files/flags/default/7b1a4fd512e3b7c14c71afd05a45c40d2abbca1a +++ b/firmware/.generated_files/flags/default/24149ae6f6dc40ee845e1f05ec62e0186d78a286 @@ -1 +1 @@ - $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/usart.c \ No newline at end of file + $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/usart.c \ No newline at end of file diff --git a/firmware/.generated_files/flags/default/3198a00c36cd2cabf97b6a2e6fd4f9ae23b6066d b/firmware/.generated_files/flags/default/380f0a40d7a8a3863227362b3fb40d7d7daec74b similarity index 90% rename from firmware/.generated_files/flags/default/3198a00c36cd2cabf97b6a2e6fd4f9ae23b6066d rename to firmware/.generated_files/flags/default/380f0a40d7a8a3863227362b3fb40d7d7daec74b index a54a0c1..f5fbef4 100644 --- a/firmware/.generated_files/flags/default/3198a00c36cd2cabf97b6a2e6fd4f9ae23b6066d +++ b/firmware/.generated_files/flags/default/380f0a40d7a8a3863227362b3fb40d7d7daec74b @@ -1 +1 @@ - $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/usart.c \ No newline at end of file + $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/usart.c \ No newline at end of file diff --git a/firmware/.generated_files/flags/default/2132e04ebfc4be3aa562cbc95409cc42446a34a9 b/firmware/.generated_files/flags/default/aeaafbf5cc5feb9171be2c1d22c4d07d6caa1f3 similarity index 82% rename from firmware/.generated_files/flags/default/2132e04ebfc4be3aa562cbc95409cc42446a34a9 rename to firmware/.generated_files/flags/default/aeaafbf5cc5feb9171be2c1d22c4d07d6caa1f3 index c2c0e6c..df98292 100644 --- a/firmware/.generated_files/flags/default/2132e04ebfc4be3aa562cbc95409cc42446a34a9 +++ b/firmware/.generated_files/flags/default/aeaafbf5cc5feb9171be2c1d22c4d07d6caa1f3 @@ -1 +1 @@ - $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/main.c \ No newline at end of file + $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/main.c \ No newline at end of file diff --git a/firmware/.generated_files/flags/default/d6ffb82d4abf5b2b0d0e0d3eafe99480876a605 b/firmware/.generated_files/flags/default/c6de2f161d033435f41c81e929804a0e9e5ce12d similarity index 90% rename from firmware/.generated_files/flags/default/d6ffb82d4abf5b2b0d0e0d3eafe99480876a605 rename to firmware/.generated_files/flags/default/c6de2f161d033435f41c81e929804a0e9e5ce12d index 23d0e5c..e037be3 100644 --- a/firmware/.generated_files/flags/default/d6ffb82d4abf5b2b0d0e0d3eafe99480876a605 +++ b/firmware/.generated_files/flags/default/c6de2f161d033435f41c81e929804a0e9e5ce12d @@ -1 +1 @@ - $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/command.c \ No newline at end of file + $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/main.c \ No newline at end of file diff --git a/firmware/.generated_files/flags/default/73e95a3906d5ad527c21ed504f79c5c8b1cb86fd b/firmware/.generated_files/flags/default/f6b89c25f653f1792d17764ea16a727ff60541c3 similarity index 89% rename from firmware/.generated_files/flags/default/73e95a3906d5ad527c21ed504f79c5c8b1cb86fd rename to firmware/.generated_files/flags/default/f6b89c25f653f1792d17764ea16a727ff60541c3 index cd64b84..4c1b9fd 100644 --- a/firmware/.generated_files/flags/default/73e95a3906d5ad527c21ed504f79c5c8b1cb86fd +++ b/firmware/.generated_files/flags/default/f6b89c25f653f1792d17764ea16a727ff60541c3 @@ -1 +1 @@ - $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/main.c \ No newline at end of file + $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 /home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware/command.c \ No newline at end of file diff --git a/firmware/build/default/production/command.o b/firmware/build/default/production/command.o index 67ea3a2b2b07c87ea017302c13577a8d156ca843..7ba42270030f0546412e61bb35a77178e3d90c6f 100644 GIT binary patch delta 1241 zcmZ9LUr1AN6vxlGyLX#8XSS&`wX{DjvouLG48y=ANGhR15tO-2w{R+R=AvlUlMe>U z&&M7V?7@c;@u4E49;%0)GDxBb@}a0m(s~Jk==NYqM!zo- zBumyj9F44+?I}S1>{no1q_N!}@euo#b&=}FF$ z4W^O7ByBuR!;*|yLxRJC4d}($)b}1SRmEGt8;bXUbLD0rA^@(CjQUz|wVp5&m*MzjLcQ!>#j??m zV!4> ze;J}W$yo^Ev`Wq+k`H|`jXM>~n(oCl*Iz3i5Z`u=@I&D%JjZddPF$dcwmUrd<2bHL^RR910 delta 1263 zcmZvbOGuPa6vxl`<{QVD@zvNg=_qRH^e`7UQ!L}QN`50BZPmP2eCFBu2L_Qn7z*`}&83*^UBPIWY#EQB7?fr> zCIRY~9))m|!Rf7$U=JCl8H)8^xD=*M#-z-cTXz@2zjAntn`}hRwr*laDla_FRBCq2 z${*8Hw7^zyMr$k@4R(cybFLzTG0d6DQ7KjS(!_?G0TWqTqoEcnlXq4>>1rq5wi26T zH46RA%Ula5Hgyfz>+p3aW%q<{+w4%f^wAGs5Ls8vStaOvAR#h~rl5@lu zUh`m5+17Wk+TE))K4ZvO-&(b96=SH~n1LK>4|Y76TDeIcy`f%WQx&U+sFyDVPP+zs`w;w_dv3yV?Q z2(?V}9dM0e+&uv9RGekS$21Q@y=lcKXd23>rO*%Xm<}of-`9K^{7lE}LXp$jUJv`c z;%orUJ8f?OFKR9UyVPV*L81ehTJI#dU=zwxYIrOs6YgUOmG^@dMX|4q)6r=k( z6m(tNcffvEb2)fiF&>M9pK5y*cusTmVJIK8qCW7i`obx&7i+fua6}b~GhoCyrr1NI znr@KSZZ~wI=H#;bcN!PT_q;3oMB4LDaJM|qAK+fu=iAOMY4-W~oLqyPlE*&3@zX8y zzA`=}zhEkt;sQT+%5lgcxeR$r?m^DV3&>*m0(n$&3jN$C2O;AUgj|ptkR%g@es3e@ MJEscK2UAI%f3IDwZU6uP diff --git a/firmware/build/default/production/command.o.d b/firmware/build/default/production/command.o.d index 5e872d4..d3b72c2 100644 --- a/firmware/build/default/production/command.o.d +++ b/firmware/build/default/production/command.o.d @@ -13,7 +13,7 @@ build/default/production/command.o.d build/default/production/command.o: \ /opt/microchip/xc8/v2.36/avr/avr/include/avr/xmega.h \ /opt/microchip/xc8/v2.36/avr/avr/include/avr/fuse.h \ /opt/microchip/xc8/v2.36/avr/avr/include/avr/lock.h \ - /opt/microchip/xc8/v2.36/avr/avr/include/string.h usart.h \ + /opt/microchip/xc8/v2.36/avr/avr/include/string.h usart.h constants.h \ /opt/microchip/xc8/v2.36/avr/avr/include/stdio.h command.h: @@ -50,4 +50,6 @@ command.h: usart.h: +constants.h: + /opt/microchip/xc8/v2.36/avr/avr/include/stdio.h: diff --git a/firmware/build/default/production/main.o b/firmware/build/default/production/main.o index 4d0ed8a3a5516769f33376ffbb3d7383f9dbdbe9..3cb0f7997c056477215ce7e1bc51bbb1b89d7f79 100644 GIT binary patch delta 2700 zcmY+Edu&s66vxl+-ac--cI}=Wdq1EZ2;n^l(LuMeF=*JgxJVG z0>;SvNzf=N|KQ9pnN$!_Q8ZBrC@){2qJSh~!Xy4+G||L!&iysiUvkg=obT`aUg!Mo z{jL6s#d|8n>!Ve}u05jwduPL4@ACkoFB}q+Q$cY|7&H3@;+wYi#N}Vw6!E((*O!a= zazKyRc4`0?zdWhuB@Yl@766)NA0F5iOFZ#t46Gxleu9tfAQ}LBTWciRHJpf#Y)C+* ze#*AP0$_w%BA}nPQ7k(hOQWElVP8;ZV;K9tWM3mc+8hS`EB1AxwG)HS+LAQdLLQGk z$GukadGvYqZRGRl3+&sCmX)AiWHykaP2pg32k2k3;xK5pjnN3M_6;jeqpf9SW9!PM zmS)huWhslLXe1f#Yzu+@9g8j{hIudFv*u1~yq`;~WjiP-`ejaohXQ7q%l*LJUQ%Y8 z%8#t%kTS@3kPOfeO^j~dM^DIq2?z~6^ZU}aU zaC^s{W{JsNmUacWDDDo%xv7KnXK{4)I4WT8>-2z zr`6|PHO~e>52rs5G-0gS(BBgW&0^^t8d*OWBkCI*>PdiC3}OKjLmM}uD(2w_ zYBuqT$PxXq!NH-ftwZs_UJwg2`*z^$xfFR#9<*22dNTWNV_*IT5MJ5>wE{AC>;R|b zUAs^GBMoC_N3{?>icB|Lut;p`8Q2UWATHv3nNuFc!IShYcyNsF822bhJAmJLvc?|Jy7^@U2` zf$#ejug3Qh#iWPuNympXxDDCiL4z%Vk5lm~WF6PSu}PrGY^q}|vR&~y-VD#d4^o}a;Gif5o+mBHvj4%PssA<(~`c%A&WAmpVpVWZCQL8V){fLQcTxkQ;%}S&>1FHyW6T569K!3)xCI5F_nL>Vk-a3is{}S zP)t+3p_pHI7~fs>XxQk2p}tsE%15C3_4OKNOkTq|G56D8FmS6(d%h+^p| z4Tx?z8*NywVf$2Rz#7KMYvo&|HQMxid7;!V67p~CER|Jd0c}>HTwdlEGv$`DfLJD9 zLOUc+qCF#TmIbV@Vf`m$L3xcegr8Bre4xBWw920HfY>j0p*<(xMtewJLfb7xML=wq MQ_)VB?G?WN0Ir~kdjJ3c delta 2617 zcmZXUYiv|S6vt=w?&I!mce~qdyDjaug_f3}khVaj@xgAN7He7BT|}a(g>E0v2=+mQ zC<_rkzz2|wBpORVVnQ&OsP(}^P&82OYt|-oqNP37+9ix{n7BcsjEp4sB z_?DU1Bm}2qyh#|}G0Vy@KFeihz6|5@Tw&&SQ&NoYIStw5P;G7Z15XEt)L7&ylVF-q zt%ZJMltW~JMSfxuBC^mTKQqZCvdALWnB)6vmMV&}@HSR#g)Z|j&AK-38a(oAGL-eF+V z03Po$FwCw*ERjUD-(%Zu(%oaic%MxNn+?J^%BGXeMv*p-vF*y{i!sHKPcZbDO%1J9 z20vinHJevh_DQz0aEN%jMNTpC;U*dKArt*3KH__3TiNzlSwLo^r#VwLyS;B{eb1&x!g5E=1^d2c{JQ|3Gp#N$T^_oppp)Qs1@W7wcjjMb!NV!Ov><-T5jeq zo-NNI==8X6AVMJp&oo&%gQVTmTLdB2BGhaLsTZNjoP5Zj`pqn^_WH0^?_0Ebtgo+o zu=i;pv*_PR<6`;mhW0FVuY0caO!T?$NcXtj(^OCSi_}(cDY{!8PzStIbv4qE_$H+r zn_|5K;qZMf%23aA8jyy~T`4fC&$3#=rDXnZX@#or9aa~8Q8_*l^tVa1HannJWd|lU zXL}^r^MUg+ZSx7S5gS#blWxcFLam7}Mz{MhpheL$x(V8yjRCC%-J|tVXhX-OSWeA5 zpj}$Wp>xVHV3}Bfk%OuWIYswB0gI0D7=HWEGs_2{Gs~Zx#y3pk!zvlNkv>l4&ILyM zlr%pZAR6bi`Q$73W(*TgBDL}jT(p^t;uJEbe83_leABy+1h0p zg6e&cbl7q_q$Fb=^fuBu6T7ufA^2YHQw@Dc^U^smPLZK+c8Rop zKUYbk1oy$`nwrcDMIumlG$rlA<;cSe?Nu^AGPq#v|b6lTx+UuQfqo0{iO9FlIyfVC4QE)F7b0(Qzdt3O_kiOH9f(- zT2ri7w5D9_SFaZIX7UgP;N(o?6;9ZsU7anuOOC5;{*W?@1I{_v?{}d}if2iuiWOHm z{0LOb(_4!JvOw(ti-JjJ7r~Z2#=t$bK(#pSxIolRm&y~$pDrhfbH-S zl7&EG+vxHT66>l+2mv9Kgl8l+6>XCMg_d`K1qc>w5dv|}xwf$6tN;Jbxvz8X%rrl4 z{xvQZjy5TA`~3KXaF%V(<+tw{$gAzfq6KdSfMM7p!-d?I;b1798!mz@2+vkao^4WLWhyg;@=v_0l@C< z$@u++Vt!<>2yywRHEIGlsjdvj+ZN@r>Fe-8{>5HUusx0OzuA`z0)A&2h&}UDgh2e_cA+*$46-lX(uEw%yO*X8$sAolUr3ZlkN*@a9c8)!Xi$(y2WJI zSFC_4%KMCY)f6Cp3TM|$A^|(wm;Cx-BC>SO{S?9#Ge4!0eiGNbP+n65Ty>0raQsTf zMFvJ0V8%ED>Gb(YKa1VI#NKr1?n#h;unnqYP?B>++b3E6F2#uwYu7_t^!te{uEcr5YFJ%fjk(d zIkaPB)3yL2M!mXYb+`vC0B;aPL%nLUmx+aHgB`2+h@U0>8fi$6744%ED?Db0=Zw-V zjEPzb0L+k%X#HHGuG9KGmb{{qxPhqGyrZm}(GHNV(mW_@T1t_w*8D_Sr_i1z?ZFa` zoGk}v!iBPKMSVjj0qI*~qculNaYlXX^@z(V=Peb}>X`SPc&#S9ggB(;yhLc)0obT^ zg*_FIM#S%`C7K8=#;L9Y8k;R$aL{?O@(S+EiKHzv&HN_I4`!2p;j{g#i ih&i<@mJm^O62~)Y3dctE2FJast|1Zn9&dMua=!rJjvJT& delta 1342 zcmXw&TWC~Q6o%J6`4=wfGwbq^)m_7ght+n>qYwa@& z$@%1ut)ls-rCQuLdtp-OBi3^9TA#2M<2q%1B0kmcto-KV7J!|^MV5;D`Ui)KrFCt6 zLm)SwrocS`U|FHT{^8=#mj{dBe1-IP{JNw18yPQuZv&`IHV^U-mqKiMI|7ii>;(nW zT^OHZZ;=l=yFlJ%FI7(glkc#x$#C&Jdxtz1-(~NT=i+;2QrYfcOIND1 z7v!Hz!YbF357I#%pZ0)>r*hfubWit|Y$wQvjA|HRP9c{8`G{Gh%J?jgnblSqpXUj) zx^Njg2Km&bG1ODWTJyMP9FG!NXUGDRMMTyc@|;Nnkqw6Y#l$DF(U2ERVnj9>@{&m- zk+yVDrrusLiWB5Z`_l3$Y!u7@S6A<$-ATILSP?5?a{dC z>fgF_!!?$i@}3}9?WsZrpEKo|8z#He*cJc*5lVcAiM14=fX4E=v-(#jUjE;~4f5MF zsUU@0oU3eM0B$nIK&YUaah`!y0hn=tfmFRgDk$LHja*Sq z*DLg<%pk9OAJAMZq4w= COMMAND_SIZE) { + if (cmd_idx > COMMAND_SIZE) { cmd_idx = 0; } diff --git a/firmware/constants.h b/firmware/constants.h new file mode 100644 index 0000000..ab355b4 --- /dev/null +++ b/firmware/constants.h @@ -0,0 +1,8 @@ +#ifndef CONSTANTS_H +#define CONSTANTS_H + +#define F_CPU 4000000UL +#define BUFFER_SIZE 20 + +#endif /* CONSTANTS_H */ + diff --git a/firmware/dist/default/production/avr128da48_web-serial-example.production.hex b/firmware/dist/default/production/avr128da48_web-serial-example.production.hex deleted file mode 100644 index fc7bba6..0000000 --- a/firmware/dist/default/production/avr128da48_web-serial-example.production.hex +++ /dev/null @@ -1,91 +0,0 @@ -:100000000C9477000C9471020C9471020C947102A0 -:100010000C9471020C9471020C9471020C94710294 -:100020000C9471020C9471020C9471020C94710284 -:100030000C9471020C9471020C9471020C94710274 -:100040000C9471020C9471020C9471020C94710264 -:100050000C9471020C9471020C9471020C94710254 -:100060000C9471020C9471020C9471020C94710244 -:100070000C9471020C9471020C9471020C94FA00AD -:100080000C9471020C9471020C9471020C94710224 -:100090000C9471020C9471020C9471020C94710214 -:1000A0000C9471020C9471020C9471020C94710204 -:1000B0000C9471020C9471020C9471020C947102F4 -:1000C0000C9471020C9471020C9471020C947102E4 -:1000D0000C9471020C9471020C9471020C947102D4 -:1000E0000C9471020C947102400040848000809155 -:1000F00001108F7C806080688093011011241FBEE6 -:10010000CFEFCDBFDFE7DEBFE8EEF0E040E019C0A3 -:10011000B791A79137912791079107FD0EC097914D -:100120008791EF01F92FE82F0BBF07900D92A217CF -:10013000B307D9F7FE011BBE04C01D92A217B30777 -:10014000E1F7ED3EF40721F70E9407020C94440208 -:04015000F894FFCF51 -:100154005B4C4F475D3A20436F6D6D616E64206365 -:100164006F6D706C65746564207375636365737318 -:1001740066756C6C79207769746820636F64652098 -:100184002230222E0A005B4C4F475D3A20496E769E -:10019400616C696420636F6D6D616E64206E616D66 -:1001A40065210A005B4C4F475D3A204C697374200B -:1001B4006F6620617661696C61626C6520636F6D46 -:0B01C4006D616E64733A0A002E20008B -:1001CF0048656C6C6F20776F726C64210A006C65E8 -:1001DF00645F746F67676C650068656C6C6F006C4B -:0401EF0069737400BC -:1001F4001F920F920FB60F9211240BB60F922F93EA -:100204003F934F935F936F937F938F939F93AF939A -:10021400BF93EF93FF9380912008803221F18A30BD -:1002240069F08D3001F1E091824091E09E0F90934E -:100234008240F0E0E259FF4B808315C08EE690E4E3 -:100244000E94480110928240EEE6F0E40190002002 -:10025400E9F73197AF014E56504460E070E08EE606 -:1002640090E40E944F02FF91EF91BF91AF919F9153 -:100274008F917F916F915F914F913F912F910F904B -:0C0284000BBE0F900FBE0F901F9018953E -:10029000CF92DF92EF92FF920F931F93CF93DF9352 -:1002A0007C0102E010E4C0E0D0E0B801C7010E9488 -:1002B0003602892BA9F486E18C9FF0018D9FF00D09 -:1002C0001124E050F04C0190F081E02D099584E577 -:1002D00091E80E94E50184E00E94580280E00EC08F -:1002E00021960A5E1F4FC630D105F9F68AE891E8DB -:1002F0000E94E50184E00E94580281E0DF91CF91E5 -:0E0300001F910F91FF90EF90DF90CF90089526 -:10030E00CF93DF93CDB7DEB76697CDBFDEBFFB01D0 -:10031E0001900020E9F73197E61BF70B759708F56A -:10032E0020918340253010F01092834089839A8368 -:10033E00CE0103960E946002A091834081E08A0F55 -:10034E008093834086E1A89FD0011124A050B04C29 -:10035E0086E1FE01319601900D928A95E1F781E0DA -:10036E0001C080E06696CDBFDEBFDF91CF910895CC -:10037E000F931F93CF9388EA91E80E94E50100E066 -:10038E0010E4C1E3F80180819181892B71F08C2FEB -:10039E000E9458028CEC91E80E94E501C801029679 -:1003AE000E94E5018AE00E9458020A5E1F4FCF5F4D -:0C03BE00C63341F7CF911F910F910895B5 -:1003CA00EF92FF920F931F93CF93DF938C017C01DF -:1003DA00C0E0D0E006C0F70181917F010E94580277 -:1003EA002196F80101900020E9F73197E01BF10B03 -:1003FA00CE17DF0780F3DF91CF911F910F91FF9006 -:04040A00EF900895D2 -:10040E0080E4809341040E94200278946DED71E89F -:10041E008DE692E00E94870168EE71E888E692E030 -:10042E000E9487016EEE71E88FEB91E00E948701CA -:02043E00FFCFEE -:10044000E0E2F8E083E896E08087918783E08783A5 -:10045000A0E4B4E081E011968C93119782E01296AB -:0C0460008C9380E8858380EC86830895EF -:10046C00DC01FB019D912191921303C09111FACFF4 -:0C047C00292F892F90E0821B9109089520 -:10048800EC010E9476020E947502CE010E9477025A -:06049800CE010E94730278 -:10049E00FC01480F591FE417F50711F06193FBCFCC -:0204AE000895AF -:1004B000E0E2F8E0948195FFFDCF80932208089553 -:1004C000FC01DB012D91BD0121932111FACF08958B -:0A04D0008FEC91E80E94E501089509 -:0804DA0080E4809347040895BB -:0404E2000C94000076 -:0404E6000E94A800C8 -:0204EA00089573 -:0204EC00089571 -:0204EE0008956F -:00000001FF diff --git a/firmware/dist/default/production/avr128da48_web-serial-example.production.elf b/firmware/dist/default/production/firmware.production.elf similarity index 74% rename from firmware/dist/default/production/avr128da48_web-serial-example.production.elf rename to firmware/dist/default/production/firmware.production.elf index 1cbc153c407cdeb2b0f48c4da88c48a9164e37c3..a3c1902f8dad01b99f9ee46946453523d6c3e188 100755 GIT binary patch delta 6063 zcmc&&dvH|M9X{vYeI+DIvSG6!JT@Ufv}%(8LBUr-5-^ey9*J$o4k1l8kC`Mu2oN4& z5o9bBJH``GN+94&EmdBUN)dd3Q`@SDAc8NfLIr8Tptfqq*4pnocQ@JH@!wAG%(?gX zeZSxNo%eU|?yif*+ZT<8GUQ#InKfRQDFlmM2w|W|l#`uX3WH0Hgs%Tb`C909fBL^~ zTpf`$_CyTxZk1)cp72oTnu1MvNuMS?yrw{XZd@m4s9|QNtW>v~)8uVxotfplBJcmu z-8EP3GkyK`Yv!bsvAL|awqX6*U#>kN&CTwvIyKZ*BCn__o7Xqj*m$+`vb*bw{F5}` zyCOH}EI+s9$+_w|+fCVHjrOkQPZnNY`|-o@JSZFb7GD0vCChGsz3yr!d6jH0PhM%b zyH*${q`Rv_-ET3IbwWzIiaZQ`ZFkg18L3drnrL%?ks)Ml_%qgi5=5dWB zokeBvzov1}AW<=`OqeG$VYA4q{#T4UL_y(iy@$t!)?V zim7FV)8+{CP0hr)*xRCt*=X#HX5wAJnWZy|%4bY1ohHn)nj7RIg`mor#ln0`a|vNi z_vLNPC5AcOpLaCpj>|~FOunn9VK4)7t>)g-?j$mK7IRKB$w5-%Eb4ttdB}{nm_KVK zh0Fwt`9L#6$mCnhhnn${nP@TRHIqu_W{bI?8K0{)uqe>FBv4y5PMCjjJc6|frU}~t ztdm|?5_(~s!u9~{c)hyV3?DhT=7S9LaQta5@RY*JVoc)Ucx#CX?+QaH5*T+4afx)0 ze-O3ZPl6H7$~lDtJ0{5t?vL+--nnM~sJO7A5IGNoa#{qk_G&`9D#8)J)r1iu5b?Ao zOxK)>!iq|)_CbwpE{?rWn7`A|uHh769@5aEVUY-$&uHu%tOur9boq!T<6Xs5rdc!i ztR@DzO75}na~db06En*!=6TH|VkBYa1U*8lEa)P9+^r?lDyuMo`rG;2_%QdL#`3Uv}wQbU< zg29q5i(nzMt(^RqfWtd5b1_8np_6C>(WQ#kq8a+j)Rd7V-bP|+GE#K9Cb?8 zv-S7yL+jo-ICnW3J$8LCcA9&W^$>e^)Q(0EE2GOa0CErv_^6P!dA zn_G>z^?SYqP(J`GRNqeUnpdPy*NTQg z+Xod-mc?2*A3<}reB5G{b3YyL#VY6hU{9eqp2qDvl(Q4#2`eXKBbAdlQaOpEl#@ii zauP%;Cvl{55=Sa0aacKNM=K|pXyqgmtDNLwm6Keoa*~TxPIB(J7Ay>ulhY8boODMk zCz%-KBo(ckWTKUmOtf;6iB?WB(aK3CRyiL>C#jsr;IlJ;gkD%E=VsUu%E>j?%6S3& zfO4{y1+{V#hLrO^i0fBQo?-W4FyEz|-^3`Vl`}#)b=FAbBoU>YBqEiQI6^rIBb1Xc zQaOp8gZ01$l#^tXa*~KtPU2|gBonQiWI}u5XgtRW<>YJ+D5w2cJZ4IrDozO|86GH4 zvec@YS5?~5*w$Fxgl`rhO-X@jM}bIr!Vz-i(122~X>sBrkUMDJ0GIB24;^t+0 zXsZBoGN`7xw#sTDjV)Y{R0)`;p^U8pNak0@=O~||QbM3TP_wuV9Un0rl{drhxd7h` zwDO@kUy?HPGSIzjQ#MF^H+!B3ZU7#l5~mJ}6Uf2XT$ML9WrPDLA~xkL(lPB25oZ*r z>Z#r!Cxt7E&hi8%Z-;#X0(pi8z4r$=L9Zh9U|zGtl zE^){fhj%sB*>3Q?Yu>D0Z}+CUrD?>C#ep*7Y&=$ok*2Bo+Nb(5NwOMxs;lvEm}AxS zWnaiLRk%D)KC2cj&z5J^*5y}Zx_V$msq9v#R{T(IP}i?4P)#d`k74_0RV1MBV$1y5 zRH0Gm=absAvIg~&JF+r)s`(R$@w-tt@BEoWj`*yq>?lI)mJUDKdZy!MxuN&7j)N(| znV3K+8W5r{uJ~0Hhp^U+_7LQ9hNxDXplFbV9 zYF*s;Whmjyv}c(?PJ3tlEP$0LR$5xCP{N_KxgDb$WkS|-2DBKE}3<_TyAD1C4W3+|$+K zO*wht{H93NS(uxbDSZ0LHh7sLO+VAsnN9v=Ho(gi!}N25vTx1_e%W8wui1b0;|z_z z?#G!LclF~@8b8sGvoz*dd71dM=EX7dGQ}AE{JbCImo`A^c)3p6rB$ zGsG6)uY0|Z=9qhoo zt#?MXa3m(fA7e0ooJ3~%fLH~(bG(sk7RI6fl~KRx9)`AG>h|YF`kUa7#7luW=N$eh zktz6d1N&f`KbbSf3Gj%qg8z&3sS>b}bYO0@^)WOq!|Az<#+;o3i1 zya4;0I@9AX48J5i_!>MPQ|oFB?m+GE<{gF2`xX4@Du0JRYRu#DPL1s0oy2PK4$jr4 z9p$)R+>sNtD|W}!I23~=X01z=?3^F9ru;sPY$rDc-xh=Kioq2zcpkCxKE`z{c`SNN zFTqEhDc19sCf)+>?p^oTt8wzAnzg$e_no`5B%`}R(^Q-1fW zQ+scayVN&({dR7MK9#vI8|^-|->2s7OM; zCGVeZr#voD)%&yTRN%R4{eCMK@9%)+GQXnaQ(1N%uH&$Ls^F;vI}hs#H48kYu|X|^ x#qGLE?S#cGR;FHtbsW|X^%*Q4|spR3q+3Rp$ZUe*s1?(m((J delta 6079 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 R^%USM<}o}ss-r!b{{>m$#{&QW diff --git a/firmware/dist/default/production/firmware.production.hex b/firmware/dist/default/production/firmware.production.hex new file mode 100644 index 0000000..2d8bec5 --- /dev/null +++ b/firmware/dist/default/production/firmware.production.hex @@ -0,0 +1,92 @@ +:100000000C9477000C9477020C9477020C9477028E +:100010000C9477020C9477020C9477020C9477027C +:100020000C9477020C9477020C9477020C9477026C +:100030000C9477020C9477020C9477020C9477025C +:100040000C9477020C9477020C9477020C9477024C +:100050000C9477020C9477020C9477020C9477023C +:100060000C9477020C9477020C9477020C9477022C +:100070000C9477020C9477020C9477020C94FA009B +:100080000C9477020C9477020C9477020C9477020C +:100090000C9477020C9477020C9477020C947702FC +:1000A0000C9477020C9477020C9477020C947702EC +:1000B0000C9477020C9477020C9477020C947702DC +:1000C0000C9477020C9477020C9477020C947702CC +:1000D0000C9477020C9477020C9477020C947702BC +:1000E0000C9477020C947702400040848000809149 +:1000F00001108F7C806080688093011011241FBEE6 +:10010000CFEFCDBFDFE7DEBFE8EEF0E040E019C0A3 +:10011000B791A79137912791079107FD0EC097914D +:100120008791EF01F92FE82F0BBF07900D92A217CF +:10013000B307D9F7FE011BBE04C01D92A217B30777 +:10014000E1F7ED3EF40721F70E940D020C944A02FC +:04015000F894FFCF51 +:100154005B4C4F475D3A20436F6D6D616E64206365 +:100164006F6D706C65746564207375636365737318 +:1001740066756C6C79207769746820636F64652098 +:100184002230222E0A005B4C4F475D3A20496E769E +:10019400616C696420636F6D6D616E64206E616D66 +:1001A40065210A005B4C4F475D3A204C697374200B +:1001B4006F6620617661696C61626C6520636F6D46 +:0B01C4006D616E64733A0A002E20008B +:1001CF0048656C6C6F20776F726C64210A006C65E8 +:1001DF00645F746F67676C650068656C6C6F006C4B +:0401EF0069737400BC +:1001F4001F920F920FB60F9211240BB60F922F93EA +:100204003F934F935F936F937F938F939F93AF939A +:10021400BF93EF93FF938091200890918240953192 +:1002240010F010928240803221F18A3069F08D30D2 +:1002340001F1E091824091E09E0F90938240F0E0C2 +:10024400E259FF4B808315C08EE690E40E944E0174 +:1002540010928240EEE6F0E401900020E9F7319735 +:10026400AF014E56504460E070E08EE690E40E9488 +:100274005502FF91EF91BF91AF919F918F917F9123 +:100284006F915F914F913F912F910F900BBE0F9003 +:080294000FBE0F901F9018959A +:10029C00CF92DF92EF92FF920F931F93CF93DF9346 +:1002AC007C0102E010E4C0E0D0E0B801C7010E947C +:1002BC003C02892BA9F486E18C9FF0018D9FF00DF7 +:1002CC001124E050F04C0190F081E02D099584E56B +:1002DC0091E80E94EB0184E00E945E0280E00EC077 +:1002EC0021960A5E1F4FC630D105F9F68AE891E8CF +:1002FC000E94EB0184E00E945E0281E0DF91CF91CD +:0E030C001F910F91FF90EF90DF90CF9008951A +:10031A00CF93DF93CDB7DEB76697CDBFDEBFFB01C4 +:10032A0001900020E9F73197E61BF70B759708F55E +:10033A0020918340263010F01092834089839A835B +:10034A00CE0103960E946602A091834081E08A0F43 +:10035A008093834086E1A89FD0011124A050B04C1D +:10036A0086E1FE01319601900D928A95E1F781E0CE +:10037A0001C080E06696CDBFDEBFDF91CF910895C0 +:10038A000F931F93CF9388EA91E80E94EB0100E054 +:10039A0010E4C1E3F80180819181892B71F08C2FDF +:1003AA000E945E028CEC91E80E94EB01C801029661 +:1003BA000E94EB018AE00E945E020A5E1F4FCF5F35 +:0C03CA00C63341F7CF911F910F910895A9 +:1003D600EF92FF920F931F93CF93DF938C017C01D3 +:1003E600C0E0D0E006C0F70181917F010E945E0265 +:1003F6002196F80101900020E9F73197E01BF10BF7 +:10040600CE17DF0780F3DF91CF911F910F91FF90F9 +:04041600EF900895C6 +:10041A0080E4809341040E94260278946DED71E88D +:10042A0083E792E00E948D0168EE71E88EE692E021 +:10043A000E948D016EEE71E885EC91E00E948D01BB +:02044A00FFCFE2 +:10044C00E0E2F8E083E896E08087918783E0878399 +:10045C00A0E4B4E081E011968C93119782E012969F +:0C046C008C9380E8858380EC86830895E3 +:10047800DC01FB019D912191921303C09111FACFE8 +:0C048800292F892F90E0821B9109089514 +:10049400EC010E947C020E947B02CE010E947D023C +:0604A400CE010E94790266 +:1004AA00FC01480F591FE417F50711F06193FBCFC0 +:0204BA000895A3 +:1004BC00E0E2F8E0948195FFFDCF80932208089547 +:1004CC00FC01DB012D91BD0121932111FACF08957F +:0A04DC008FEC91E80E94EB010895F7 +:0804E60080E4809347040895AF +:0404EE000C9400006A +:0404F2000E94A800BC +:0204F600089567 +:0204F800089565 +:0204FA00089563 +:00000001FF diff --git a/firmware/dist/default/production/avr128da48_web-serial-example.production.map b/firmware/dist/default/production/firmware.production.map similarity index 79% rename from firmware/dist/default/production/avr128da48_web-serial-example.production.map rename to firmware/dist/default/production/firmware.production.map index 4aa8726..b9b7c44 100644 --- a/firmware/dist/default/production/avr128da48_web-serial-example.production.map +++ b/firmware/dist/default/production/firmware.production.map @@ -431,12 +431,12 @@ END GROUP .debug_pubnames *(.debug_pubnames) -.debug_info 0x0000000000000000 0x407c +.debug_info 0x0000000000000000 0x4097 *(.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 0x81f build/default/production/main.o - .debug_info 0x0000000000003443 0x6c6 build/default/production/usart.o - .debug_info 0x0000000000003b09 0x573 build/default/production/command.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_abbrev 0x0000000000000000 0x2e21 *(.debug_abbrev) @@ -445,12 +445,12 @@ END GROUP .debug_abbrev 0x0000000000002b76 0x14c build/default/production/usart.o .debug_abbrev 0x0000000000002cc2 0x15f build/default/production/command.o -.debug_line 0x0000000000000000 0x6b9 +.debug_line 0x0000000000000000 0x6c5 *(.debug_line .debug_line.* .debug_line_end) .debug_line 0x0000000000000000 0x222 /opt/microchip/mplabx/v6.00/packs/Microchip/AVR-Dx_DFP/1.10.124/xc8/avr/lib/avrxmega4/memx-const/mapped/crtavr128da48.o - .debug_line 0x0000000000000222 0x1a4 build/default/production/main.o - .debug_line 0x00000000000003c6 0x15d build/default/production/usart.o - .debug_line 0x0000000000000523 0x196 build/default/production/command.o + .debug_line 0x0000000000000222 0x1b0 build/default/production/main.o + .debug_line 0x00000000000003d2 0x15d build/default/production/usart.o + .debug_line 0x000000000000052f 0x196 build/default/production/command.o .debug_frame 0x0000000000000000 0x19c *(.debug_frame) @@ -497,7 +497,7 @@ END GROUP .debug_macro *(.debug_macro) -OUTPUT(dist/default/production/avr128da48_web-serial-example.production.elf elf32-avr) +OUTPUT(dist/default/production/firmware.production.elf elf32-avr) LOAD linker stubs LOAD data_init @@ -529,157 +529,157 @@ LOAD data_init .rodata 0x00000000008081cf 0x24 build/default/production/main.o .text.__vector_31 - 0x00000000000001f4 0x9c + 0x00000000000001f4 0xa8 .text.__vector_31 - 0x00000000000001f4 0x9c build/default/production/main.o + 0x00000000000001f4 0xa8 build/default/production/main.o 0x00000000000001f4 __vector_31 .text.command_process - 0x0000000000000290 0x7e + 0x000000000000029c 0x7e .text.command_process - 0x0000000000000290 0x7e build/default/production/command.o - 0x0000000000000290 command_process + 0x000000000000029c 0x7e build/default/production/command.o + 0x000000000000029c command_process .text.command_define - 0x000000000000030e 0x70 + 0x000000000000031a 0x70 .text.command_define - 0x000000000000030e 0x70 build/default/production/command.o - 0x000000000000030e command_define + 0x000000000000031a 0x70 build/default/production/command.o + 0x000000000000031a command_define .text.command_list - 0x000000000000037e 0x4c + 0x000000000000038a 0x4c .text.command_list - 0x000000000000037e 0x4c build/default/production/command.o - 0x000000000000037e command_list + 0x000000000000038a 0x4c build/default/production/command.o + 0x000000000000038a command_list .text.USART1_SendString - 0x00000000000003ca 0x44 + 0x00000000000003d6 0x44 .text.USART1_SendString - 0x00000000000003ca 0x44 build/default/production/usart.o - 0x00000000000003ca USART1_SendString + 0x00000000000003d6 0x44 build/default/production/usart.o + 0x00000000000003d6 USART1_SendString -.text.main 0x000000000000040e 0x32 - .text.main 0x000000000000040e 0x32 build/default/production/main.o - 0x000000000000040e main +.text.main 0x000000000000041a 0x32 + .text.main 0x000000000000041a 0x32 build/default/production/main.o + 0x000000000000041a main .text.USART1_Initialize - 0x0000000000000440 0x2c + 0x000000000000044c 0x2c .text.USART1_Initialize - 0x0000000000000440 0x2c build/default/production/usart.o - 0x0000000000000440 USART1_Initialize + 0x000000000000044c 0x2c build/default/production/usart.o + 0x000000000000044c USART1_Initialize -.text.strcmp 0x000000000000046c 0x1c - .text.strcmp 0x000000000000046c 0x1c /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(strcmp.o) - 0x000000000000046c strcmp +.text.strcmp 0x0000000000000478 0x1c + .text.strcmp 0x0000000000000478 0x1c /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(strcmp.o) + 0x0000000000000478 strcmp -.text.exit 0x0000000000000488 0x16 - .text.exit 0x0000000000000488 0x16 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) - 0x0000000000000488 exit +.text.exit 0x0000000000000494 0x16 + .text.exit 0x0000000000000494 0x16 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) + 0x0000000000000494 exit -.text.memset 0x000000000000049e 0x12 - .text.memset 0x000000000000049e 0x12 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(memset.o) - 0x000000000000049e memset +.text.memset 0x00000000000004aa 0x12 + .text.memset 0x00000000000004aa 0x12 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(memset.o) + 0x00000000000004aa memset .text.USART1_SendChar - 0x00000000000004b0 0x10 + 0x00000000000004bc 0x10 .text.USART1_SendChar - 0x00000000000004b0 0x10 build/default/production/usart.o - 0x00000000000004b0 USART1_SendChar + 0x00000000000004bc 0x10 build/default/production/usart.o + 0x00000000000004bc USART1_SendChar -.text.strcpy 0x00000000000004c0 0x10 - .text.strcpy 0x00000000000004c0 0x10 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(strcpy.o) - 0x00000000000004c0 strcpy +.text.strcpy 0x00000000000004cc 0x10 + .text.strcpy 0x00000000000004cc 0x10 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(strcpy.o) + 0x00000000000004cc strcpy .text.hello_world - 0x00000000000004d0 0xa + 0x00000000000004dc 0xa .text.hello_world - 0x00000000000004d0 0xa build/default/production/main.o - 0x00000000000004d0 hello_world + 0x00000000000004dc 0xa build/default/production/main.o + 0x00000000000004dc hello_world .text.led_toggle - 0x00000000000004da 0x8 + 0x00000000000004e6 0x8 .text.led_toggle - 0x00000000000004da 0x8 build/default/production/main.o - 0x00000000000004da led_toggle + 0x00000000000004e6 0x8 build/default/production/main.o + 0x00000000000004e6 led_toggle -.text 0x00000000000004e2 0x4 - .text 0x00000000000004e2 0x4 /opt/microchip/mplabx/v6.00/packs/Microchip/AVR-Dx_DFP/1.10.124/xc8/avr/lib/avrxmega4/memx-const/mapped/crtavr128da48.o - 0x00000000000004e2 __vector_38 - 0x00000000000004e2 __vector_22 - 0x00000000000004e2 __vector_28 - 0x00000000000004e2 __vector_1 - 0x00000000000004e2 __vector_32 - 0x00000000000004e2 __vector_34 - 0x00000000000004e2 __vector_24 - 0x00000000000004e2 __vector_12 - 0x00000000000004e2 __vector_55 - 0x00000000000004e2 __vector_46 - 0x00000000000004e2 __bad_interrupt - 0x00000000000004e2 __vector_6 - 0x00000000000004e2 __vector_35 - 0x00000000000004e2 __vector_39 - 0x00000000000004e2 __vector_3 - 0x00000000000004e2 __vector_23 - 0x00000000000004e2 __vector_30 - 0x00000000000004e2 __vector_45 - 0x00000000000004e2 __vector_25 - 0x00000000000004e2 __vector_11 - 0x00000000000004e2 __vector_54 - 0x00000000000004e2 __vector_13 - 0x00000000000004e2 __vector_17 - 0x00000000000004e2 __vector_19 - 0x00000000000004e2 __vector_56 - 0x00000000000004e2 __vector_7 - 0x00000000000004e2 __vector_49 - 0x00000000000004e2 __vector_41 - 0x00000000000004e2 __vector_43 - 0x00000000000004e2 __vector_27 - 0x00000000000004e2 __vector_5 - 0x00000000000004e2 __vector_33 - 0x00000000000004e2 __vector_47 - 0x00000000000004e2 __vector_52 - 0x00000000000004e2 __vector_37 - 0x00000000000004e2 __vector_4 - 0x00000000000004e2 __vector_44 - 0x00000000000004e2 __vector_51 - 0x00000000000004e2 __vector_9 - 0x00000000000004e2 __vector_2 - 0x00000000000004e2 __vector_21 - 0x00000000000004e2 __vector_15 - 0x00000000000004e2 __vector_36 - 0x00000000000004e2 __vector_29 - 0x00000000000004e2 __vector_40 - 0x00000000000004e2 __vector_8 - 0x00000000000004e2 __vector_26 - 0x00000000000004e2 __vector_48 - 0x00000000000004e2 __vector_14 - 0x00000000000004e2 __vector_57 - 0x00000000000004e2 __vector_53 - 0x00000000000004e2 __vector_10 - 0x00000000000004e2 __vector_50 - 0x00000000000004e2 __vector_16 - 0x00000000000004e2 __vector_18 - 0x00000000000004e2 __vector_20 - 0x00000000000004e2 __vector_42 +.text 0x00000000000004ee 0x4 + .text 0x00000000000004ee 0x4 /opt/microchip/mplabx/v6.00/packs/Microchip/AVR-Dx_DFP/1.10.124/xc8/avr/lib/avrxmega4/memx-const/mapped/crtavr128da48.o + 0x00000000000004ee __vector_38 + 0x00000000000004ee __vector_22 + 0x00000000000004ee __vector_28 + 0x00000000000004ee __vector_1 + 0x00000000000004ee __vector_32 + 0x00000000000004ee __vector_34 + 0x00000000000004ee __vector_24 + 0x00000000000004ee __vector_12 + 0x00000000000004ee __vector_55 + 0x00000000000004ee __vector_46 + 0x00000000000004ee __bad_interrupt + 0x00000000000004ee __vector_6 + 0x00000000000004ee __vector_35 + 0x00000000000004ee __vector_39 + 0x00000000000004ee __vector_3 + 0x00000000000004ee __vector_23 + 0x00000000000004ee __vector_30 + 0x00000000000004ee __vector_45 + 0x00000000000004ee __vector_25 + 0x00000000000004ee __vector_11 + 0x00000000000004ee __vector_54 + 0x00000000000004ee __vector_13 + 0x00000000000004ee __vector_17 + 0x00000000000004ee __vector_19 + 0x00000000000004ee __vector_56 + 0x00000000000004ee __vector_7 + 0x00000000000004ee __vector_49 + 0x00000000000004ee __vector_41 + 0x00000000000004ee __vector_43 + 0x00000000000004ee __vector_27 + 0x00000000000004ee __vector_5 + 0x00000000000004ee __vector_33 + 0x00000000000004ee __vector_47 + 0x00000000000004ee __vector_52 + 0x00000000000004ee __vector_37 + 0x00000000000004ee __vector_4 + 0x00000000000004ee __vector_44 + 0x00000000000004ee __vector_51 + 0x00000000000004ee __vector_9 + 0x00000000000004ee __vector_2 + 0x00000000000004ee __vector_21 + 0x00000000000004ee __vector_15 + 0x00000000000004ee __vector_36 + 0x00000000000004ee __vector_29 + 0x00000000000004ee __vector_40 + 0x00000000000004ee __vector_8 + 0x00000000000004ee __vector_26 + 0x00000000000004ee __vector_48 + 0x00000000000004ee __vector_14 + 0x00000000000004ee __vector_57 + 0x00000000000004ee __vector_53 + 0x00000000000004ee __vector_10 + 0x00000000000004ee __vector_50 + 0x00000000000004ee __vector_16 + 0x00000000000004ee __vector_18 + 0x00000000000004ee __vector_20 + 0x00000000000004ee __vector_42 -.text._Exit 0x00000000000004e6 0x4 - .text._Exit 0x00000000000004e6 0x4 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(_Exit.o) - 0x00000000000004e6 _Exit +.text._Exit 0x00000000000004f2 0x4 + .text._Exit 0x00000000000004f2 0x4 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(_Exit.o) + 0x00000000000004f2 _Exit .text.__dummy_fini - 0x00000000000004ea 0x2 + 0x00000000000004f6 0x2 .text.__dummy_fini - 0x00000000000004ea 0x2 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) - 0x00000000000004ea _fini + 0x00000000000004f6 0x2 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) + 0x00000000000004f6 _fini .text.__dummy_funcs_on_exit - 0x00000000000004ec 0x2 + 0x00000000000004f8 0x2 .text.__dummy_funcs_on_exit - 0x00000000000004ec 0x2 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) - 0x00000000000004ec __funcs_on_exit + 0x00000000000004f8 0x2 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) + 0x00000000000004f8 __funcs_on_exit .text.__dummy_simulator_exit - 0x00000000000004ee 0x2 + 0x00000000000004fa 0x2 .text.__dummy_simulator_exit - 0x00000000000004ee 0x2 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) - 0x00000000000004ee __simulator_exit + 0x00000000000004fa 0x2 /opt/microchip/xc8/v2.36/avr/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avrxmega4/memx-const/mapped/libc.a(exit.o) + 0x00000000000004fa __simulator_exit diff --git a/firmware/dist/default/production/memoryfile.xml b/firmware/dist/default/production/memoryfile.xml index ff4cfef..9638add 100644 --- a/firmware/dist/default/production/memoryfile.xml +++ b/firmware/dist/default/production/memoryfile.xml @@ -1,11 +1,11 @@ - + bytes 131072 - 1263 - 129809 + 1275 + 129797 bytes diff --git a/firmware/main.c b/firmware/main.c index a268b66..0423575 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -1,12 +1,10 @@ -#define F_CPU (4000000UL) #include #include -#include #include +#include "constants.h" #include "command.h" #include "usart.h" - -#define BUFFER_SIZE 20 +#include char buffer[BUFFER_SIZE]; volatile uint8_t buff_idx = 0; @@ -18,6 +16,10 @@ ISR(USART1_RXC_vect) { char c; c = USART1.RXDATAL; + if (buff_idx > BUFFER_SIZE) { + buff_idx = 0; + } + if (c != ' ' && c != '\n' && c != '\r') { buffer[buff_idx++] = c; } diff --git a/firmware/nbproject/Makefile-default.mk b/firmware/nbproject/Makefile-default.mk index f7af887..156a732 100644 --- a/firmware/nbproject/Makefile-default.mk +++ b/firmware/nbproject/Makefile-default.mk @@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN) IMAGE_TYPE=debug OUTPUT_SUFFIX=elf DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX} else IMAGE_TYPE=production OUTPUT_SUFFIX=hex DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX} endif ifeq ($(COMPARE_BUILD), true) @@ -88,44 +88,44 @@ FIXDEPS=fixDeps ifneq ($(INFORMATION_MESSAGE), ) @echo $(INFORMATION_MESSAGE) endif - ${MAKE} -f nbproject/Makefile-default.mk ${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${OUTPUT_SUFFIX} + ${MAKE} -f nbproject/Makefile-default.mk ${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX} MP_PROCESSOR_OPTION=AVR128DA48 # ------------------------------------------------------------------------------------ # Rules for buildStep: compile ifeq ($(TYPE_IMAGE), DEBUG_RUN) -${OBJECTDIR}/main.o: main.c .generated_files/flags/default/73e95a3906d5ad527c21ed504f79c5c8b1cb86fd .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea +${OBJECTDIR}/main.o: main.c .generated_files/flags/default/c6de2f161d033435f41c81e929804a0e9e5ce12d .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/main.o.d @${RM} ${OBJECTDIR}/main.o ${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -MD -MP -MF "${OBJECTDIR}/main.o.d" -MT "${OBJECTDIR}/main.o.d" -MT ${OBJECTDIR}/main.o -o ${OBJECTDIR}/main.o main.c -${OBJECTDIR}/usart.o: usart.c .generated_files/flags/default/3198a00c36cd2cabf97b6a2e6fd4f9ae23b6066d .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea +${OBJECTDIR}/usart.o: usart.c .generated_files/flags/default/380f0a40d7a8a3863227362b3fb40d7d7daec74b .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/usart.o.d @${RM} ${OBJECTDIR}/usart.o ${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -MD -MP -MF "${OBJECTDIR}/usart.o.d" -MT "${OBJECTDIR}/usart.o.d" -MT ${OBJECTDIR}/usart.o -o ${OBJECTDIR}/usart.o usart.c -${OBJECTDIR}/command.o: command.c .generated_files/flags/default/d6ffb82d4abf5b2b0d0e0d3eafe99480876a605 .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea +${OBJECTDIR}/command.o: command.c .generated_files/flags/default/f6b89c25f653f1792d17764ea16a727ff60541c3 .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/command.o.d @${RM} ${OBJECTDIR}/command.o ${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -D__DEBUG=1 -g -DDEBUG -gdwarf-2 -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -MD -MP -MF "${OBJECTDIR}/command.o.d" -MT "${OBJECTDIR}/command.o.d" -MT ${OBJECTDIR}/command.o -o ${OBJECTDIR}/command.o command.c else -${OBJECTDIR}/main.o: main.c .generated_files/flags/default/2132e04ebfc4be3aa562cbc95409cc42446a34a9 .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea +${OBJECTDIR}/main.o: main.c .generated_files/flags/default/aeaafbf5cc5feb9171be2c1d22c4d07d6caa1f3 .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/main.o.d @${RM} ${OBJECTDIR}/main.o ${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -MD -MP -MF "${OBJECTDIR}/main.o.d" -MT "${OBJECTDIR}/main.o.d" -MT ${OBJECTDIR}/main.o -o ${OBJECTDIR}/main.o main.c -${OBJECTDIR}/usart.o: usart.c .generated_files/flags/default/7b1a4fd512e3b7c14c71afd05a45c40d2abbca1a .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea +${OBJECTDIR}/usart.o: usart.c .generated_files/flags/default/24149ae6f6dc40ee845e1f05ec62e0186d78a286 .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/usart.o.d @${RM} ${OBJECTDIR}/usart.o ${MP_CC} $(MP_EXTRA_CC_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -c -x c -D__$(MP_PROCESSOR_OPTION)__ -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -gdwarf-3 -MD -MP -MF "${OBJECTDIR}/usart.o.d" -MT "${OBJECTDIR}/usart.o.d" -MT ${OBJECTDIR}/usart.o -o ${OBJECTDIR}/usart.o usart.c -${OBJECTDIR}/command.o: command.c .generated_files/flags/default/46558d6f18ce5e594cf4f83207e5eff66606cbfd .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea +${OBJECTDIR}/command.o: command.c .generated_files/flags/default/212146ffeec991dab0cd32e3c2e8920ea8a6cfeb .generated_files/flags/default/3c9baffe5247e39035556796bec4b406c60786ea @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/command.o.d @${RM} ${OBJECTDIR}/command.o @@ -148,16 +148,16 @@ endif # ------------------------------------------------------------------------------------ # Rules for buildStep: link ifeq ($(TYPE_IMAGE), DEBUG_RUN) -${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${DISTDIR} - ${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.map -D__DEBUG=1 -DXPRJ_default=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -gdwarf-2 -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1 - @${RM} ${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.hex + ${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/firmware.${IMAGE_TYPE}.map -D__DEBUG=1 -DXPRJ_default=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -gdwarf-2 -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/firmware.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1 + @${RM} ${DISTDIR}/firmware.${IMAGE_TYPE}.hex else -${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +${DISTDIR}/firmware.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${DISTDIR} - ${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.map -DXPRJ_default=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group - ${MP_CC_DIR}/avr-objcopy -O ihex "${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}" "${DISTDIR}/avr128da48_web-serial-example.${IMAGE_TYPE}.hex" + ${MP_CC} $(MP_EXTRA_LD_PRE) -mcpu=$(MP_PROCESSOR_OPTION) -Wl,-Map=${DISTDIR}/firmware.${IMAGE_TYPE}.map -DXPRJ_default=$(CND_CONF) -Wl,--defsym=__MPLAB_BUILD=1 -mdfp="${DFP_DIR}/xc8" -Wl,--gc-sections -O1 -ffunction-sections -fdata-sections -fshort-enums -fno-common -funsigned-char -funsigned-bitfields -Wall -gdwarf-3 $(COMPARISON_BUILD) -Wl,--memorysummary,${DISTDIR}/memoryfile.xml -o ${DISTDIR}/firmware.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -o ${DISTDIR}/firmware.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -Wl,--start-group -Wl,-lm -Wl,--end-group + ${MP_CC_DIR}/avr-objcopy -O ihex "${DISTDIR}/firmware.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}" "${DISTDIR}/firmware.${IMAGE_TYPE}.hex" endif diff --git a/firmware/nbproject/Makefile-genesis.properties b/firmware/nbproject/Makefile-genesis.properties index 568b860..8bd9b5b 100644 --- a/firmware/nbproject/Makefile-genesis.properties +++ b/firmware/nbproject/Makefile-genesis.properties @@ -1,14 +1,14 @@ # -#Wed Oct 19 01:47:07 MSK 2022 +#Mon Oct 24 21:14:44 MSK 2022 default.languagetoolchain.version=2.36 default.Pack.dfplocation=/opt/microchip/mplabx/v6.00/packs/Microchip/AVR-Dx_DFP/1.10.124 default.com-microchip-mplab-mdbcore-AtmelIceScripting-AtmelIceScriptingBase.md5=482739504911ebc0014ce7a2f768600b conf.ids=default default.languagetoolchain.dir=/opt/microchip/xc8/v2.36/bin -host.id=2kg3-hvk3-un -configurations-xml=5627f737a42dab1ff1254b40735c3987 +host.id=2l3s-yrgx-1d +configurations-xml=9d0ba94753ff03fa1b025683d00ec6e5 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=6e02ca5e9f5042ffd365b42ab82d3a9b user-defined-mime-resolver-xml=none default.com-microchip-mplab-nbide-toolchain-xc8-XC8LanguageToolchain.md5=ab1e0737b447a24f7366e9fd8fe5a2f0 -proj.dir=/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example +proj.dir=/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/firmware host.platform=linux diff --git a/firmware/nbproject/Makefile-impl.mk b/firmware/nbproject/Makefile-impl.mk index 220b842..99d42f3 100644 --- a/firmware/nbproject/Makefile-impl.mk +++ b/firmware/nbproject/Makefile-impl.mk @@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} # Project Name -PROJECTNAME=avr128da48_web-serial-example +PROJECTNAME=firmware # Active Configuration DEFAULTCONF=default diff --git a/firmware/nbproject/Makefile-variables.mk b/firmware/nbproject/Makefile-variables.mk index 2087850..8b25acb 100644 --- a/firmware/nbproject/Makefile-variables.mk +++ b/firmware/nbproject/Makefile-variables.mk @@ -6,5 +6,5 @@ CND_BASEDIR=`pwd` # default configuration CND_ARTIFACT_DIR_default=dist/default/production -CND_ARTIFACT_NAME_default=avr128da48_web-serial-example.production.hex -CND_ARTIFACT_PATH_default=dist/default/production/avr128da48_web-serial-example.production.hex +CND_ARTIFACT_NAME_default=firmware.production.hex +CND_ARTIFACT_PATH_default=dist/default/production/firmware.production.hex diff --git a/firmware/nbproject/configurations.xml b/firmware/nbproject/configurations.xml index f040397..661630a 100644 --- a/firmware/nbproject/configurations.xml +++ b/firmware/nbproject/configurations.xml @@ -6,6 +6,7 @@ projectFiles="true"> usart.h command.h + constants.h - + - - file:/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/main.c - file:/home/sergeyyarkov/Documents/Applications/avr128da48_web-serial-example/command.c - + diff --git a/firmware/usart.h b/firmware/usart.h index 4d5103d..fa1e556 100644 --- a/firmware/usart.h +++ b/firmware/usart.h @@ -1,7 +1,9 @@ +#include "constants.h" + #ifndef USART_H #define USART_H #define BAUD_RATE (9600) -#define USART1_BAUD_RATE(BAUD_RATE) ((float)(64 * 4000000 / (16 * (float)BAUD_RATE)) + 0.5) +#define USART1_BAUD_RATE(BAUD_RATE) ((float)(64 * F_CPU / (16 * (float)BAUD_RATE)) + 0.5) #include #include