From a766efb8a900f039944952f109a06f71f35c695d Mon Sep 17 00:00:00 2001 From: mrnek Date: Thu, 8 Jun 2023 15:41:54 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GccApplication3_6_2.atsuo | Bin 0 -> 15360 bytes func.c | 2 +- keyboard.c | 1 - spi_master.c | 10 ++++++---- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 GccApplication3_6_2.atsuo diff --git a/GccApplication3_6_2.atsuo b/GccApplication3_6_2.atsuo new file mode 100644 index 0000000000000000000000000000000000000000..615802dea5fb03bc7c56fbae72e1ed14b9a48532 GIT binary patch literal 15360 zcmeHOU2I%O6&@#RJAZ|y4M}LBY(hx$V=uew_1cb;5U$~&>GoD)RnT~ z*2>A6@Bg7{B?=wbVwLOx#gsTB4uSdzQXS%4*(wTOZiEGr^cfevFZE2_W#|`*$cnh= z5<23XIEr5lJjwj5RjlOiHnF0LV@L8(vY_JyZ79bX!vN^@n|+WF!-&s`K9l}9_)(Fn z6t+Tsj$4j1xAN0wbIdcyG0B*DtV@o6^60bya{RNbbNtgbIBfvmbNtf|kT2Q+wh`^X zmw_h$NtbG{)$#l_q_+c4+Ic%2@9L1Q2YkTS0Y4A`f{zxP;}?*ZvGa3?^LF|yVvZ!1 zIgfbKPG3O$O*{Q9#I3syy#2w3ha%tk`$sif4t-2=a|-`xUp=Sti(QywiE~wN`<}t0 zSuK+tOlAx%KG4Nm`X`pWdx=^Hm+nSNvXm)@HfZ(f?dF@1e7na*ePL-}+} z$!UW*EtAv@B{8Tf2{oTka;c1uJtAuM8u>(m3WLzKI5bA`hWaVjK1Oz3@qSz+MFN_v zKm+6W9fbyVi!>~u4r^q=k~55CzQ~5P=qJh~uE00&UJk zZo(6wPy0e0a7&--mzz`^gnrOULw?%)EYh3qAK;i}C*H(Qw$1+2e3l-%tM9(D@U%TTr5R3_>bzw5*N zs#&eI6yjHtsIhoLJH(VC+YK@^sz}nqCNd4bsc;WVt(&vXI225Fq9bcg$tdO-=loM_ z9xgWz?ZEs;{^=XIoqxP2`x3xVNT2>6=U%rfknNyPUxTz6%t|Z#d=>BM+b|T;?=;sQ zF|6lPn3XdX*8!wYpN9UVTl(8j_CEkaY5Egbnb9NUs=ss~eN%Azr*z4gH}nbQ6ZMCF zLOZ;q!MomX7U?9UH_#Jtq`S>j6gj#WN8X_DdiN?O^Rnj3P$?zg~ERI{4*^%qw=F zy_(@;?gamBkSU3L$}*GoLVI$MJ%+DR_#zCCHHZ@9(55EDY>x!K8^Ni>-dK8R>EujL%bh6=y_ADq&>OORgPfx^_AGGxMNzK`U7;4Sey5~8ct@Y4 zoG<3L>2IEc{JT;16&h?iQ1=VNLh=ghD)&tLvyiYxT!bXG;(Aqdj~{=NEul!Hy)DvF z-_X$*sSkykJL}s*{z!c=;%|<2bOyqqQ0T(cK~-%_r?EUXmsSl!;h~^UO=nVPrWVJO zv3&fgsmbO@Lvs*+_2HmDSRV*P1NF_#P5yd6LT7VRV^d2sc;VN}i+QJ$jy+>IcjTEKY*VvGl6k$%9n^?>|Z1cT3-?|4(7m#Z1};WKMvaPSYZh8{P=0 z6c$RKn#Y?Lv_Cv?Fu+Tf-5%xauH*~*|8tfen<>}P#LK$COBL3sxc)~oNr`3*`yubU4`WJq%>EqYV|M$j*tJl40+L&^@ zvkR80{W;erOdCW0BWKziw*U4U7PeOG?}`kre>3tjSZJhRQ|d-qF;p_xG>Z)B5_Q{!MSk zxu$T-|3dYrlKpFx4OJqB{kezN62BGO!sT}J$pop#puS^B|l0q;C-ZWW(D#>C}+ z29KR;K3wygpKaY%z3%AQO160E?XN0s|M4gPdVjKS?_WRZ{Zris&%G)Cm%!Qcjv@0v GCI1I(#-`E$ literal 0 HcmV?d00001 diff --git a/func.c b/func.c index 762904c..b1ffda1 100644 --- a/func.c +++ b/func.c @@ -66,7 +66,7 @@ void map_digits(char* arr, long *digits, int size) { } void prepare_data(char *arr, long number, int size) { - long digits[size]; + long digits[12]; split_digits(number, digits, size); map_digits(arr, digits, size); } \ No newline at end of file diff --git a/keyboard.c b/keyboard.c index 2dc69df..3cc2e8b 100644 --- a/keyboard.c +++ b/keyboard.c @@ -39,7 +39,6 @@ void get_logical_keys(struct key *undc_keys) { } } else { undc_keys[i].time = timestamp; - } } } diff --git a/spi_master.c b/spi_master.c index 771f1db..bd487fb 100644 --- a/spi_master.c +++ b/spi_master.c @@ -4,6 +4,7 @@ #include #include "spi_master.h" #include "func.h" +#include #define MAX_DIGITS 11 #define F_CPU 16000000UL @@ -22,10 +23,11 @@ void output_on_display(struct calculator *calc) b_size = display_set_page(0x01, buffer); SPI_MasterTransmit(buffer, b_size); - int size = count_digits(calc->num1); - char mapped_digits[size]; - prepare_data(mapped_digits, calc->num1, size); - b_size = display_add_simbol(mapped_digits, size, buffer); + //int size = count_digits(calc->num1); + char mapped_digits[12]; + //prepare_data(mapped_digits, calc->num1, size); + ltoa(calc->num1 , mapped_digits, 10); + b_size = display_add_simbol(mapped_digits, 12, buffer); SPI_MasterTransmit(buffer, b_size); break;