From 7d5645b5ea2772d36b4490c91ed984c4d9a0937f Mon Sep 17 00:00:00 2001 From: Felipe Herranz Date: Fri, 3 Oct 2014 11:55:24 +0200 Subject: [PATCH] Debug messages for read buffer --- .../SerialBuffer$SynchronizedBuffer.class | Bin 1649 -> 1649 bytes .../com/felhr/usbserial/SerialBuffer.class | Bin 2798 -> 2910 bytes .../felhr/usbserial/UsbSerialDebugger.class | Bin 1724 -> 2448 bytes bin/usbserial.jar | Bin 36517 -> 36724 bytes src/com/felhr/usbserial/SerialBuffer.java | 2 ++ .../felhr/usbserial/UsbSerialDebugger.java | 28 +++++++++++++++++- 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/bin/classes/com/felhr/usbserial/SerialBuffer$SynchronizedBuffer.class b/bin/classes/com/felhr/usbserial/SerialBuffer$SynchronizedBuffer.class index ac3fbd8b7c4ad1cbf024fd1b7d1c12fdc00ea44c..b113e31b7d211d673b82bdba0d05ca91b988baf4 100644 GIT binary patch delta 135 zcmey!^O0wR4U1qA11m!z11CcL1_lp?Mh1U|CWc^!W`;0^R)$oDHiiO*cA(zQ$$G54ioHOc6B&3ICNT&wOkogV kn9iWcFoQvxVJ3qC!z>06H#43$8UDh3&bY6eY) zS_Wf=ItCAhdIo=n28LjUMusqkW`*wWoHih$E8w|xe) zue|pGXf%a*p^4mi=>zx(#uxCgW;&^j;bLa(z1F|}{jI%!M7~FjufIQj0+7Z@%V5eC z14~#@vCI&A6YjsaUN7glZIuq@c)3xlaofZbtTKd-ZR^lk<)zBvQSC8z7y`FTZ9sjont)!0>3c=ne`! zQ|e?Q&h+qnsS7?$UOf!u|1FA8v3n^87p5`R-0P|Jbs4Lu`HV~SeC`99#2A-{&at0M z{hPCcxeo)D=X0Z@^?j%dhj8!0)g8Id64r2x*S>cQOtg%#0oxn94u_&awL$tCkp2Sv C8)oYO delta 682 zcmZuu+fEZv6kTU#pq+6n#c+u=Q7EBJF9LxCUktG|nh+@pD&>wNoob;#GA%?Clll+m z&98t+8sh^b^5#eI3B39StTQcz5R;j+=j^@K+H21~?K$hV{+|Cn0x*i514|fD0liSE z3UsWOUB{bsokDiESadxLQM|D+gIW3A7!&X1p%Lw0u<-hsde=fC!bn^!c=(LfPUT~n6PMz$hPL825 z8$+D=I1+x;k>V|acAgWgK0^o@^dgG^JSSoTX;ym3q!u1yh%tow$f1L|5#H`WTo9-Q zAo!@`DZ?~11iDz?gVyQOyORr3f0BoY*YR3r&BWbF_Im{zlf>oZ7jvZcmc1LSQ6)uo zkc3BdyxZru=6h}T^E19LyMbx?5|~4t8PzpIwDN2!eyWc7gO-5h7v>No_2aDHQaiHgF`+;B1t*ujp0i=I x2n(NloxTRPsY4d?>R%|_XSI!R5G8ChwFe<&|D9OxrayKWTZ|TK5x(2dE&+!gS>gZy diff --git a/bin/classes/com/felhr/usbserial/UsbSerialDebugger.class b/bin/classes/com/felhr/usbserial/UsbSerialDebugger.class index ca09aa6f80bcc73806c57cdf70bf62c6cceef48a..dc3202fbeaef20eef3c2234ed0f5df0139f58a0b 100644 GIT binary patch delta 427 zcmZ|M%}T>S7=__8bs}v+x^N*ys)Nu)iK3`=QT(NX8xf7a)mEL5iFVPZq!Y!By#-{E|f>P&Zkf=i_DaJ@q!7{~dn)09b|m$S?9ip%=Eh+ELOw3?2@Y&f=6o z>`N_0;A+|KDo^-f&=K)OxRLLxuqLuNXP9;5v+&~OxWOfZeH3+E6^g(Y?u%CaF&77; zlMJbpdw zpJR?GS%SXXR*9XNrd4DY=E<5bE`ehi3s^y!-m#7~w6Kl{8|K}z*;Qg2iESkICb6x= b*2r#>-6Fd~c9-lP**e)uj^U2}O$PUW0Pl4a delta 40 vcmbOryoZ99-=Vs&R^**uHYl!=p(ArL6R#1I4k`w$70 diff --git a/bin/usbserial.jar b/bin/usbserial.jar index c8605991c41b59ea56afa1af1c39133ccf106b2d..2c3583b74879537ca023e2aed7e40e60bc23b019 100644 GIT binary patch delta 3725 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 L_%%$}-{t=SUefJ! delta 3493 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 diff --git a/src/com/felhr/usbserial/SerialBuffer.java b/src/com/felhr/usbserial/SerialBuffer.java index e45ae24..ed4af12 100644 --- a/src/com/felhr/usbserial/SerialBuffer.java +++ b/src/com/felhr/usbserial/SerialBuffer.java @@ -64,6 +64,8 @@ public class SerialBuffer byte[] dst = new byte[readBuffer.position()]; readBuffer.position(0); readBuffer.get(dst, 0, dst.length); + if(debugging) + UsbSerialDebugger.printReadLogGet(dst, true); return dst; } } diff --git a/src/com/felhr/usbserial/UsbSerialDebugger.java b/src/com/felhr/usbserial/UsbSerialDebugger.java index ca496e7..3811832 100644 --- a/src/com/felhr/usbserial/UsbSerialDebugger.java +++ b/src/com/felhr/usbserial/UsbSerialDebugger.java @@ -40,6 +40,32 @@ public class UsbSerialDebugger } } - // TODO Debug read buffer + public static void printReadLogGet(byte[] src, boolean verbose) + { + if(!verbose) + { + Log.i(CLASS_ID, "Data obtained from Read buffer: " + new String(src)); + }else + { + Log.i(CLASS_ID, "Data obtained from Read buffer: " + new String(src)); + Log.i(CLASS_ID, "Raw data from Read buffer: " + HexData.hexToString(src)); + Log.i(CLASS_ID, "Number of bytes obtained from Read buffer: " + src.length); + } + } + + public static void printReadLogPut(byte[] src, boolean verbose) + { + if(!verbose) + { + Log.i(CLASS_ID, "Data obtained pushed to read buffer: " + new String(src)); + }else + { + Log.i(CLASS_ID, "Data obtained pushed to read buffer: " + new String(src)); + Log.i(CLASS_ID, "Raw data pushed to read buffer: " + HexData.hexToString(src)); + Log.i(CLASS_ID, "Number of bytes pushed from read buffer: " + src.length); + } + } + + }