From 11b937437781008674552572ab2731405da1a0c3 Mon Sep 17 00:00:00 2001 From: Qukich Date: Fri, 23 Feb 2024 20:05:03 +0300 Subject: [PATCH] add com ports main --- .vs/hdlc_screen/v14/.atsuo | Bin 34816 -> 35328 bytes hdlc_screen/Debug/LCD/Lcd_print.d | 74 +++++++ hdlc_screen/Debug/LCD/Lcd_print.o | Bin 11104 -> 11052 bytes hdlc_screen/Debug/LCD/lcdpcf8574.d | 74 +++++++ hdlc_screen/Debug/LCD/lcdpcf8574.o | Bin 21016 -> 20988 bytes hdlc_screen/Debug/LCD/pcf8574.d | 74 +++++++ hdlc_screen/Debug/LCD/pcf8574.o | Bin 16452 -> 16396 bytes hdlc_screen/Debug/LCD/twimaster.d | 74 +++++++ hdlc_screen/Debug/LCD/twimaster.o | Bin 8344 -> 8316 bytes hdlc_screen/Debug/Makefile | 54 +++++ hdlc_screen/Debug/UART/circular_buf.d | 25 +++ hdlc_screen/Debug/UART/uart.d | 46 ++++ hdlc_screen/Debug/UART/uart.o | Bin 10624 -> 10572 bytes hdlc_screen/Debug/hdlc/client.d | 32 +++ hdlc_screen/Debug/hdlc/client.o | Bin 14664 -> 14608 bytes hdlc_screen/Debug/hdlc/hdlc.d | 17 ++ hdlc_screen/Debug/hdlc/hdlc.o | Bin 21768 -> 21716 bytes hdlc_screen/Debug/hdlc_screen.elf | Bin 62208 -> 61776 bytes hdlc_screen/Debug/hdlc_screen.lss | 15 ++ hdlc_screen/Debug/hdlc_screen.map | 289 ++++++++++++++++++++++++++ hdlc_screen/Debug/main.d | 41 ++++ hdlc_screen/Debug/main.o | Bin 12364 -> 12308 bytes hdlc_screen/Debug/protocol/protocol.d | 29 +++ hdlc_screen/Debug/protocol/protocol.o | Bin 10640 -> 10584 bytes hdlc_screen/main.c | 5 - hdlc_screen/main_com.c | 185 +++++++++++++++++ hdlc_screen/main_uart.c | 110 ++++++++++ 27 files changed, 1139 insertions(+), 5 deletions(-) create mode 100644 hdlc_screen/main_com.c create mode 100644 hdlc_screen/main_uart.c diff --git a/.vs/hdlc_screen/v14/.atsuo b/.vs/hdlc_screen/v14/.atsuo index f74bc15ca8c42cab136bf2bcee4bcf1f71562f68..638c5df3f9404b9f7e7d026e4db081f941c0f926 100644 GIT binary patch delta 3238 zcmc&$eQcBE7Jr_%AA3jNLbrBfqxlc$&Uv2G-}9XFys?u)>{;QYrCeZH(l91Rkt5$;SXdyd46I`Hxsj7RAp}-- ze7E&~Z~CtCe3~hRX`U#n@XIMUlA-QB3QUDan*6?JpuzrV=vw6Co;0fgAmhDOrC>rb$b_jyno*J<5p? zC_*kqUX4t-Q4WL>?VV%7f@A}ZRq*KwtwdT~)(S6*I(U0UiI{VTkK{)6W}NNFdTgN> zC{Y>ry3x{`wf5n-8~I`6e&jvK1IT-k_aWz&8_LSVIF4lH(d;;u9dDoNJ&@3B6OE{2 zY75XSGx9EoNImd@%*tJm((IH7QkoRdJcYscp|zQ{GAG->I%!0Z^e|T?m#D^a^-h^WY?E9#Af&-W5h;p@)>iI9gH3?x!fEb=RK-rX zu-XnWty9gZ!)6>au5i85Eh*7RwV#XUwGc66s;3504M({VB2}mhRyAD-3o_9HaO37g zQ9I1fNCh8m^-P~GwC_@0`s}a&JTD6|>RH7IOBjI(W&*PR-N1{sKwFVR^WmuvZhc|h zedX#z+1qD&<|Aof!Zjy&dg;4PC&R`Q-0)a%xM^^FEZ`jud4oRRSr&K%c5%W)^XGrJ8-`~QFc?7y{NMR&{`5cfXx{KtQm!>O1BxXvzfG8cRjFD)q9 z@^Vdgi~efjNz=EV|7G9ybovC=Ah|iwjSaE@UY0R7%*OG|Jt*N-!IL+mZnVEv^tT-y zhu{0xe>}aL8vjkdGzW8bOq5-asKL{7lmi;Bm${`{G#Hi`6?D$uK-79z{Qyd)>;w7J zXxH2o?Ym-(moGVQ6nVlBzV~4((ubYA(UvD9EEgo|uRlsY_Cv19Os;Tq^>&HgFnU)P ze`a{?Zjm0IoPjq(YHgoLZ`-2D29eSiKx4E?^xRUdE>4v}#JE!;m0smVvp$(J9_5@` z!BI|yzrf3rsk&|fV(aCFWxcuI*e`?YbjE-#BzrQaU3i~F^ec_;g z@{tC^M94c84ERSI4E=bC(9L0k_H`!hXiJNy+1q@-wXMnKv$VDiHSCA?P1=fWp3r#M zGaB&SGqm}R&>D?O&5^mXKxgflkgjDw))P^XfG8uz*3kq%i*HA70*QkvC*EW*De0RvyBbV zQU52{X}9K4!6Cs@_BQA+TQpHDwodjKmf0|C!U6y zXzYPYjt%@vh&NWt@>nq(aug@uYoFkJORnCNbq`ng8!?A5tg;X`{s6XsXnJ-79J1?icY|u+G8G6>Kd#c8 zh@0Tk*&^9`*GA}w$5ix{K_41&_8i1rez-lLgg*|L_-WE)*uvmlr;VQ>ZPkw(TC8h* zva-v{jqYo*V(RlbqPK{UbKP^hRq7=T z)jVzn-d|C$yv=5yAU$p-_}X0#&+JjbOUKJW>Mw&gyH)VYY!Tc#rpKQLFU*$1 zwE-gph6>=uu}yGf$gVcKHV(S{p@RWWbhz^^`@8|f`i}Ic34NXr8%&0?F%jnCC*jo@ V3(Os#llj6wX|eG$!|IG^t4+Hdl>Wi`1lzX??_|rfRL)7%aH)QGBcvagl&l!H6yt z6xtkj?p(Q3x!_I^>P}G?uH3ou4>Z^c8ow{;l(s11&Vi4aIdjjMbG~!V-0~x%JZVfO zY?mHEm&=Q_0)EzNHHx`@QFx}L=DA{RI(P5V#m{ObWZAGx7!&HaQ#ArgS)$x+S*W|9 zRtsTXJ-_C@32WM0i`fsX0@eUwU>(43x-m}`PPOmAoB#%Z9-tRU0XqTtK)DB>csXn-Go!_@$jsjB!d#5=s z^I-M?%|IK_4y*?{fEbViHUJxeO>*D8Ri69Z3O=2*h9Eis90VZvTJaAx^E!f&b7u4r zx$Tei(-OFSwJ&JpS5!m z4s^<7;Of-)SjEg)^>pi$NMS`>?Uj-_D$_<%?U8C@K--MPonF1bi@PmaoM=Y1M?97{lV767huRm-l_Dn;qq3C7GUn-gCm{7Z=+A%7* zXhzC0@ataospkj;51qMClTnFITlJP;t!f`+CYo<(x8x+(lBx6znQR?h!}L>%J$cJT zEjF0eR9#Z-$(!8jzN|;RO-j9wC78aTqEbrVQq59L*G#tT7{F2Kd}Fc(Sku~?%p}Sl zvggS4Z6lUqdGd^dX1y5*I*q^aF=Eme{WjG7AwhYQ@$hNT_M{j?Ov~Alnb>g|+MZDD zQnDLW*(OyxZ?Z-Cs%Ul9Dy0phmg1gmtL0wyc)}&$lOra{Vq5Do&^YGPeP4Ht44&}u z_0r!cvWJUXj!7_;k~c=eDaIeDO1ik1O%-ygeMb!$j|@n;J1YspE#*vj34);%_HKEX zxg%C6S+P+ZHg2MW3%4x|^VXlDvKmoA6T>YkG~i^r?;7=_E)Hl(5^pS|tQRHBT=VJC zS4%OTXV*)4+%2>5x0YgeEY6UJoSQNi`QX#dLDEpLA1uW)T_Tiv_%gYixxV3lVnyj- zUMr`Z?NUzH+4nJda;QVz-(D-n!af;4RlgnAHGWlI89d!DukP$sDN)z(8ea*>`7Plm HXS#j?%26y8 diff --git a/hdlc_screen/Debug/LCD/Lcd_print.d b/hdlc_screen/Debug/LCD/Lcd_print.d index ff5c8f2..6bc7f0f 100644 --- a/hdlc_screen/Debug/LCD/Lcd_print.d +++ b/hdlc_screen/Debug/LCD/Lcd_print.d @@ -1,4 +1,29 @@ LCD/Lcd_print.d LCD/Lcd_print.o: ../LCD/Lcd_print.c ../LCD/lcd_headers.h \ +<<<<<<< HEAD + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\compat\twi.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\twi.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\pgmspace.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h \ +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ @@ -22,10 +47,58 @@ LCD/Lcd_print.d LCD/Lcd_print.o: ../LCD/Lcd_print.c ../LCD/lcd_headers.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h \ +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h ../LCD/pcf8574.h ../LCD/i2cmaster.h ../LCD/lcd.h ../LCD/lcd_headers.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\compat\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\pgmspace.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: @@ -71,6 +144,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h: diff --git a/hdlc_screen/Debug/LCD/Lcd_print.o b/hdlc_screen/Debug/LCD/Lcd_print.o index f7cbbd1c84c0711e4c5f0138517f5c2199497f94..111ed77fa360ca75eb5287632cafe2555ddf32d0 100644 GIT binary patch delta 512 zcmXxeJxD@P6bJBo?E@`eq-l+5A3UEq6f{|jAs7@m6hdHusAOOzQJO8*&|*t+hJp%; zmV}DZp@xQ*hQ_u=iHL@_riP&Z<(=;EzrTCW;cyzU%h?x^GG=zegX~dw*mOw*@fhR60vuwe;0QYdPqDY)d1Wlu z2`Aa(@FH8yDJo;>09;~Ez`N{Ccuz*mrZOHCE*!!K>{IxJeF2}dZ{RBX9=@tS4IEkI zBPH~x<=ss+Juf|E_@XjQMdSlL`wDWBLPk_>Q^kl{zWV6R@XH!${(d=4BYs_$X%6Y2 c9b}lQ$YXjz2IvQwA@7jh^6C=elg^x7fB7djl`d-+@$g+*q*4PjGCX5?S){`Pu zF3LfEG@@MWNP!1f$^WFFP1AGooug~Xs_k5lsPreg)@0b7IbCcqz*b)aYx| z5`M!gS?LU^uF|}&+MxMBb+u+Ex{31L^;I`3QWAGFM>GF7r>=vZweW7$ljW!?+~t zELJ#{9J~m5y9wSUBVU0ZN#r+RbBNpx!&ntaV!el~LoA=PF=i`epBzTM2Osz*)G=0s HOsnY+uk&r@ diff --git a/hdlc_screen/Debug/LCD/lcdpcf8574.d b/hdlc_screen/Debug/LCD/lcdpcf8574.d index 5154933..6fcc597 100644 --- a/hdlc_screen/Debug/LCD/lcdpcf8574.d +++ b/hdlc_screen/Debug/LCD/lcdpcf8574.d @@ -1,5 +1,30 @@ LCD/lcdpcf8574.d LCD/lcdpcf8574.o: ../LCD/lcdpcf8574.c \ ../LCD/lcd_headers.h \ +<<<<<<< HEAD + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\compat\twi.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\twi.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\pgmspace.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h \ +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ @@ -23,10 +48,58 @@ LCD/lcdpcf8574.d LCD/lcdpcf8574.o: ../LCD/lcdpcf8574.c \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h \ +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h ../LCD/pcf8574.h ../LCD/i2cmaster.h ../LCD/lcd_headers.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\compat\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\pgmspace.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: @@ -72,6 +145,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h: diff --git a/hdlc_screen/Debug/LCD/lcdpcf8574.o b/hdlc_screen/Debug/LCD/lcdpcf8574.o index 1a577c1ab01a449d58fcae69f9a257ae5527d57e..27e9af2a6bbe313308520a3e8d6bdb25614959c3 100644 GIT binary patch delta 2047 zcmXZcduWbP90%~{yc@Q;4ZE4;Wz$SnF0n=n1EW-D@=lj(AJD=Zso^zgadCqgVX?o~9?$(}pt5uX3jDV{9~ zKL(AyoqD-1%F{B(cR^;8%W^u(7I`Adt9(8?%0_Zi71L4Pkpn2(<$RQn%x!aeTo6OMxS>3__}sgb$e4K$8!hz-svVS^@_4Vq;(xJ?td+GMu9FY|?c zB=ffSw7vnKWZvH;^I89V*nfWlgewB)n`T7 zBMKlnuZnr_RT|UcNN>s<&>firYL_|thw>=+EsZZG+kTMQwo7K)?=mM4>Q*uaNinX?}!bM_PDEO@Fs3(k=P@NCZ^Cm%_!DuQsKTml!%{D3Tx z%ixvrdU&n872YWCfUD$PFyC@cY(KnDu7wXorg;^0NDiyw7<^oAfKRnvm=n>*G}()} zuBo*>h&Sx~JlDLn^?9!ESGxU@S72i8w0zfO*c!xq`vS4pj$7cGGFyds*R~@*w!;ft zQ*PHF*4b-_VH@pkF_CsR;uYKDx@NVVA9T%YTOS;68f{xJ%~aaY!LeqO9a1>f%(T-G YE9^4FqqYX|ifuu>YhNHPvSwl8e`3tvTL1t6 delta 2101 zcmXxkZ%ma{90%~{fESqMzqrvAL9f8Pl(?WRa7-Pot2BZ8TxQF`?G9i#ZU1#Bi zjS)84(8JVRE;d|ChniuzMO2$DdqL#fYRskMg)7E#bGlkiTz$VhU!ND}e16Y)&hwn# zInOzB!{)?kGY~Y_F0Q`hPrtmtaZ;RP_IH0E|E==6me%ICTX!}EcQ-V~+k%Dr*Oxw9 zx3j$|-dNYx-m$Bpd34U-o<7=~vs+2u!h4eANG81;32pD$XEU`h?;sBg(()VJko)U$E~^suB2AB;cv<`|gnVmPv9Nf!tHe4xlf5+$mfU92SJNMBz zWB8tgoWcEfPysXOk@>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h ../LCD/pcf8574.h ../LCD/i2cmaster.h ../LCD/lcd_headers.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\compat\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\pgmspace.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: @@ -71,6 +144,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h: diff --git a/hdlc_screen/Debug/LCD/pcf8574.o b/hdlc_screen/Debug/LCD/pcf8574.o index cd5ea5f12b7e0c9e30df2d8fb9027e5fe3a50ace..7e76237ffaa4a248699a4996e8ea7a682a419fe1 100644 GIT binary patch delta 1237 zcmX}rUr19?90%}orW0AZW@?OP?W)zRXq7C9{WHvm1;cA3K{BI2`y(?7w7pEWdMcO@ z9G`mdG3=oSS*}0XXE*15C zOXrt5Enld&PAQjKQHc7F*P}EJBsv^El0G%4#-o`_(^C^!Q}y+FGc(iIvi~oYtG;!2 zxw3OHPv-2-0`V=&@$;;v>(pX9q=96lK$^9>4HnN6kZTx`cmu> z-2j(qDX>gSfeO6`en}sN-_jBIJ$(-T02iddD3UL{aS{GbUxt6slkhM4I{cf?!++@_ z+=AH#u_t7CJ7`&qRpcwOy|Q zrWze`tp`jvHl!^x8?*IQ^BOU2cE@e4%oJjiSw{4m=7gy!)9O7)+sZC yIA~UqhjgF$ne5gP)7~G_Ig>yfH4}&>Gl#g>Jgxa7V%E4%hTLhif8KoVZ~X^*DvL(| delta 1312 zcma*m-%FEG7zglk))ZN0ZyI7bbj{kE3`z`y zQ#V0i5EhabwV;A1h+PRm7j{?FMG-*;5d`H;-^cg+2egZa&-0#h-se1L=bg&xd{$3; z^pi)MJXT}hDy1B1St07>5|`5WA<@C$uBHQV)fG-&NDcRI)+zC0}J{j={B?BW{2Bteuta&Npo<2LeH36h!f@uV#w@i zNa(n^ir8Y_Ax@bsk%azkMk5#XHM0a~O(dGo>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h ../LCD/pcf8574.h ../LCD/i2cmaster.h ../LCD/lcd_headers.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\delay_basic.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\math.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\compat\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\util\twi.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\pgmspace.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: @@ -71,6 +144,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../LCD/lcdpcf8574.h: diff --git a/hdlc_screen/Debug/LCD/twimaster.o b/hdlc_screen/Debug/LCD/twimaster.o index b8e0201a6ca68bcc94ec93a828e33c9ffc6328fb..95ff637baee788c1461e5c9a0fcbe71f0aa219d4 100644 GIT binary patch delta 1085 zcmXZaO-NKx6bJBopBnU18$T$sX=eOjMr@c+3M4eFEFy*(7cEL!C}dEKi^S-IV#r#! zh$v1$WK@e;M2kX3grJQONCZLDszneKvoyWk$=W@I92S?ngy(cGTrY1|(e|6_;t25zfSia21Ap*u- z{P|7mbaAZn^^uq8hR7f2#>fGx`OT4s=vd@wx+(H3Qd0ZR$+gHgBbOa(JmN%!EAj^9 z7c$o`$*l28-h#X$w@q8}fqt2nHy}5ozT2lsD?B2zvx3|PACuYHn9R;52uQL8$ zc0V=Y75$R=j{nHba6^E_`p{Zr7T6|pZMV!CJ7wNzpWF%Wk-Om|bd2|pQCOci$CI9r zx#_sf1D%$+=~3K5@Yh+NDI%$L&p`7<_NB_GGWG*r8+>esm_8@#A&}F>Nmq dkJ}f-tZhtXeBSy}nc#P5W2v<7v1_TV{{a;?aXJ71 delta 1124 zcmXZaO-PhM7zgl~%`I5d{MgE@{m@ERlNCa0i6}L*h_y8$GS~<)vjxS_T?#yG9U?D6 zFiAogfkbrZ3o-gQEI}UXq^B+&!YJra(ZNF$)&KANf5GSZjqkqC%ri58TBq8sNA1GX znp^(%S3YBWX51j!-=zU#@nB%%@#f@#4%4?MePLvHV5D~_dM-2AKN^i)O6+P#_hyIs z2h*e3+}X_V>?eP&X!c~_SRg;iF9Qg89^=mzuh8s9NxRnbB3d(kU$oDe;G{6nrqUY29X z1`TkoCUA|-dxM=Al;}kQ-YD;d!*VCQT|NTukdtt;d=ze@(G|NqB(s4onVWZ9uE6}} zlmoaai}@gu!p$8&NkT#(!0 zd70h6mAl~&wC=}}%*WeKM(d)*Wlqo{^V|J0 z=jfEVqe;0I?v}T~eRLW3A5UgwU<_B9m05I5=7O%sEP7SuF-_6B?RR9>c_6dS6Pb0M z$*l8owx-IhvLD^t=9G;&|CW>;cP9{UxO<3q-7?~HcQBN)Z`>r}g8Ll0XnWl0aLOj! z!*I%16m);Xjke$#B3tpJu1LKdb2-E|H;tHe^N5Gtw@AJJ{3c@t-0M)KYl@cng2irM Pw9emwgS+j1R#*N9svChv diff --git a/hdlc_screen/Debug/Makefile b/hdlc_screen/Debug/Makefile index 8fbb4dd..77f097f 100644 --- a/hdlc_screen/Debug/Makefile +++ b/hdlc_screen/Debug/Makefile @@ -129,77 +129,121 @@ LINKER_SCRIPT_DEP+= hdlc/client.o: ../hdlc/client.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< hdlc/fcs.o: ../hdlc/fcs.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< hdlc/hdlc.o: ../hdlc/hdlc.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< LCD/lcdpcf8574.o: ../LCD/lcdpcf8574.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< LCD/Lcd_print.o: ../LCD/Lcd_print.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< LCD/pcf8574.o: ../LCD/pcf8574.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< LCD/twimaster.o: ../LCD/twimaster.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< ./main.o: .././main.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< protocol/protocol.o: ../protocol/protocol.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< UART/circular_buf.o: ../UART/circular_buf.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< UART/uart.o: ../UART/uart.c @echo Building file: $< @echo Invoking: AVR/GNU C Compiler : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DDEBUG -I"C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include" -O1 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 @echo Finished building: $< @@ -229,6 +273,15 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES) $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP) @echo Building target: $@ @echo Invoking: AVR/GNU Linker : 5.4.0 +<<<<<<< HEAD + $(QUOTE)D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="hdlc_screen.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mmcu=atmega328p -B "D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" + @echo Finished building target: $@ + "D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "hdlc_screen.elf" "hdlc_screen.hex" + "D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "hdlc_screen.elf" "hdlc_screen.eep" || exit 0 + "D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objdump.exe" -h -S "hdlc_screen.elf" > "hdlc_screen.lss" + "D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O srec -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "hdlc_screen.elf" "hdlc_screen.srec" + "D:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-size.exe" "hdlc_screen.elf" +======= $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="hdlc_screen.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mmcu=atmega328p -B "C:\Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" @echo Finished building target: $@ "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "hdlc_screen.elf" "hdlc_screen.hex" @@ -236,6 +289,7 @@ $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objdump.exe" -h -S "hdlc_screen.elf" > "hdlc_screen.lss" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O srec -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "hdlc_screen.elf" "hdlc_screen.srec" "C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-size.exe" "hdlc_screen.elf" +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 diff --git a/hdlc_screen/Debug/UART/circular_buf.d b/hdlc_screen/Debug/UART/circular_buf.d index 322208c..7115b76 100644 --- a/hdlc_screen/Debug/UART/circular_buf.d +++ b/hdlc_screen/Debug/UART/circular_buf.d @@ -1,4 +1,28 @@ UART/circular_buf.d UART/circular_buf.o: ../UART/circular_buf.c \ +<<<<<<< HEAD + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h \ + ../UART/circular_buf.h + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ @@ -21,5 +45,6 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../UART/circular_buf.h: diff --git a/hdlc_screen/Debug/UART/uart.d b/hdlc_screen/Debug/UART/uart.d index 921522d..df51e53 100644 --- a/hdlc_screen/Debug/UART/uart.d +++ b/hdlc_screen/Debug/UART/uart.d @@ -1,4 +1,49 @@ UART/uart.d UART/uart.o: ../UART/uart.c \ +<<<<<<< HEAD + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ + ../UART/circular_buf.h ../UART/uart.h + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +D:\atmel\7.0\Packs\atmel\ATmega_DFP\1.2.209\include/avr/iom328p.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\portpins.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\common.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\version.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\fuse.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\lock.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\interrupt.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\io.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\avr\sfr_defs.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ @@ -42,6 +87,7 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../UART/circular_buf.h: diff --git a/hdlc_screen/Debug/UART/uart.o b/hdlc_screen/Debug/UART/uart.o index 5b6409f97608745b51feb5b9abc9bf9cba418790..34f763b0bb3dfa2f4384f77c8113c12f94e62ccc 100644 GIT binary patch delta 673 zcmXxiODIHP6bJC{+>qvazoOJIG4~ENN}~`m8+l~LGaDA;RT#S|$zm*IWkF}5u#uI8 z1+%iEl!%1|D_O9SP-Nv*{@>i=Tb%Pd_ug~9d%x~t|7G858O8R?4_x*ODP^cDg-G97 zE=5=<$nUQi4E7DE@y6juY<42bQPbjPGb8=~!cNpoA(fcPUdxT&=?)hHRw~-bbR5*q zaJ-|P>G(oB%kd+UTY6u`X~-X9-To=gLH-pNBWGid+f;Ftj-t>hRFQr_?16n^KU^aY zz;)slxIx?wcWGnSQn**F=M0If;1O{xJVtS+K@Xjh8+vF=+zBs;2jFG#D7+$`gxAH> z@TPbP-qXg(Rlo_c4IhdF-6)QvXoXM2FsR)~6->}unU*l&C2jC*a1PIw+M jmA4V=`5bYJ-w}Jb#Ajh(&}S7N=c(kMhi#J!uaR7Tc4u9B delta 719 zcma*jze`(D6bJBouNWk$sW#O*7!nhG??q`86%mzUDJi0ufSN5uq9)dw5b*~(8HIq8 zARZi?>L_k$+N~}kP6l*z)J~mTbWk(&dwJ&%=p7E9^X@z6-g_=5wkG%d^0?UY!}%$o zgiyjE5#@{9DI}H%IEC2j@s9&cYhhcG+Iner5YcyVkbEO{Lqm7vFtc8)Q4M z6=Li1PIevK!)}5j+Afh7HAu$nL^Q&2b^xAchv5{v7hYt4fOG5-cv~B%Hp4q?-Dj8G z4imc@K9qU8KsWu)8@lNUdlW9Rr{Lf08TgEyhRf`4@HM*t|Ix>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../hdlc/hdlc.h: ../hdlc/fcs.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: @@ -30,3 +61,4 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 diff --git a/hdlc_screen/Debug/hdlc/client.o b/hdlc_screen/Debug/hdlc/client.o index d2db73cd983528c54357b33e20928043c13441c5..50cde8e18c4bdf7fc9dd7ca92cfe1735bac0cda0 100644 GIT binary patch delta 1167 zcmXxjUr19?90%}oZZX!9<-(lp!KTD!GEHsnPehRrOoB!b6tM?aMj;9!qftn!Uh1J@ zbR@_Jlc)%iXbfrvMfPNS5Q@>mo@RvfFrCD)@_ca= z!!1vDubwdIf#>Kj{DO|aAH?_x zWYPsX058%9;R-zfSLxGmjXnb})0g2ooRdkfAXw$VJ$Rj-f&b7i;mtT2`Th;;qCdlK zx(>IAaX(^kkUju+(NfSpI)n99oPktyh`t3Mq4V%jT8cYPPs1naSvXBUhtJa`c#M7r zXX!G0?VoY}iwJITpaS2ftFWPK@O}C#{DA%rKc-jUXY?vupx5D7v;(L4mUhAOgAC;6 zR>b@}RcV~Is?l;umuVkdr(5A4R&l1cZG`Y}K0EMMBDaDGGZkkoBNbOVErt(F$Bb5JiP_ z!2UoX1yNx|86`n`sRxtj9~D$Sq(lXkP(36C)%Vx^`rdgse17+w-#x!`&%L)lJ(}(h z=;`ZA&bilzok}@Wp+>KN<-3$dQ%dPbWW~;=wv&7FbL9xGm! zY{;}XwT}`bW=97E%(*K(m9^PDVEpPZ|;pIiy60DcjbP1fKOW{Vk0&bzB zaE}-pkRp0%DdGSv`#DTY-N$s+PFRRwPzEqVk}uG+;UQX*Z_u)X5n77Q(LVS-T?CKO zLHG$Rn|Vo>V|_KwU?n_B$KdyL9G({A2;`=}=@2{%)ynm1*hSaCZn_@!(2cO4-U|oe ztR(j$DCNKa9HGy`G5QuQDhn&ML ztD;VQ)0~QR>xZVGvRl71hbrszsCk8c$dtwF^oZFL??(R>-fz|=>Ky*%=6IsqvCL_5 yiJ%@g6N#{%GIOl3LwQZq3OQn4Q*VXzMbl@6k#h;XWu97L@5#kV`B3#to8e#b!KE?) diff --git a/hdlc_screen/Debug/hdlc/hdlc.d b/hdlc_screen/Debug/hdlc/hdlc.d index bbe987e..f5a6c9e 100644 --- a/hdlc_screen/Debug/hdlc/hdlc.d +++ b/hdlc_screen/Debug/hdlc/hdlc.d @@ -1,13 +1,29 @@ hdlc/hdlc.d hdlc/hdlc.o: ../hdlc/hdlc.c ../hdlc/hdlc.h ../hdlc/fcs.h \ +<<<<<<< HEAD + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 ../hdlc/hdlc.h: ../hdlc/fcs.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: @@ -15,3 +31,4 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 diff --git a/hdlc_screen/Debug/hdlc/hdlc.o b/hdlc_screen/Debug/hdlc/hdlc.o index 2149b2472be6314bdf85ca973b540be66a02bb54..94187cc87ba7dd6bb774f7c90bb07f9b3831494a 100644 GIT binary patch delta 1778 zcmXxkT}YEr7zgn8yp3ft%}h*9bf!%6Vx~!$fmn%&iPJg4$|6fc!bn6kBwR@sA`#Ik z2@6V*${@(5P+=BP^aX_=6=f0T#Y8f!5u{!8e|-PF7w7#wJ3C*`dA6=wYGP2GbE=}D zl z1lFc}PxXJ1A>nB7I51v0Ea!_OEFTm{TJ9IGw7e*evYckZt1NF3M_cY*2Cue!LmXo{ zh*xsB;a`g8tiZsDj1Vo~Tc8v0Hn1257)hXwcEYh@ZaR^cdDhV~PX;aXxM`UuM`3*# z>_ku`9XK&IZ=jgw1h_)mB3v?K4;AbY;lAp7kcEJw10FI{pUN(?mFPb79MCV(M(KIqntu)5%?AJg delta 1834 zcma*n-%FEG7zgn8yqe0;G959))=J%Sfoa7M5fS?(6;8Ji5kr!urEF+vD`c>eC@(~+ z(=V!vii(PgLZgThiHhhK1sPu0O$8-|L0K1B(D(8E{sFxgXP<}jo?p*--o3f3datO1 zF17pSg0j37I@K^tBVD0YQ!{Ob!ebbQDk)jAEfU>gY^ex$>}cP*qbcTUX^l2_x)$v& z_Z5emx?;`IaA()fNNc<9&RbUSfA4t)#`0|G1D{=A3zBxMqik3UPmMU!a)&s}@(J-w z%cJ61mdi{y+wvyyY|GolIhKc0;9Se^#CFS0%roC+B&VZ7D=?4+!%NG1rSx3bM?2vP z+6Au{bJGD@=GjQgJdL!>6QO0EZ3^qlU>AaJ>A;Dxd1DVPiP=vtg!^bWe2}h!&xw&C z8GDINgRj$)yg^zLbC<%$W`+B`8FY#SU2@mo9sAA>*9r{M|uJUmGc!oTTz@C-Ea+E1=rHaIs|nLLU4$V!;SPlI6@zT+i9uvI4#wkpryKdXesVq z`U%`mzlD#a;Ql2QV+c;N<2`(a{tjQHf5F%2RHSo|cENY(_3$$>{%|soq1Uuj{s=9_ z{#k67!pHspU?9cymzLs6Pqki>;+joY!wxzCJL%1EAsvOibT?c|_rN~753Up^v5S)k zR**V7~1FhKH5>8Rqr=5Ji4(yuFCaDyYZpu^`nMeX7*xT6^N^=`c}Yi z=C9Cc!8+5iQf~-))p5NySYT$X(ieknHLhO-J?e}88T6R>3$!!jHtp;5>X2I{bS&gi TNA%H>{4Y~gSsLR{k diff --git a/hdlc_screen/Debug/hdlc_screen.elf b/hdlc_screen/Debug/hdlc_screen.elf index ae2623fa9a9cea7e9c969045616632b00ab1a73e..a459b27cd879dc89e90374c3bde8404e186c9b7a 100644 GIT binary patch delta 855 zcmZp8#(d!s^8^K^74J4GebQ&tm@I0rgejk8vV*zO<^^6%jGONp#M7v13_FnbD&1%o*xWCw?R6c6@c7u z6$S>uQy{JjNGo&C0Y<@NAg(J!Zv&IyN)R^@WDRpq6O$m@a}YmeGNYfkj<`G6#1G6O zsYOK$j8aZO`_=+Y6qVy=U~m9pHx{7r>p&V*HoN$_G77kdgLOP$g6Qy?JkwvAF=X>r z|7XlhrQ%SJ>u-J+ypxG(uH@#GVZRuerb|J^`8HpT=#pgr2=XJt!^sm%B{@>8ViHSo zQ*$Oa^co{`)Hll)Z(?GP1=`QVa1p=K$@0b0o7a@>VP>BLR$dKMF2dvE?81O-`sTY; zZY=EU7(oU;!>R(sez2i`>-iYjjhI1Nj$+edG`YT!4OyG<=G%>PnAjJ9eVB_)i}B_+ zEnZBjrC=4BAlESd=Hp^u1Oi~-GwSK->!COs*>rWFqogMDcC2M&+Pu3%i;-OgY|0go zJ(IdPk(HtbCfGAax+YO%^p+!nBlSvV*zO<^^6%jGONp#M7v13_G8bD&1%o*xWCw?R5R6oA}t z6$S>uQy{Jp&VbH@o<`G79*FgLOP$g6Qy{JkwvAF>>=( z|7XlhJ0+kV*WdgucqbE+xb)_gVZRue1ZAM&e4DREbV+ikGXs6hAkH}XVwdpb{8Cos zWUH8hqWtut#9W26%$(F>1&s;|GtHR9lHAmsnBtPsl+66e|4P*-uPfpqQmxZwmg4D5 z9Fu|0XJTNdnN6GjmHuO9-ww8A+T;seBI-WQE(|1iXLDGU8wU5*ncSK&r6rj;Bzf#b!yG2|-JsOW&_RZkJe%(|dogjW1{)9$4jENF zQXD``xBwHC>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 CONTENTS, READONLY, DEBUGGING Disassembly of section .text: @@ -2252,10 +2264,13 @@ int main(void) { e8a: ce 01 movw r24, r28 e8c: 01 96 adiw r24, 0x01 ; 1 e8e: 0e 94 53 00 call 0xa6 ; 0xa6 +<<<<<<< HEAD +======= // while(true){ // if (!flag_connection){ // } // } +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 hdlc_connect(&hdlc); e92: ce 01 movw r24, r28 diff --git a/hdlc_screen/Debug/hdlc_screen.map b/hdlc_screen/Debug/hdlc_screen.map index 4d6d650..91bccae 100644 --- a/hdlc_screen/Debug/hdlc_screen.map +++ b/hdlc_screen/Debug/hdlc_screen.map @@ -1,5 +1,37 @@ Archive member included to satisfy reference by file (symbol) +<<<<<<< HEAD +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + LCD/Lcd_print.o (__udivmodhi4) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o (exit) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + hdlc/client.o (__do_copy_data) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + hdlc/client.o (__do_clear_bss) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strncpy.o) + LCD/Lcd_print.o (strncpy) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) + hdlc/client.o (printf) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(snprintf.o) + LCD/Lcd_print.o (snprintf) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) (vfprintf) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen_P.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) (strnlen_P) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) (strnlen) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(fputc.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) (fputc) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) (__iob) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(ultoa_invert.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) (__ultoa_invert) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) (__prologue_saves__) +d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) (__epilogue_restores__) +======= c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) LCD/Lcd_print.o (__udivmodhi4) c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) @@ -30,6 +62,7 @@ c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/.. c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) (__prologue_saves__) c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) (__epilogue_restores__) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 Allocating common symbols Common symbol size file @@ -38,14 +71,23 @@ uartRxBuffer 0x22 UART/uart.o pcf8574_pinstatus 0x1 LCD/pcf8574.o textCounter 0x6 LCD/Lcd_print.o uartTxBuffer 0x22 UART/uart.o +<<<<<<< HEAD +__iob 0x6 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) +======= __iob 0x6 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 connecting_frame_timeout_bf 0x2 hdlc/client.o Discarded input sections +<<<<<<< HEAD + .data 0x00000000 0x0 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o + .bss 0x00000000 0x0 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .data 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o .bss 0x00000000 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .text 0x00000000 0x0 hdlc/client.o .data 0x00000000 0x0 hdlc/client.o .bss 0x00000000 0x0 hdlc/client.o @@ -113,6 +155,125 @@ Discarded input sections .text 0x00000000 0x0 UART/uart.o .data 0x00000000 0x0 UART/uart.o .bss 0x00000000 0x0 UART/uart.o +<<<<<<< HEAD + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .text.libgcc.mul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .text.libgcc 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .text.libgcc.prologue + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .text.libgcc.builtins + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .text.libgcc.fmul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .text.libgcc.fixed + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text.libgcc.mul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text.libgcc.div + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text.libgcc 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text.libgcc.prologue + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text.libgcc.builtins + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text.libgcc.fmul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text.libgcc.fixed + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text.libgcc.mul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text.libgcc.div + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text.libgcc 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text.libgcc.prologue + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text.libgcc.builtins + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text.libgcc.fmul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text.libgcc.fixed + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text.libgcc.mul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text.libgcc.div + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text.libgcc 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text.libgcc.prologue + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text.libgcc.builtins + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text.libgcc.fmul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text.libgcc.fixed + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strncpy.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strncpy.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strncpy.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(snprintf.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(snprintf.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(snprintf.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen_P.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen_P.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen_P.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(fputc.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(fputc.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(fputc.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(ultoa_invert.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(ultoa_invert.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(ultoa_invert.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .text.libgcc.mul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .text.libgcc.div + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .text.libgcc 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .text.libgcc.builtins + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .text.libgcc.fmul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .text.libgcc.fixed + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + .text 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .data 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .bss 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .text.libgcc.mul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .text.libgcc.div + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .text.libgcc 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .text.libgcc.builtins + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .text.libgcc.fmul + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + .text.libgcc.fixed + 0x00000000 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) +======= .text 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) .data 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) .bss 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) @@ -230,6 +391,7 @@ Discarded input sections 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) .text.libgcc.fixed 0x00000000 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 Memory Configuration @@ -246,7 +408,11 @@ user_signatures 0x00850000 0x00000400 rw !x Linker script and memory map Address of section .data set to 0x800100 +<<<<<<< HEAD +LOAD D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 LOAD hdlc/client.o LOAD hdlc/fcs.o LOAD hdlc/hdlc.o @@ -259,6 +425,15 @@ LOAD protocol/protocol.o LOAD UART/circular_buf.o LOAD UART/uart.o START GROUP +<<<<<<< HEAD +LOAD d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libm.a +END GROUP +START GROUP +LOAD d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a +LOAD d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libm.a +LOAD d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a +LOAD D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5\libatmega328p.a +======= LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libm.a END GROUP START GROUP @@ -266,6 +441,7 @@ LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/b LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libm.a LOAD c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a LOAD C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5\libatmega328p.a +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 END GROUP 0x00000000 __TEXT_REGION_ORIGIN__ = DEFINED (__TEXT_REGION_ORIGIN__)?__TEXT_REGION_ORIGIN__:0x0 0x00800060 __DATA_REGION_ORIGIN__ = DEFINED (__DATA_REGION_ORIGIN__)?__DATA_REGION_ORIGIN__:0x800060 @@ -369,7 +545,11 @@ END GROUP .text 0x00000000 0x1d52 *(.vectors) +<<<<<<< HEAD + .vectors 0x00000000 0x68 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .vectors 0x00000000 0x68 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 0x00000000 __vector_default 0x00000000 __vectors *(.vectors) @@ -397,20 +577,34 @@ END GROUP SORT(*)(.ctors) SORT(*)(.dtors) *(.init0) +<<<<<<< HEAD + .init0 0x00000068 0x0 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .init0 0x00000068 0x0 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 0x00000068 __init *(.init0) *(.init1) *(.init1) *(.init2) +<<<<<<< HEAD + .init2 0x00000068 0xc D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .init2 0x00000068 0xc C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 *(.init2) *(.init3) *(.init3) *(.init4) +<<<<<<< HEAD + .init4 0x00000074 0x16 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) + 0x00000074 __do_copy_data + .init4 0x0000008a 0x10 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) +======= .init4 0x00000074 0x16 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_copy_data.o) 0x00000074 __do_copy_data .init4 0x0000008a 0x10 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_clear_bss.o) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 0x0000008a __do_clear_bss *(.init4) *(.init5) @@ -422,10 +616,17 @@ END GROUP *(.init8) *(.init8) *(.init9) +<<<<<<< HEAD + .init9 0x0000009a 0x8 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o + *(.init9) + *(.text) + .text 0x000000a2 0x4 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .init9 0x0000009a 0x8 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o *(.init9) *(.text) .text 0x000000a2 0x4 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 0x000000a2 __vector_22 0x000000a2 __vector_1 0x000000a2 __vector_24 @@ -600,6 +801,43 @@ END GROUP 0x00001684 0x68 UART/uart.o 0x00001684 __vector_20 .text.libgcc.div +<<<<<<< HEAD + 0x000016ec 0x28 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) + 0x000016ec __udivmodhi4 + .text.avr-libc + 0x00001714 0x1e d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strncpy.o) + 0x00001714 strncpy + .text.avr-libc + 0x00001732 0x2c d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) + 0x00001732 printf + .text.avr-libc + 0x0000175e 0x60 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(snprintf.o) + 0x0000175e snprintf + .text.avr-libc + 0x000017be 0x3c2 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + 0x000017be vfprintf + .text.avr-libc + 0x00001b80 0x16 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen_P.o) + 0x00001b80 strnlen_P + .text.avr-libc + 0x00001b96 0x16 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(strnlen.o) + 0x00001b96 strnlen + .text.avr-libc + 0x00001bac 0x78 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(fputc.o) + 0x00001bac fputc + .text.avr-libc + 0x00001c24 0xbc d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(ultoa_invert.o) + 0x00001c24 __ultoa_invert + .text.libgcc.prologue + 0x00001ce0 0x38 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_prologue.o) + 0x00001ce0 __prologue_saves__ + .text.libgcc.prologue + 0x00001d18 0x36 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_epilogue.o) + 0x00001d18 __epilogue_restores__ + 0x00001d4e . = ALIGN (0x2) + *(.fini9) + .fini9 0x00001d4e 0x0 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) +======= 0x000016ec 0x28 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_udivmodhi4.o) 0x000016ec __udivmodhi4 .text.avr-libc @@ -635,6 +873,7 @@ END GROUP 0x00001d4e . = ALIGN (0x2) *(.fini9) .fini9 0x00001d4e 0x0 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 0x00001d4e _exit 0x00001d4e exit *(.fini9) @@ -655,7 +894,11 @@ END GROUP *(.fini1) *(.fini1) *(.fini0) +<<<<<<< HEAD + .fini0 0x00001d4e 0x4 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) +======= .fini0 0x00001d4e 0x4 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/avr5\libgcc.a(_exit.o) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 *(.fini0) 0x00001d52 _etext = . @@ -696,7 +939,11 @@ END GROUP COMMON 0x0080034c 0x44 UART/uart.o 0x0080034c uartRxBuffer 0x0080036e uartTxBuffer +<<<<<<< HEAD + COMMON 0x00800390 0x6 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) +======= COMMON 0x00800390 0x6 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 0x00800390 __iob 0x00800396 PROVIDE (__bss_end, .) 0x00001d52 __data_load_start = LOADADDR (.data) @@ -761,17 +1008,30 @@ END GROUP .comment 0x00000060 0x31 protocol/protocol.o .comment 0x00000060 0x31 UART/circular_buf.o .comment 0x00000060 0x31 UART/uart.o +<<<<<<< HEAD + .comment 0x00000060 0x31 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) + .comment 0x00000060 0x31 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(snprintf.o) + .comment 0x00000060 0x2c d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + 0x2d (size before relaxing) + .comment 0x0000008c 0x31 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(fputc.o) + .comment 0x0000008c 0x31 d:/atmel/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) +======= .comment 0x00000060 0x31 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(printf.o) .comment 0x00000060 0x31 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(snprintf.o) .comment 0x00000060 0x2c c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) 0x2d (size before relaxing) .comment 0x0000008c 0x31 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(fputc.o) .comment 0x0000008c 0x31 c:/program files (x86)/atmel/studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin/../lib/gcc/avr/5.4.0/../../../../avr/lib/avr5\libc.a(iob.o) +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .note.gnu.avr.deviceinfo 0x00000000 0x40 .note.gnu.avr.deviceinfo +<<<<<<< HEAD + 0x00000000 0x40 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= 0x00000000 0x40 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .note.gnu.build-id *(.note.gnu.build-id) @@ -818,7 +1078,11 @@ END GROUP .debug_info 0x00000000 0x378f *(.debug_info .gnu.linkonce.wi.*) +<<<<<<< HEAD + .debug_info 0x00000000 0x5f4 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .debug_info 0x00000000 0x5f4 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .debug_info 0x000005f4 0x5e7 hdlc/client.o .debug_info 0x00000bdb 0xa5 hdlc/fcs.o .debug_info 0x00000c80 0x685 hdlc/hdlc.o @@ -833,7 +1097,11 @@ END GROUP .debug_abbrev 0x00000000 0x1589 *(.debug_abbrev) +<<<<<<< HEAD + .debug_abbrev 0x00000000 0x5a2 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .debug_abbrev 0x00000000 0x5a2 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .debug_abbrev 0x000005a2 0x1fc hdlc/client.o .debug_abbrev 0x0000079e 0x83 hdlc/fcs.o .debug_abbrev 0x00000821 0x194 hdlc/hdlc.o @@ -846,6 +1114,22 @@ END GROUP .debug_abbrev 0x000012cc 0x175 UART/circular_buf.o .debug_abbrev 0x00001441 0x148 UART/uart.o +<<<<<<< HEAD +.debug_line 0x00000000 0x1c87 + *(.debug_line .debug_line.* .debug_line_end) + .debug_line 0x00000000 0x133 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o + .debug_line 0x00000133 0x2f5 hdlc/client.o + .debug_line 0x00000428 0x47 hdlc/fcs.o + .debug_line 0x0000046f 0x461 hdlc/hdlc.o + .debug_line 0x000008d0 0x4a0 LCD/lcdpcf8574.o + .debug_line 0x00000d70 0x1b2 LCD/Lcd_print.o + .debug_line 0x00000f22 0x336 LCD/pcf8574.o + .debug_line 0x00001258 0x2a4 LCD/twimaster.o + .debug_line 0x000014fc 0x279 main.o + .debug_line 0x00001775 0x228 protocol/protocol.o + .debug_line 0x0000199d 0xfa UART/circular_buf.o + .debug_line 0x00001a97 0x1f0 UART/uart.o +======= .debug_line 0x00000000 0x1e37 *(.debug_line .debug_line.* .debug_line_end) .debug_line 0x00000000 0x133 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o @@ -860,6 +1144,7 @@ END GROUP .debug_line 0x000018b9 0x25e protocol/protocol.o .debug_line 0x00001b17 0xfa UART/circular_buf.o .debug_line 0x00001c11 0x226 UART/uart.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .debug_frame 0x00000000 0x9a0 *(.debug_frame) @@ -877,7 +1162,11 @@ END GROUP .debug_str 0x00000000 0xcc5 *(.debug_str) +<<<<<<< HEAD + .debug_str 0x00000000 0x208 D:/atmel/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +======= .debug_str 0x00000000 0x208 C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/gcc/dev/atmega328p/avr5/crtatmega328p.o +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .debug_str 0x00000208 0x387 hdlc/client.o 0x412 (size before relaxing) .debug_str 0x0000058f 0x41 hdlc/fcs.o diff --git a/hdlc_screen/Debug/main.d b/hdlc_screen/Debug/main.d index 90f9c28..62e6098 100644 --- a/hdlc_screen/Debug/main.d +++ b/hdlc_screen/Debug/main.d @@ -1,4 +1,26 @@ main.d main.o: .././main.c .././hdlc/client.h \ +<<<<<<< HEAD + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h \ + .././hdlc/hdlc.h .././hdlc/fcs.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ + .././UART/uart.h .././LCD/lcd.h .././Protocol/protocol.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h + +.././hdlc/client.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h \ @@ -19,14 +41,21 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdbool.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .././hdlc/hdlc.h: .././hdlc/fcs.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\errno.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 .././UART/uart.h: @@ -34,6 +63,17 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\ .././Protocol/protocol.h: +<<<<<<< HEAD +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: @@ -43,3 +83,4 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 diff --git a/hdlc_screen/Debug/main.o b/hdlc_screen/Debug/main.o index b64a83369c47b93ea54a99be520fbef56d7f61bd..2525d10ce8cddfeeb175af752681bec93db81905 100644 GIT binary patch delta 1040 zcmYk(Ur19?90%}o&UJ3|XKZd|Orn)HFSYGnlUOvw2XiSRt6&(!f*C3XE<%h-h$|63 z#C?d4gbxw~J@pX8`XfTHhwvfnW%%HONQF-kAt9q^MBlUXE4mN&`}ywtySsO_IA44a z=gAj`?=`z2E5MlWVqu1hpKyh0rf#R#8ZE6`W)d?Duf}xkIfaFW_k*=GR-TEYs!Nad zsilTj;kst^+F7CNh&smb?uu|qE#ag48+~3xRBiYD-KDj^amKb09h;hBJSH#r+qhXS z`LjIPf3Y$4QRuP3UbPh0J{^p`{46WyU8sHJG(1Soz~{+l;bC$P zE|81x6|#Cw6XY5A8hH+$)^^!_lo=XWglEam;5qUN?2+HY56M+{fxHDjChx#c$u;;n z`8WKM+=N`_uKveSlnM=)$QANQQvMw0$){qg3oY(yaNZxO~@$u2r@?QK*q_(k*ceGx{*op5VDJ$L#nZ>YSJ*!O9KVu z0QnYDO;mFhka_YF@)CI+StNf)j+5)i>ttr&dzUXK{6cKB$?;TwQ4@UnOXhaVcQ4!IDSVRv}v0i*yAw$Tb@7ev;a|d?6pYP5+_w3%wreben zlWyMsaMM_oUhB0orWo~hhQWinB3q-`Iv2_<%rz~b zu`}(_bLpY8>AsYEAd!p@ySI+C1)HONnN&O(9nPHZPYj92ww<2;JI^az_E+4JFW9YB z`6cHEo1Vm0e69K0GH?UjiaJUT!dY@VJWf6c8{`Oll^lbo$@1aeAdkYg$m8&gX`M}= zJfMjjJWHN|pO9a|&&hA#*W`Kl9k~E6keA_4y704pj%{z9WlxU(6xk}!J zRPcJ_Q|W-M|v2M`@+92)B{H!ky%0I7F^M_K-It zkC5fXkCC?_qvQ_cX>u4jNRA-W_~`P^rd{A5oc)20&;&@ZM$FV4W1)P5XDtD>a diff --git a/hdlc_screen/Debug/protocol/protocol.d b/hdlc_screen/Debug/protocol/protocol.d index 492f731..426cff7 100644 --- a/hdlc_screen/Debug/protocol/protocol.d +++ b/hdlc_screen/Debug/protocol/protocol.d @@ -1,5 +1,33 @@ protocol/protocol.d protocol/protocol.o: ../protocol/protocol.c \ ../protocol/protocol.h \ +<<<<<<< HEAD + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h \ + d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h + +../protocol/protocol.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stddef.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdlib.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdio.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: + +d:\atmel\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +======= c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdint.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\stdint.h \ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\string.h \ @@ -26,3 +54,4 @@ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\ c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\avr\include\inttypes.h: c:\program\ files\ (x86)\atmel\studio\7.0\toolchain\avr8\avr8-gnu-toolchain\lib\gcc\avr\5.4.0\include\stdarg.h: +>>>>>>> 2ad07a39c5b52693c7d6572f447e17d76787e562 diff --git a/hdlc_screen/Debug/protocol/protocol.o b/hdlc_screen/Debug/protocol/protocol.o index f5f9eccb4de654ef2b0663531113ee1e514a255f..614c3469a1fd6822b6035bb407377fb28a07056f 100644 GIT binary patch delta 717 zcmYk)Jt#$C9LMqJIr8psaSUFHo7+9d%OZ=sltn3`%itvgA_iC9!gdz}7N`C(GLT~9 zmY8HP*@R>u8&W3nlJa}Hzrh{O_w&4*o}Sb7yKlSvGTnL*^z5{drIe+vltk>3w2}IO zp}FYjg!p#t|A8B~vwxG~S$R$%_NbK78F=6q({N_O&qyietI;>Q9sQz5&?M|Pd&c2( zdIrv+eYk+$gp282IGAuu9b({e;TW!=FX0CI25zD6;5PaNj?k}g5B&iT(ckbGoqyAqjfdLo;gF>g#wkLOH#E^;oENakn8rxUsSt<+RniiRZ* zjGDuoEftNx5v7$robVkl)G19<9_|10%C)!RMz|6EvnZSCA-I)J!JYIZ+)HQS3$z1Y zq#waC`YC+5;)1q`;tDt3z!UU)_$K`cUZD5jCHgzOLjQo*=mYpZ{Re(Xdyr4)W5^e( zPsu*XE$XUN*-g56M#6SbJ(HMisj|%5mR?gU YkI@>CcW62C3+op-6|&Tj^o8pF0reerTmS$7 diff --git a/hdlc_screen/main.c b/hdlc_screen/main.c index ccebf62..8a30f50 100644 --- a/hdlc_screen/main.c +++ b/hdlc_screen/main.c @@ -12,11 +12,6 @@ int main(void) { UART_init(); init_hdlc_client(&hdlc, 200); -// while(true){ -// if (!flag_connection){ -// } -// } - hdlc_connect(&hdlc); uint8_t buffer[10]; diff --git a/hdlc_screen/main_com.c b/hdlc_screen/main_com.c new file mode 100644 index 0000000..769484c --- /dev/null +++ b/hdlc_screen/main_com.c @@ -0,0 +1,185 @@ +#include +#include +#include "hdlc/client.h" +#include "stdint.h" +#include "stdbool.h" +#include "protocol/protocol.h" + +int main() { + struct Client hdlc; + HANDLE Port_1; + HANDLE Port_2; + init_hdlc_client(&hdlc, 200); + + hdlc_connect(&hdlc); + uint8_t buffer_send_connect[10]; + + hdlc_get_raw_frame(&hdlc, buffer_send_connect, sizeof buffer_send_connect); + + // Открыть COM-порт + Port_1 = CreateFile("COM1", GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, + 0, NULL); + + if (Port_1 == INVALID_HANDLE_VALUE) { + DWORD errorCode = GetLastError(); + //printf("Create file err: %d.\n", INVALID_HANDLE_VALUE); + printf("Create file err: %lu.\n", errorCode); + return 1; + } + + COMMTIMEOUTS timeouts1 = {0}; + // Установка таймаутов чтения/записи + timeouts1.ReadIntervalTimeout = 100; + timeouts1.ReadTotalTimeoutConstant = 100; + timeouts1.ReadTotalTimeoutMultiplier = 20; + timeouts1.WriteTotalTimeoutConstant = 50; + timeouts1.WriteTotalTimeoutMultiplier = 20; + + if (!SetCommTimeouts(Port_1, &timeouts1)) { + printf("Ошибка при установке таймаутов COM-порта.\n"); + CloseHandle(Port_1); + return 1; + } + + // Открыть COM-порт + Port_2 = CreateFile("COM2", GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, + 0, NULL); + + if (Port_2 == INVALID_HANDLE_VALUE) { + DWORD errorCode = GetLastError(); + //printf("Create file err: %d.\n", INVALID_HANDLE_VALUE); + printf("Create file err: %lu.\n", errorCode); + return 1; + } + + if (!SetCommTimeouts(Port_2, &timeouts1)) { + printf("Ошибка при установке таймаутов COM-порта.\n"); + CloseHandle(Port_1); + return 1; + } + + //Write frame from port 1 + DWORD written; + BOOL success_write_send = WriteFile(Port_1, buffer_send_connect, sizeof buffer_send_connect, + &written, NULL); + + if (!success_write_send){ + DWORD errorCode = GetLastError(); + printf("WriteFile err: %lu.\n", errorCode); + return -1; + } + if (written != sizeof buffer_send_connect){ + printf("Failed to write all bytes to port"); + return -1; + } + + bool flag_connection = false; + while(!flag_connection){ + uint8_t buffer_recive_connect[10]; + DWORD received; + BOOL success = ReadFile(Port_2, buffer_recive_connect, sizeof buffer_recive_connect, + &received, NULL); + if (!success) + { + printf("Failed to read from port"); + return -1; + } + + int err = hdlc_decode_recived_raw_data(&hdlc, buffer_recive_connect, sizeof buffer_recive_connect, + 0, 0); + if (err < 0){ +// if (err == ERR_INVALID_SEQ_NUMBER_FRAME){ +// uint8_t* buffer_rej[10]; +// hdlc_get_raw_frame(&hdlc, buffer_rej, sizeof buffer_rej); +// //UART_send(buffer_rej, sizeof buffer_rej); +// return err; +// } + return err; + } + + if (hdlc.state == READY_STATE){ + flag_connection = true; + } + } + + struct message mess; + mess.numbers[0] = 12133.23; + mess.numbers[1] = 21232.1; + mess.numbers[2] = 100; + mess.len_numbers = 3; + mess.str = "word war"; + mess.len_str = sizeof mess.str; + + uint8_t data[32]; + size_t len_data; + protocol_encode(mess, data, &len_data); + + hdlc_send_data(&hdlc, data, len_data); + uint8_t buffer_data[72]; + hdlc_get_raw_frame(&hdlc, buffer_data, sizeof buffer_data); + + DWORD written_data; + BOOL success_write_data = WriteFile(Port_1, buffer_send_connect, sizeof buffer_send_connect, + &written_data, NULL); + + if (!success_write_data){ + DWORD errorCode = GetLastError(); + printf("WriteFile err: %lu.\n", errorCode); + return -1; + } + if (written_data != sizeof buffer_send_connect){ + printf("Failed to write all bytes to port"); + return -1; + } + + for (int i = 0; i <1100; i++ ){ + + } + + bool flag_data = false; + while(!flag_data){ + uint8_t buffer_recive_data[80]; + DWORD received_data; + BOOL success = ReadFile(Port_2, &buffer_recive_data, sizeof buffer_recive_data, + &received_data, NULL); + if (!success) + { + printf("Failed to read from port"); + return -1; + } + + uint8_t data_recive[64]; + size_t len_data_recive; + int err = hdlc_decode_recived_raw_data(&hdlc, buffer_recive_data, sizeof buffer_recive_data, + data_recive, &len_data_recive); + if (err < 0){ +// if (err == ERR_INVALID_SEQ_NUMBER_FRAME){ +// uint8_t* buffer_rej[10]; +// hdlc_get_raw_frame(&hdlc, buffer_rej, sizeof buffer_rej); +// //UART_send(buffer_rej, sizeof buffer_rej); +// return err; +// } + return err; + } + for(int i = 0; i < sizeof data_recive; i++){ + printf("%d: %d\n", i, data_recive[i]); + } + + struct message resp; + protocol_decode(data_recive, sizeof data_recive, &resp); + if (resp.len_str > 0){ + printf("1: %f\n", resp.numbers[0]); + printf("2: %f\n", resp.numbers[1]); + printf("3: %f\n", resp.numbers[2]); + printf("str: %s\n", resp.str); + flag_data = true; + } + } + + CloseHandle(Port_1); + CloseHandle(Port_2); + + return 0; +} diff --git a/hdlc_screen/main_uart.c b/hdlc_screen/main_uart.c new file mode 100644 index 0000000..8a30f50 --- /dev/null +++ b/hdlc_screen/main_uart.c @@ -0,0 +1,110 @@ +#include "hdlc/client.h" +#include "UART/uart.h" +#include "stdbool.h" +#include "LCD/lcd.h" +#include "Protocol/protocol.h" + +int main(void) { + struct Client hdlc; + bool flag_connection = false; + + Lcd_inciliation(); + UART_init(); + init_hdlc_client(&hdlc, 200); + + hdlc_connect(&hdlc); + uint8_t buffer[10]; + + hdlc_get_raw_frame(&hdlc, buffer, sizeof buffer); + + UART_send(buffer, sizeof buffer); + + while(!flag_connection){ + uint8_t* buffer_recive[10]; + UART_receive(buffer_recive, sizeof buffer_recive); + + int err = hdlc_timeout_handler(&hdlc, 1); + if (err == ERR_FRAME_TIME_OUT){ + hdlc_get_raw_frame(&hdlc, buffer, sizeof buffer); + UART_send(buffer, sizeof buffer); + continue; + } + + err = hdlc_decode_recived_raw_data(&hdlc, buffer_recive, sizeof buffer_recive, 0, 0); + if (err < 0){ + if (err == ERR_INVALID_SEQ_NUMBER_FRAME){ + uint8_t* buffer_rej[10]; + hdlc_get_raw_frame(&hdlc, buffer_rej, sizeof buffer_rej); + UART_send(buffer_rej, sizeof buffer_rej); + return err; + } + return err; + } + + if (hdlc.state == READY_STATE){ + flag_connection = true; + } + } + + struct message mess; + mess.numbers[0] = 1.23; + mess.numbers[1] = 22.1; + mess.numbers[2] = 100; + mess.len_numbers = 3; + mess.str = "word war in new world io ex"; + mess.len_str = sizeof mess.str; + + uint8_t data[64]; + size_t len_data; + protocol_encode(mess, data, &len_data); + + hdlc_send_data(&hdlc, data, len_data); + uint8_t buffer_data[72]; + hdlc_get_raw_frame(&hdlc, buffer_data, sizeof buffer_data); + + UART_send(buffer_data, sizeof buffer_data); + + bool flag_recive = false; + uint8_t data_recive[64]; + size_t len_data_recive; + while (!flag_recive){ + uint8_t* buffer_recive_data[72]; + UART_receive(buffer_recive_data, sizeof buffer_recive_data); + + int err = hdlc_timeout_handler(&hdlc, 1); + if (err == ERR_FRAME_TIME_OUT){ + hdlc_get_raw_frame(&hdlc, buffer_data, sizeof buffer_data); + UART_send(buffer_data, sizeof buffer_data); + continue; + } + + err = hdlc_decode_recived_raw_data(&hdlc, buffer_recive_data, sizeof buffer_recive_data, data_recive, &len_data_recive); + if (err < 0){ + if (err == ERR_INVALID_SEQ_NUMBER_FRAME){ + uint8_t* buffer_rej[10]; + hdlc_get_raw_frame(&hdlc, buffer_rej, sizeof buffer_rej); + UART_send(buffer_rej, sizeof buffer_rej); + return err; + } + return err; + } + + if (hdlc.state == SEND){ + flag_recive = true; + } + } + + struct message resp; + protocol_decode(data_recive, len_data_recive, &resp); + + struct DisplayData disp; + disp.value1 = resp.numbers[0]; + disp.value2 = resp.numbers[1]; + disp.value3 = resp.numbers[2]; + //disp.topLine = *resp.str; + strncpy(disp.topLine, resp.str, sizeof(disp.topLine) - 1); + + printLcd(&disp); + + return 0; +} \ No newline at end of file