From 4bf5661a84344942c7bf677f9176939b100b259c Mon Sep 17 00:00:00 2001 From: Jacques ZHONG Date: Tue, 9 May 2017 00:33:05 +0200 Subject: [PATCH] test moteurs ok --- Test moteurs/Makefile | 17 +++++++ Test moteurs/Makefile~ | 17 +++++++ Test moteurs/moteur | Bin 8989 -> 8973 bytes Test moteurs/moteur.c | 102 ++++++++++++++++++++++++++--------------- Test moteurs/moteur.c~ | 86 ++++++++++++++++++++++++++++++++++ Test moteurs/t.txt | 1 - Test moteurs/tt.txt | Bin 8 -> 0 bytes Test moteurs/ttyACM0 | 2 + 8 files changed, 187 insertions(+), 38 deletions(-) create mode 100644 Test moteurs/Makefile create mode 100644 Test moteurs/Makefile~ create mode 100644 Test moteurs/moteur.c~ delete mode 100644 Test moteurs/t.txt delete mode 100644 Test moteurs/tt.txt diff --git a/Test moteurs/Makefile b/Test moteurs/Makefile new file mode 100644 index 0000000..ac49da8 --- /dev/null +++ b/Test moteurs/Makefile @@ -0,0 +1,17 @@ +CC=gcc +CFLAGS=-Wall -g +LDFLAGS= +EXEC=moteur + +all: $(EXEC) + +moteur : moteur.c + gcc -o $@ $^ + +.PHONY: clean mrproper + +clean: + rm -rf *.o + +mrproper: clean + rm -rf $(EXEC) diff --git a/Test moteurs/Makefile~ b/Test moteurs/Makefile~ new file mode 100644 index 0000000..066eac8 --- /dev/null +++ b/Test moteurs/Makefile~ @@ -0,0 +1,17 @@ +CC=gcc +CFLAGS=-Wall +LDFLAGS= +EXEC=moteur + +all: $(EXEC) + +moteur : moteur.c + gcc -o $@ $^ + +.PHONY: clean mrproper + +clean: + rm -rf *.o + +mrproper: clean + rm -rf $(EXEC) diff --git a/Test moteurs/moteur b/Test moteurs/moteur index 57f883fcc826cf0303089caa1043b7d366d496c1..193afe630522ab840732d188093a21af6545a51e 100755 GIT binary patch delta 2093 zcmZ`)eN0nV6u-AEg;$ied{`_XZ)}WVpnMDk+>EWP`YwQKi)97;c%{X*ytoo)RvIxq0$pVb2{fp^UzP@)-sa{%1o+H8GK5wWpBA% zVxMl#8(VdKblWeJ#}1Y2-%p35x;k10Q#u>1=dFvk5^G^N(*Qr{vZ<4EZ@`e=29_L^ zTgJHp?srn3TSvP5Z9YdN=vYnU9=}35f+0CTLUK493=@yX9|`*E>pc-)YoLRKqDqA9 zloelRYZ&Z?h7Hw@Rcyk#fBmUQj|}BMLM-Z4o_Y2HB0uzQTnmTgT zV5hNilSrfkaU~_O2VJE83u))o;mK7+Xi648hpoBLi9LopnQ?9=iBfE5m@<5Y<4lHi z497V(F|23!6vsM-4Ga%+{7?`{tTTlXhdFTi5QhsW+v8TT=h*d{cAdWV}*v5@~WGp2pPVV5*ZO=r*`-+*?$S zBT3ZSA`RS5yp3abTugZ$Df;Jmwsfg~?I;{cEssh4zg0?;?s*9VO}b|=6RKHNUFVg! zhd?^$o*!#rxdtW^N1r5<(tvwG>fg6OqAQtA8n`&V4b7u$V4?&a#)AkG`&f@fNdW5& zK6No5{M9^uD#pB~A19NEEM%lX_lz{yWZ)V@&OP;aqqToQ7ya&_d&c~^`})8+OuH~P zj}AB`HSJ9dbI?8ef97+{+%k&+F!F*Hxr!wAAkTuarFpPFZa3ka+}KO>Vbj0RZ9eb> z)AJI%?g|AX5r12kEVh>f zqr1cYuvi>1sUL^f(dzG#+r^GxSgdH5cULG%udCtJN@z6Y$3#{{6jxwpmmCrO0bej2 zmVHX3Oxz_a5s{H?!9W1j?$$0j8jgrQSy5z+=8rfW4k8w}<3A~GSFeKCxs%xHQ=)Pg z8@xvB>FHUEPQAUos7%DvErx>8u-F~-D@v^##^f|l|57Dtc9y^RE1BGjT6vUAZbsdT zW%&g45vAzOvY# z-Pq8uMtq^AEgDdwVvVEDQC(hDALX#BR3%2PS~k%UG1E&i`~Iv7VY`-nJDkm`wT3hl zGVnyC5@>dXFs!k|P@i2ZEY5cndJ!$IEDmS0YfUrSOlMNyVfO0G#XEo4sD}GM2kUbj zLJb~aCNhJ<*YeBAS?x9~rPZFJ7g%8tjdGMu;?Rv~2HPC{QnVdMR0C6p%(!V& zh{}NG<>;-%J3{jcY1I|2`f36~9N5tj+)-_(7kQV)J7H`7M(TxQ`5xK?5Asjo**acu z2$NK;D4`$0%>oRaI;Li`%hitk?Ye{^Rdf{WA%>m6`BQ0QDxA!s+hdZ8uC5+UNn+ zhv~vxdK&&f{54~RA9(<*@kpuoAvK1={(#Z}_nx_IRG(HjQ}nWxJ-ANi#?6iE8$8tx Kd`w}!sQho7E^5O7 delta 2251 zcmZ8ieN0nV6u+-6&_0y5K-YrZcoK<{X|V_*I;D!}!;b`}m>8o_p-5we(vJ<7Y1x>w z4YEOQma#t;KekNV9}5h#pmR`k0x??zLzX$0t(uXv%a#dK=M?SExqY1*r|CKOcfRk( zySHQ0hnqSL+VMmSL5gugLS4CMRhN>Pj$G=xIi&UTG2rK8K7M+RyOkbTXZb1B|K(p( z{5Qvc+<3G5+paTLX}4?@C(sF*o-1WMhw-h9uVegW##b`Fh4DISmFsCxZs4?ZSe{)} z-{iD4lIm)^yQ#LgxY}K7ZLB9wug48Kx5rw0u)4P4V0FFK?jQ$jp4tYhi@0poI;v5W z`U=SAZRHzEtMg6yrb6sm20uCDIFd1q0u6)%JqJ?55FvWIeLf)y;+Ayj49m$8341f` zD$I9W@_(qVVWULgU|`gLUXjN65_o}#$AX@O@JFB(+rCy_k?fL)7S5;y63w{>T%Bcs z5#k24MnX}boL>=Rcad?1?;ytRBSD6LKrBbx%kT}vIIqa5s1Gzb*HDpwicaQm88NmR zX=V5#;v~dQhCfHFL|nu0r-*S{kqU;-AjWeLu>dyzULKg(CkF0_ZNJ>D*jYXr99LP0 zI67PdLM4ulewAb);aBNM;_KNeh$LQZl^B=`ABEVxBMA?b0^$C=f>RgU*7|8((lXx; zvF*2pIwweV*U zFti05@L&U2yrV)HYhq-mp11g<%n$yX`CKf~v&`L6W^8W|qFB?cz&lu=5euZlDBJ|h zUv@HlASPRnoNQJfn~hHlR`BVpv_N9}-f*3`BHPH;9nS21u)vvZ*t7Ray-A(*7PL>; zDWySWy0Kd!kSeib8Oj~oa;MC<#Nj7$*gIvoir!V)cDi09<%gV2Znu5E!zR=%Zt}k3 zvb%&FH&1q19X7AaEgWj{Fxk@5BG^2_;lqaoYpus?b2w~nVKw1Fzc$BFzXmNh;OPmK zaW{dH0Dr`X+DU2<_vu@)v=2Bm9p+?0e|5K1K7ktaN^2S({wm z&dp0wf({6M95{GNAMqPh=V7!2(#!fQlWS$F&Lj)kh?8cdEY^k-VhHXSMw7HM#m7-P zky5Pr_Jgt&Oy7>$LVs7CGC?$3$uP9$&o}0o#1q|Rin))T$bzZ<|U!Q8_u-<|+dLqrJa!55Dv@fkl>z9yU z!AcMd{W~pBH704ts5!kz74I@cn*qh=6Q+IXMZ8ApNs~xt(pRR&-<0vhSUQ=UuGX1U zlkj~aP10svkv1fu5MDDtJ@kSuPxb7PnFgOAoM@z=^aRcJ7e7}b<95ZSVOYd{NBayV zTn(Kzl&Dq-%$H2j;*9ICa0@eaawYMD)N^AD@gzhm0fp%snYtD8NWAS>T#U=fd=l^f z|N0bYybq#7z;$vBWWEh32wc~nvVi9@h_vJJFcS=9kZw6O8}*!%mK!&7owUnX%?;3L z<5_N;e(?Oe+$7C?VKMhHt$aZbdgRxTXGGxSX^4S1H8t^sOg>;f$+S634{z=1EPZ(% zTmf2{fwau=d2nXnTu(~BH-tb85 z`vBR(`f100=y;YP;{w)(o?7ShbQL{RKeH^!B;3DHc%Lhn`>KePyI6u UKJ4thA6$5yp3XMW+u2M10gg|O=>Px# diff --git a/Test moteurs/moteur.c b/Test moteurs/moteur.c index 50874eb..d8d2a7d 100644 --- a/Test moteurs/moteur.c +++ b/Test moteurs/moteur.c @@ -1,58 +1,86 @@ #include #include + + +//screen /dev/ttyACM0 int main(){ FILE* fichier; char* port_serie = "/dev/ttyACM0"; - char buffer[30]; + char q; + int angle[2] = {0,0}; + int coeff = 1; - char c = '1'; - double angle[2]; + while(getchar() != 'q'){ - fichier = fopen(port_serie,"r+"); + //Ouverture tty + fichier = fopen(port_serie,"w"); if(fichier==NULL){ printf("Impossible d'ouvrir %s\n",port_serie); - return 0; + perror("fopen failed for /dev/ttyACM0" ); + exit( EXIT_FAILURE ); } - while(c != 'q'){ + /* //Lecture tty printf("Valeurs moteurs xxx et yyy actuelles :\n"); - - - read(angle,sizeof(double),1,fichier); - read(angle+1,sizeof(double),1,fichier); - //fscanf(fichier,"%d %d",angle,angle+1); - - printf("\nxxx=%lf; yyy=%lf\n",angle[0]*0.001,angle[1]*0.001); - - - -/* - fichier = fopen(port_serie,"w+"); - if(fichier==NULL){ - printf("Impossible d'ouvrir %s\n",port_serie); - return 0; - }*/ - printf("\n Valeurs moteurs xxx,yyy ?\n"); - scanf("%lf %lf",angle,angle+1); - - fprintf(fichier,"%lf %lf",angle[0]*0.001,angle[1]*0.001); -/* - fwrite(angle,1,sizeof(int),fichier); - fwrite(angle+1,1,sizeof(int),fichier);*/ - - printf("\nq pour quitter\n"); - - c = getchar(); - c = getchar(); - + fscanf(fichier,"%d %d",angle,angle+1); + printf("\nxxx=%d; yyy=%d\n",angle[0]*coeff,angle[1]*coeff); + */ + //Ecriture tty + printf("\n Valeurs moteurs xxx,yyy ? "); + + while(scanf(" %d %d", angle,angle+1) != 2){ + printf("Angles incorrects, mets les bonnes valeurs cette fois...\n"); + getchar(); + } + + fprintf(fichier,"%d\n",angle[0]*coeff); + fprintf(fichier,"%d\n",angle[1]*coeff); + printf("Valeur actuelles : xxx=%d yyy=%d\n", angle[0],angle[1]); - + //Quitter + fclose(fichier); + printf("\nq pour quitter\n"); + scanf(" %c",&q); + if(q == 'q') break; } - fclose(fichier); + return 0; } +/*fwrite et fread + + read(angle,sizeof(int),1,fichier); + read(angle+1,sizeof(int),1,fichier); + + fwrite(angle,1,sizeof(int),fichier); + fwrite(angle+1,1,sizeof(int),fichier); +*/ + +/*putc() + char buffer[255]; + char* c; + char* c0; + int num; + c=buffer; + c0=buffer; + for(num=0;num<2;){ + printf("a\n"); + *c=getc(stdin); // echo input back to terminal + fputc(*c,fichier); + if(*c == 'q') + break ; + if((*c == '\n') || (*c == '\r') || (*c == '\0') || (*c == ' ') || (*c == ',')) + { + // + *c='\0'; + angle[num]=atoi(c0); + c0=c+1; + num++; + } + c++; + } +*/ diff --git a/Test moteurs/moteur.c~ b/Test moteurs/moteur.c~ new file mode 100644 index 0000000..1e72717 --- /dev/null +++ b/Test moteurs/moteur.c~ @@ -0,0 +1,86 @@ +#include +#include + + +//screen /dev/ttyACM0 + +int main(){ + + FILE* fichier; + + char* port_serie = "/dev/ttyACM0"; + char q; + int angle[2] = {0,0}; + int coeff = 1; + + while(getchar() != 'q'){ + + //Ouverture tty + fichier = fopen(port_serie,"w"); + if(fichier==NULL){ + printf("Impossible d'ouvrir %s\n",port_serie); + perror("fopen failed for /dev/ttyACM0" ); + exit( EXIT_FAILURE ); + } + + + /* //Lecture tty + printf("Valeurs moteurs xxx et yyy actuelles :\n"); + fscanf(fichier,"%d %d",angle,angle+1); + printf("\nxxx=%d; yyy=%d\n",angle[0]*coeff,angle[1]*coeff); +*/ + //Ecriture tty + printf("\n Valeurs moteurs xxx,yyy ? "); + + while(scanf(" %d %d", angle,angle+1) != 2){ + printf("Angles incorrects, mets les bonnes valeurs cette fois...\n"); + getchar(); + } + + fprintf(fichier,"%d\n",angle[0]*coeff); + fprintf(fichier,"%d\n",angle[1]*coeff); + printf("Valeur actuelles : xxx=%d yyy=%d\n", angle[0],angle[1]); + + + //Quitter + fclose(fichier); + printf("\nq pour quitter\n"); + scanf(" %c",&q); + if(q == 'q') break; + } + + return 0; +} +/*fwrite et fread + + read(angle,sizeof(int),1,fichier); + read(angle+1,sizeof(int),1,fichier); + + fwrite(angle,1,sizeof(int),fichier); + fwrite(angle+1,1,sizeof(int),fichier); +*/ + +/*putc() + char buffer[255]; + char* c; + char* c0; + int num; + c=buffer; + c0=buffer; + for(num=0;num<2;){ + printf("a\n"); + *c=getc(stdin); // echo input back to terminal + fputc(*c,fichier); + if(*c == 'q') + break ; + if((*c == '\n') || (*c == '\r') || (*c == '\0') || (*c == ' ') || (*c == ',')) + { + // + *c='\0'; + angle[num]=atoi(c0); + c0=c+1; + num++; + } + c++; + } +*/ diff --git a/Test moteurs/t.txt b/Test moteurs/t.txt deleted file mode 100644 index 92880af..0000000 --- a/Test moteurs/t.txt +++ /dev/null @@ -1 +0,0 @@ -1 1 \ No newline at end of file diff --git a/Test moteurs/tt.txt b/Test moteurs/tt.txt deleted file mode 100644 index f34c70af1d4520e8f207e23ecbd8b75ac39cec47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8 Ncmd;QU|`?}VgLZV03QGV diff --git a/Test moteurs/ttyACM0 b/Test moteurs/ttyACM0 index e69de29..6ed281c 100644 --- a/Test moteurs/ttyACM0 +++ b/Test moteurs/ttyACM0 @@ -0,0 +1,2 @@ +1 +1