From b5678323b9668a1614e55ec9b446df06340e2aaf Mon Sep 17 00:00:00 2001 From: tojo0084 Date: Sun, 30 Apr 2017 01:48:31 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Lite=20initial=20kod=20f=C3=B6r=20ett=20huv?= =?UTF-8?q?udprogram?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electrotest/electrotest | Bin 0 -> 8712 bytes electrotest/electrotest.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 electrotest/electrotest create mode 100644 electrotest/electrotest.c diff --git a/electrotest/electrotest b/electrotest/electrotest new file mode 100644 index 0000000000000000000000000000000000000000..99f728202cbed8e7813d261e475e077ce39c4360 GIT binary patch literal 8712 zcmeHMYiwLc6`tMoGmrHqP13yDtZ0Ig2;bO=<8Fy)?)sJM;KasRhevR(*Sl-)l6|DR zcY_nP#mH^wDoF`YA^)iqKu92gC?J&}1aSyTS}915P*5u>FohN;>BDJCWL4DWoVn-h zpjdTc?&v5%_>CFpp9@juK}(6wz*$>}JW1xnO^J&H-97vJWF&Nh?eoHeZC(Kn&H=37blLY}%a4a=x9)%Z z$?;FBI&@s)_5uz z2?Ph@5uxkDiBwY07{Rom>q6gqOz$PV)_5?JiDZN{w>6IF=|~2A29qK16idbop$`EQ zFtZXkk(#j-GD}CZ2Kd5Ap(A=IdPE-z#^L~=2E|VVV@aV$!a*Yl6@!_Ki35}ji*4CV zdRsgd3dV8b;uA_GjzUM01_Tg$x;k50_3cVizO-H0DTe^(tt-FC9is5(6i+}MucH;Q z7)(i*c$2W~+89h#r)P1gXL5a+w0BYj#u&RcD4)~)5%V{%^HZSwl=R2dW@6*2ej&yKw&IJy%+>CZ{dbj4dtX-QkR_47eW^Z*HME@l-{^+L~q5UGe ztPc#QlhCmK%asoTyKo2< zj(~6;2liH_8S7NvY*^c|Li&U6iS;jI$XC2iZ#PMu!4t#7y1tNQW zAvQui>U$`raCQ+G^**RL}Q3uK(xUdbdYi>paqNt{{!Oa;dUB;JEfsqnjl=Q5=GO(sU^+{}2CWNtUdqibkB zK5X-{KR(ijpExP=xX+Nhp6V&w|DEOUv6e`ys#J-5oOm-Y?>$5`Ko-ZI~3HLvTC~rUR zdrsjNXD#0aJtID8!4<--`*WN0UuY-q69*(-KAtDY5AXLNN;(N|hbaFp-v`{TUkmm3 z=hDw|akf^4Qh_c)(QX`2!_NQjrRjZT^Wo3ZPx*KM2kCR3PKxmQKo-j9=Thi^!)87_ z1o(0of4qGn@qWJpaIZv4Uq6$0`TXgYeoA#w3NC;r0k_NB)Jy&H^_X42&o>spUm*Y1 zdH!p_z2(gmR{>wKRNE`=~B1z`JN>n59NXSU1j7Y|i&Ftv)?`zlF_qSoP zO*Wd#m_Ey!hK1ht`ThQVovol%R3r0r071@GZ`X9wo7UDV^gUhOE&eXOyQAYkdq5BP zTe{jYg3PXkGFdY(_n$I>n4eQsPNQM+tTesHX}Qt_UcsV?qscbvn9D0vqC5Bkkl5pt zo+a<7hchWX8cc>UC)wEzTH#ny&t@Vp5`|8fDaNAApqVkWOIqrX=Hzk4{HJXKQz)6^ z2_rZN+(?@|%B5Hma-~Owl7x?^_***bjo>gz!^x~Nn2kZ^JQfxTO3`2@DwOc?B=|GA zkv40NMbepADp?}vP?wIxgJ?jdqj5thvU>^?mEjbKMq~uuGNG!ZQ!*>6M4~j`qG52t zl4)wr9@B!$UkZU5gb5~MA!tL&K=*)PidBIOt59GGBw$)w7U_Q>;_o9Y)%?E9=RW@b z5Z@2jHR=}ALm*Vc1KWV4fKw$dS=nB~`NTG6c)q7_Ixg#B%p^njQ1WavOS!9Bprk|-f7sL&#zu;DBp`r zZPN#rkspQ!?<8!`=iK#`rWTJsiTOCJe+1O9sahkazwV7d|3_7g1d{DMtodpY$R$zXtR6w#N}{#n3qT=`x(Mfb2Nvgi9Ms7Rt=Wl`jyRBSJ* zRI`p8_T)9qf`?@0&w*TQ&*%Ccvgh`)8>{@h#h!nE2gv?)bY4Upm!a=Lp*TMOAE=E2 z@qL!{t^NNY+4J|~b3_l>^Y>fG{-+ju{(mR`AGC=LiCg1eu-Nnc*rYSLE)wjxj1zQ|{w%%ty3;6KwHQvpwIR z`2W_tuxL8u=RePbaZ7yuf7L8@3dq`CmYKf`I>qhJ-^VC`PkJf5*pB(E#h%ZzKC +// #include // för att kunna använda bool och true +// #include // för att kunna använda strlen + +// gcc -o electrotest electrotest.c -L. -lcomponent -lm -Wl,-rpath,/usr/local/lib/libcomponent.so +// gcc -o electrotest electrotest.c -lcomponent -lm -Wl,-rpath,/usr/local/lib/libcomponent.so +#include "../libcomponent/main/libcomponent.h" + +int main ( int argc, char *argv[] ) { + if(argc != 3) { + printf("Innan \n"); + float res_array[3]; + int count; + count = e_resistance(1200, res_array); + + printf("Klart \n"); + return -1; + } + return 0; +} From a67ad6fe7530447f1fbc68f30a7bdbd9f86448b5 Mon Sep 17 00:00:00 2001 From: tojo0084 Date: Sun, 30 Apr 2017 14:31:13 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Ett=20minimalt=20program=20som=20anv=C3=A4n?= =?UTF-8?q?der=20sig=20av=20biblioteket=20libcomponent.so?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electrotest/Makefile | 14 ++++++++++++++ electrotest/main/electrotest.c | 12 ++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 electrotest/Makefile create mode 100644 electrotest/main/electrotest.c diff --git a/electrotest/Makefile b/electrotest/Makefile new file mode 100644 index 0000000..b7d77d3 --- /dev/null +++ b/electrotest/Makefile @@ -0,0 +1,14 @@ +# Denna makefile förutsätter att man har installerat "/usr/local/lib/libcomponent.so" +# vilket man kan göra med kommandon nedan (om man utgår från projekt-rooten dvs katalogen som innehåller katalogerna libpower , libcomponent, libresistance) +# cd libcomponent +# make all +# make install +# ls -l /usr/local/lib/ +# (kontrollera att libcomponent.so finns med i katalogen som listades ovan) +# cd .. +# cd electrotest +# make all +# ./electrotest + +all: + gcc -o electrotest main/electrotest.c -L. -lcomponent -lm -Wl,-rpath,/usr/local/lib/libcomponent.so diff --git a/electrotest/main/electrotest.c b/electrotest/main/electrotest.c new file mode 100644 index 0000000..9a8130b --- /dev/null +++ b/electrotest/main/electrotest.c @@ -0,0 +1,12 @@ +#include + +#include "../../libcomponent/main/libcomponent.h" + +int main(int argc, char *argv[]) { + printf("\nOm anropet till biblioteket fungerar borde resultat nedan bli: 3 , 1200 , 180 , 18 \n"); + float res_array[3]; + int count; + count = e_resistance(1398, res_array); + printf("%d , %f , %f , %f \n", count, res_array[0], res_array[1], res_array[2]); + return 0; +} From cd327f4efaed00131f805f54555e4b7bf29c4337 Mon Sep 17 00:00:00 2001 From: tojo0084 Date: Sun, 30 Apr 2017 14:39:22 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Det=20f=C3=B6ljde=20med=20f=C3=B6r=20m?= =?UTF-8?q?=C3=A5nga=20filer=20i=20f=C3=B6reg=C3=A5ende=20commit=20s=C3=A5?= =?UTF-8?q?=20denna=20commit=20=C3=A4r=20bara=20radering.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electrotest/electrotest | Bin 8712 -> 0 bytes electrotest/electrotest.c | 20 -------------------- 2 files changed, 20 deletions(-) delete mode 100644 electrotest/electrotest delete mode 100644 electrotest/electrotest.c diff --git a/electrotest/electrotest b/electrotest/electrotest deleted file mode 100644 index 99f728202cbed8e7813d261e475e077ce39c4360..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8712 zcmeHMYiwLc6`tMoGmrHqP13yDtZ0Ig2;bO=<8Fy)?)sJM;KasRhevR(*Sl-)l6|DR zcY_nP#mH^wDoF`YA^)iqKu92gC?J&}1aSyTS}915P*5u>FohN;>BDJCWL4DWoVn-h zpjdTc?&v5%_>CFpp9@juK}(6wz*$>}JW1xnO^J&H-97vJWF&Nh?eoHeZC(Kn&H=37blLY}%a4a=x9)%Z z$?;FBI&@s)_5uz z2?Ph@5uxkDiBwY07{Rom>q6gqOz$PV)_5?JiDZN{w>6IF=|~2A29qK16idbop$`EQ zFtZXkk(#j-GD}CZ2Kd5Ap(A=IdPE-z#^L~=2E|VVV@aV$!a*Yl6@!_Ki35}ji*4CV zdRsgd3dV8b;uA_GjzUM01_Tg$x;k50_3cVizO-H0DTe^(tt-FC9is5(6i+}MucH;Q z7)(i*c$2W~+89h#r)P1gXL5a+w0BYj#u&RcD4)~)5%V{%^HZSwl=R2dW@6*2ej&yKw&IJy%+>CZ{dbj4dtX-QkR_47eW^Z*HME@l-{^+L~q5UGe ztPc#QlhCmK%asoTyKo2< zj(~6;2liH_8S7NvY*^c|Li&U6iS;jI$XC2iZ#PMu!4t#7y1tNQW zAvQui>U$`raCQ+G^**RL}Q3uK(xUdbdYi>paqNt{{!Oa;dUB;JEfsqnjl=Q5=GO(sU^+{}2CWNtUdqibkB zK5X-{KR(ijpExP=xX+Nhp6V&w|DEOUv6e`ys#J-5oOm-Y?>$5`Ko-ZI~3HLvTC~rUR zdrsjNXD#0aJtID8!4<--`*WN0UuY-q69*(-KAtDY5AXLNN;(N|hbaFp-v`{TUkmm3 z=hDw|akf^4Qh_c)(QX`2!_NQjrRjZT^Wo3ZPx*KM2kCR3PKxmQKo-j9=Thi^!)87_ z1o(0of4qGn@qWJpaIZv4Uq6$0`TXgYeoA#w3NC;r0k_NB)Jy&H^_X42&o>spUm*Y1 zdH!p_z2(gmR{>wKRNE`=~B1z`JN>n59NXSU1j7Y|i&Ftv)?`zlF_qSoP zO*Wd#m_Ey!hK1ht`ThQVovol%R3r0r071@GZ`X9wo7UDV^gUhOE&eXOyQAYkdq5BP zTe{jYg3PXkGFdY(_n$I>n4eQsPNQM+tTesHX}Qt_UcsV?qscbvn9D0vqC5Bkkl5pt zo+a<7hchWX8cc>UC)wEzTH#ny&t@Vp5`|8fDaNAApqVkWOIqrX=Hzk4{HJXKQz)6^ z2_rZN+(?@|%B5Hma-~Owl7x?^_***bjo>gz!^x~Nn2kZ^JQfxTO3`2@DwOc?B=|GA zkv40NMbepADp?}vP?wIxgJ?jdqj5thvU>^?mEjbKMq~uuGNG!ZQ!*>6M4~j`qG52t zl4)wr9@B!$UkZU5gb5~MA!tL&K=*)PidBIOt59GGBw$)w7U_Q>;_o9Y)%?E9=RW@b z5Z@2jHR=}ALm*Vc1KWV4fKw$dS=nB~`NTG6c)q7_Ixg#B%p^njQ1WavOS!9Bprk|-f7sL&#zu;DBp`r zZPN#rkspQ!?<8!`=iK#`rWTJsiTOCJe+1O9sahkazwV7d|3_7g1d{DMtodpY$R$zXtR6w#N}{#n3qT=`x(Mfb2Nvgi9Ms7Rt=Wl`jyRBSJ* zRI`p8_T)9qf`?@0&w*TQ&*%Ccvgh`)8>{@h#h!nE2gv?)bY4Upm!a=Lp*TMOAE=E2 z@qL!{t^NNY+4J|~b3_l>^Y>fG{-+ju{(mR`AGC=LiCg1eu-Nnc*rYSLE)wjxj1zQ|{w%%ty3;6KwHQvpwIR z`2W_tuxL8u=RePbaZ7yuf7L8@3dq`CmYKf`I>qhJ-^VC`PkJf5*pB(E#h%ZzKC -// #include // för att kunna använda bool och true -// #include // för att kunna använda strlen - -// gcc -o electrotest electrotest.c -L. -lcomponent -lm -Wl,-rpath,/usr/local/lib/libcomponent.so -// gcc -o electrotest electrotest.c -lcomponent -lm -Wl,-rpath,/usr/local/lib/libcomponent.so -#include "../libcomponent/main/libcomponent.h" - -int main ( int argc, char *argv[] ) { - if(argc != 3) { - printf("Innan \n"); - float res_array[3]; - int count; - count = e_resistance(1200, res_array); - - printf("Klart \n"); - return -1; - } - return 0; -} From 12b64d221e040b7db057a1acecc314e1587cba6a Mon Sep 17 00:00:00 2001 From: tojo0084 Date: Sun, 30 Apr 2017 17:38:15 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=C3=84ndrade=20till=20c99=20-kompilering=20?= =?UTF-8?q?i=20en=20makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electrotest/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electrotest/Makefile b/electrotest/Makefile index b7d77d3..cb0062d 100644 --- a/electrotest/Makefile +++ b/electrotest/Makefile @@ -11,4 +11,4 @@ # ./electrotest all: - gcc -o electrotest main/electrotest.c -L. -lcomponent -lm -Wl,-rpath,/usr/local/lib/libcomponent.so + gcc -std=c99 -o electrotest main/electrotest.c -L. -lcomponent -lm -Wl,-rpath,/usr/local/lib/libcomponent.so