From 73f1bf57ae39f12014f2cec10b3c98ec87433be2 Mon Sep 17 00:00:00 2001 From: IMback Date: Tue, 7 Nov 2017 22:07:48 +0100 Subject: [PATCH] broken serial --- CMakeFiles/rgbcontroller.dir/main.cpp.o | Bin 28328 -> 29736 bytes CMakeFiles/rgbcontroller.dir/serial.cpp.o | Bin 16244 -> 16780 bytes main.cpp | 36 +- rgbcontroller | Bin 10024 -> 10472 bytes rgbcontroller.hex | 1178 +++++++++++---------- serial.cpp | 4 +- serial.h | 2 +- 7 files changed, 635 insertions(+), 585 deletions(-) diff --git a/CMakeFiles/rgbcontroller.dir/main.cpp.o b/CMakeFiles/rgbcontroller.dir/main.cpp.o index 78da0932b80cd5537c343c66a323ef10c3295739..8a12142057fdfe69d21fb3ffa3d7941658cff096 100644 GIT binary patch literal 29736 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 Z@q4GDf;jv7(|uDSsOw))&JC{9{{@fj9>)Lx diff --git a/CMakeFiles/rgbcontroller.dir/serial.cpp.o b/CMakeFiles/rgbcontroller.dir/serial.cpp.o index 6aa15a6950e5bd0a7a62a4520d1b20610f4da651..64077dc110e4b4a77dc152f6a0dca3b87bc8777c 100644 GIT binary patch delta 2510 zcmZ|QQAk@?7zgl^yWC8>%%+;PvW1c*Hjz%mb+)*e*&;sp;6R2H88X}$r3@!Bq{xsa zYu#|ejdVw(3@LUL5%ED$h7U4iNGU^x4}Gv;hZ|CSkRn5hjBV`yzxkWpmmN5s-}%n> z-FtF!b3M2|b~8|jzY@(F^SLpm5#5+tlQanv@O*5c`3<)_Y+AjUF>NMndP=S^*GfKa zCQCkLe)9RCS*tIcLluCUGs~eIAp`P;gsj+C8}fo`-o+dWC)wK->0tkNJup%KQMq=Mm3g zA%;nW6F33KP4Fd{H={df?f`AT=V9h6J}UDR$K^^mH>F7(CUY_`x-4hl zHMt$$fO#`|i#`sp;h2sbhU1D?%jb|%BWK};qI2F)C#!`4EVRpcxJ$kP_sU}xpyb4ds_u(0N8(u2I_s^X^!DLknyYRZa2XD%M!aH&$p765rVl6ivl^KuA zQMeA~snAU{&mXPx$hg1hVSyH|%0a{jWgcB#=2tTY^Fs7(`UHSB@AC@t6@TFKLm8jL zY{NMw)nl@!g)aC|z6=NP8)Qy59D#W=I!5yeLhJCkoB4`=D5sD!AoE_saxd<0Mm6cj z!niyOPszW+bMg+nEbqc=@*%t-8yxkPTmkRO{0a`_7;Nxfh*#qLTQLcH6YLVMmM7pE z`DeIY-hjJ&?uB_0jQ7!1xH#H~&jscyKI!vJP7{9pOETYLt1^#nU2cFkWj+%-FmFch z(@_8|iWkz6`C^MJUgvX@d?JK`HWko$`|;~HbMHb94vTO8_t1lUVWEA1PUEARE3$*} zBl$UugXl-KLyVuoAGBd~nzebEwIecXzbTr(3S+)4PP~E%nFZg;EVx5!bKlFn!L-c$ zS(*7uG6u6OGk-;9{wkhI@1iVNrGb#ruF|Hv$MkjOZT!!l?hG6wH;!yM*U2NrLft1kh-q%wZH69*Wo^!$T<^N)aZ-gA4~AWQ4Kr_vPF1eh}a1_x=6N z@4Y;$bD`6jTKv7{C&t`2#$@m@CS{T)VM4yczkD|6rh3d3zh=y^=`pwdcduEN`*3|= zHn!c#m~A9(I&*(+q>=++2idg?e>oM7DZ0kQUpM}klKcR984e+*r|CBUlv==b_E)|d za6=BG|CWrY%&r`T_gz!*2fvHTp&HJ?Co(tRls!0t*|-V1n{EeCvH=gnaphwHPskDU zzah6{eRE5d4m8ZdoRqH8ZvrUm0dKOu@*SC9;E5cA599=VET`Zz`2)D^Rm@YtL|Ig# zsBkelMso)!g@8vnK>4`LW4tbR!c+1^_^!-37vxXjMR^3Stf0chSXrar0#Nn>e#QaH zkK{D^oXR;4z`3#ypT~B23htF>;Xe5uJkWB*e1l3(4Rv@#{t+(9>u^clg3IzYJS`u< z^YRP0CLh6d`50c6|A8A3+<)%66F;hbHE`F5GV>F;8*aipAv*FJ%=1Ty2YeBZE6>Vp z=rb(ycvCLIJMx$C6L}myfGb># zm19&we1cG7_@TaZ3XUt!$R7F>WG*%;m*8=E6230~1W(D&;k)u7);9~P9HC)RK7&_e zgQH%PJK*1B-hzj64BnHkz|Z6<_(=X9K9wKCy?BqrJ8}MdsPy@jmIq*dd*(U13%fxn z23%r)<>i2(ISlxOgOxV}j^L%mJdFO` zFvrqk_G)^rQiR(0jzZzhrt$5}gzVs2l3&5~CO!_%Y8ltt%zN+$write("ST"); + serial->write(relays->count); + for(uint8_t i = 0; i < relays->count; i++) + { + serial->putChar(','); + relays->array[i].getExpectedState() ? serial->putChar('1') : serial->putChar('0'); + } + serial->putChar('\n'); +} + void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial) { if( strncmp(inBuffer, "add", 3) == 0 && inBuffer[3] != '\0') @@ -78,6 +92,7 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial) char buffer[64]; sprintf(buffer, "RELAY: %u turned on\n", selected); serial->write(buffer, 64); + if(relays->printState) writeState(relays, serial); } else serial->write("No sutch Relay\n"); } @@ -91,16 +106,23 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial) char buffer[64]; sprintf(buffer, "RELAY: %u turned off\n", selected); serial->write(buffer, 64); + if(relays->printState) writeState(relays, serial); } else serial->write("No sutch Relay\n"); } else if( strncmp(inBuffer, "state", 5) == 0 && inBuffer[3] != '\0') { - serial->write("ST"); - serial->write(relays->count); - serial->putChar(','); - for(uint8_t i = 0; i < relays->count; i++) relays->array[i].getExpectedState() ? serial->putChar('1') : serial->putChar('0'); - serial->putChar('\n'); + writeState(relays, serial); + } + else if( strncmp(inBuffer, "machine on", 7) == 0 ) + { + relays->printState = true; + serial->write("Turned on State printing\n"); + } + else if( strncmp(inBuffer, "machine off", 8) == 0 ) + { + relays->printState = false; + serial->write("Turned off State printing\n"); } else { @@ -173,7 +195,7 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled) if(serial->dataIsWaiting()) { char buffer[COMMAND_BUFFER_SIZE]; - const int length = serial->getString(buffer, COMMAND_BUFFER_SIZE); + unsigned int length = serial->getString(buffer, COMMAND_BUFFER_SIZE); if(length != 0) { if(length > 4 && strncmp(buffer, "relay", 5) == 0) diff --git a/rgbcontroller b/rgbcontroller index 5f1fdb959a8652f6e45780511ee06453d53e5ad8..1b2f961caa09c0f81b627caae08535a58b55216f 100755 GIT binary patch delta 3435 zcma)93s6&68qNuZ6+kUtg9vxhNp4V! zU2Af4u3)#d=vFDHRjICz?y70m3Y{If+U+>qZ7l~xKvW>ph&XG@{^y1($aK0JIJy7% zpWpfZb8hafThx{9GRUu|a*2tvh+Zb6Lm`vNZB^$N$bg^>fDG@1>?*26e4erAR;!grm3pFRi1azT$10mfi$6hlJgYdO;tZK zvn4q$VkcUDi40bQe=kp+NLQtIJMo)@BQ@BG_aa@6-l)eqtmVC$%yttwj~W5lF-1SV zCV$yh&{j(5yiw6E%mL))j$!0C9_GW$Z!Jw*fHHb2v|QXSQaG7!t)I-13zM4>swzf4 zsJS(=&)0-Dzb7#$sAzS)+vdLPJ_$V%+*19sL-jZEy0Zf|{=3V%OV=)c2lUcHhZTo} zR{+Mk2W2A&oDBpzfWW)nt4I#CozV=S-t0l6fqg#8?kz^Q#_vb-$c`FAa0ayR3&`VE z(UN;R{3Q5cQb40Y*mSPpzX3!R4;t-ar&bH+P!lA2PqsqH>nbHyLF{YqFf6an-_;v^ zS5d$yP*cADDNqd}sEWHB`HL_Y7FpC?TJUt0&xz^S&?~}xFqL!K)Ww0at8NPT(Gb~oC(&=@XI$FG%)Ova<-Fg^K zyz`Db;paCbZct2PEcb`f;s=T-TX9zzaZXYBcwqoVIl^`|A&p3M-Q*^u5~cGX(SvkG z^TMR8NrhtJ159ye8QCWCXzd<`xdJw*Kg#b{%2@7|5sNSn*vyma0wL5-Npr5&_#GRV zwP0Q>CbYoDl-B){FIQ||K#&!*uZV52_KdWfhwKHgZ>9>bL0hELS4cME*1+@yn*uA7 zkT0T*r-w5{~1h8n&?)vJ`B~%3dl<`}# zgH_n0Fs!H$1601*VguLQ85uHL3|R*upF_xc`PYI!{p()ZY}kq;(r159OIn8G@eQSZ zZZXU$yhcU8c=|#d^}=q}IjyvBhgjF%M{gkOI!0E_@R>WMD7TQ;xdl&GB_j^6ROOO<{mk<7SZac1lS#E5Rl2xi%7ff-9!2E{vGJ68*F zA3|Im#MLV$O9oh;jp0p)mQ6sZ3o5#R3>T2$0y13nO1vOAQCkaO zJ_Imzz!Rvp2FFcFT=t^zF`B{-AOkx!tkPq5{f|6Xf@i??9}JGMjY2fU<43Wl2qSkCY9_vtd?KMNYWgT zs5jNoOluguBf$~xpwX&*{@D0k{;1>;d7;!NV-sI>G8zcUHJLM1eOaE4^geQDX}?j! zZ&v?ZKHmMh!4|3fr< zJ#LK5Kwsj=k;mlQ)wnil2YMS%j4n`|R2%RKTpgVOk{zUL(J|vW?&9E>Sk!?h z#JsHR?0o`B&f@hk$@;M1UUpz7(RuYDj>%Q+p#M^LoSY(eTYmt#4mZTiM}zorOe^x? zZ^orV9(C+bXHbLHteTo>!0m$bO8pgR&r?TvBMvIn(C!e8{AMfTe+cpx3r z{+53v9OZqeJJ=gvQu8i>&#E602P8Q2kFNJPse+cKMAC-LA8N+ uQA&!O=<(*1gh2YzGcFbX2{dr|3@)Zr+?|pV?SeO=S@32gedt>f{rnfbU%;9G delta 3065 zcmai0dr(tX8qW#bH$>ESc9S_d z-~C>{?{#j@VDXV6hh9Ey2A`I;;A)CYMiwQL$>gvQEQ^j1Hi<~AQNYrOM8FgYDJ61_jVbwT7-}l^>!D{jMZqmVxLsRfRf3Sboy;o4! zGw^x$e-1uNg16n~MVEUqcq<#4s%ZlxL#AP~uL8JT>!s4a1#LgUb|jA=0~Z_+(vniD zqL=K6lyCN4aWH2D$~+cFd$+hd(WA$Oew8lmRsdQY`@SIT0&IOXA+5#pgsMdyj`o z?^NlW8tAzWRwHf@oze_`gfwPdj8TU*kL!O9k>iny^A!b5`45wB@m58=)zV)hHs;ZO z!99lJ?a_O?kXkDFk(@3>OVl}_$l;l(o;hdvoJ|sNG-K(jfz~aBVy_#R3UiG=WEIr= zfi4GWnR^LoaR?U*LiCix=UR18F^j1L@k+^I`4g3U$zKX5krjT&th-$!zU*E`0AW@_ zReQ;AnUrqI3*wV9o^5qabantNa-3?r0LAAF|!maa?S4I_R zO?k@qZ|DtKIo;*MJMo|COys~f=~A=;7c%L(e>K6upFH>W-n#Sk1N+X$p4%mKBizIa zN?gmNE9*^dMpk$W|A|Sm+KMHb?nXgwD^NjREBz%h6q}6~(I%7C*o{7tG&^Z&&5+xSM@9-))h_TjH0iclhsQZI$yHR|H?&!2vC`Jt?r6x;0?OpB~$n}bzl2M~t7*;J}mN2g|Ma)X(O=dOoF0&TaI;M;% zXDXQ*=6y#0z0qSCQVY?zAm(6-i{8pvnu0JF2>r%X3N9Moi=Iy9av=*` zAG<&fie0fYGF7 zgdT_EFQ(@MWdo{b`gHUw{9t+}GUL?5BvgV66AP7h2gbq4Y|JHQ>KfD@ZfuXJ@#&`7 zbDH~szf5ynJSlnxiB1asI&mr5fg_W8P&xJ_<$@nwaw>2ZCC9_>n&eXXXDt3}vYl)O z?JnS**An?nZ9(x4_OqB5{b!J^&jDA&9qc 0 && _rxIndex - BUFFER_SIZE > 0) + if (interruptIndex - BUFFER_SIZE > 0 && _rxIndex - BUFFER_SIZE > 0) { interruptIndex -= BUFFER_SIZE; _rxIndex -= BUFFER_SIZE; - }*/ + } if(serialFlowControl && !stopped && interruptIndex - _rxIndex > BUFFER_SIZE - 64) { loop_until_bit_is_set(UCSR0A, UDRE0); diff --git a/serial.h b/serial.h index a262893..a1576f9 100644 --- a/serial.h +++ b/serial.h @@ -1,7 +1,7 @@ #ifndef SERIAL_H #define SERIAL_H -#define BAUD 19200 +#define BAUD 38400 #define BUFFER_SIZE 1024 #include