Merge branch 'master' of
ssh://git@stash.nordicsemi.no:7999/apps-android/dfu-library.git Conflicts: src/no/nordicsemi/android/dfu/HexInputStream.java
This commit is contained in:
commit
08770b583f
|
@ -25,7 +25,7 @@ import no.nordicsemi.android.dfu.exception.HexFileValidationException;
|
||||||
* </p>
|
* </p>
|
||||||
*/
|
*/
|
||||||
public class HexInputStream extends FilterInputStream {
|
public class HexInputStream extends FilterInputStream {
|
||||||
private final int LINE_LENGTH = 128;
|
private final int LINE_LENGTH = 20;
|
||||||
private final byte[] localBuf;
|
private final byte[] localBuf;
|
||||||
private int localPos;
|
private int localPos;
|
||||||
private int pos;
|
private int pos;
|
||||||
|
|
Loading…
Reference in New Issue