From 8f439384a73a2242767bad8f49cc54a5c49a6928 Mon Sep 17 00:00:00 2001 From: Trey Marc Date: Mon, 27 Oct 2014 21:26:37 +0100 Subject: [PATCH 1/2] Correct USART init for stm32 autobauding Hello, I had some headache trying to figure out the issue when flashing some stm32 mcu over uart [1] With the above changes i can now flash stm32 devices correctly. regards, 1 : http://www.st.com/web/en/resource/technical/document/application_note/CD00264342.pdf --- .../usbserial/driver/Cp21xxSerialDriver.java | 78 +++++++++---------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java index e9c812c..6b2fc01 100644 --- a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java +++ b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java @@ -249,47 +249,43 @@ public class Cp21xxSerialDriver implements UsbSerialDriver { throws IOException { setBaudRate(baudRate); - int configDataBits = 0; - switch (dataBits) { - case DATABITS_5: - configDataBits |= 0x0500; - break; - case DATABITS_6: - configDataBits |= 0x0600; - break; - case DATABITS_7: - configDataBits |= 0x0700; - break; - case DATABITS_8: - configDataBits |= 0x0800; - break; - default: - configDataBits |= 0x0800; - break; - } - setConfigSingle(SILABSER_SET_LINE_CTL_REQUEST_CODE, configDataBits); - - int configParityBits = 0; // PARITY_NONE - switch (parity) { - case PARITY_ODD: - configParityBits |= 0x0010; - break; - case PARITY_EVEN: - configParityBits |= 0x0020; - break; - } - setConfigSingle(SILABSER_SET_LINE_CTL_REQUEST_CODE, configParityBits); - - int configStopBits = 0; - switch (stopBits) { - case STOPBITS_1: - configStopBits |= 0; - break; - case STOPBITS_2: - configStopBits |= 2; - break; - } - setConfigSingle(SILABSER_SET_LINE_CTL_REQUEST_CODE, configStopBits); + int configDataBits = 0; + switch (dataBits) { + case DATABITS_5: + configDataBits |= 0x0500; + break; + case DATABITS_6: + configDataBits |= 0x0600; + break; + case DATABITS_7: + configDataBits |= 0x0700; + break; + case DATABITS_8: + configDataBits |= 0x0800; + break; + default: + configDataBits |= 0x0800; + break; + } + + switch (parity) { + case PARITY_ODD: + configDataBits |= 0x0010; + break; + case PARITY_EVEN: + configDataBits |= 0x0020; + break; + } + + switch (stopBits) { + case STOPBITS_1: + configDataBits |= 0; + break; + case STOPBITS_2: + configDataBits |= 2; + break; + } + setConfigSingle(SILABSER_SET_LINE_CTL_REQUEST_CODE, configDataBits); } @Override From 4ccaff47b16047375bcb77e67954ff95e314b612 Mon Sep 17 00:00:00 2001 From: treymarc Date: Mon, 27 Oct 2014 22:03:58 +0100 Subject: [PATCH 2/2] source formating :replaced tab --- .../usbserial/driver/Cp21xxSerialDriver.java | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java index 6b2fc01..1faf5df 100644 --- a/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java +++ b/usbSerialForAndroid/src/main/java/com/hoho/android/usbserial/driver/Cp21xxSerialDriver.java @@ -249,43 +249,43 @@ public class Cp21xxSerialDriver implements UsbSerialDriver { throws IOException { setBaudRate(baudRate); - int configDataBits = 0; - switch (dataBits) { - case DATABITS_5: - configDataBits |= 0x0500; - break; - case DATABITS_6: - configDataBits |= 0x0600; - break; - case DATABITS_7: - configDataBits |= 0x0700; - break; - case DATABITS_8: - configDataBits |= 0x0800; - break; - default: - configDataBits |= 0x0800; - break; - } - - switch (parity) { - case PARITY_ODD: - configDataBits |= 0x0010; - break; - case PARITY_EVEN: - configDataBits |= 0x0020; - break; - } - - switch (stopBits) { - case STOPBITS_1: - configDataBits |= 0; - break; - case STOPBITS_2: - configDataBits |= 2; - break; - } - setConfigSingle(SILABSER_SET_LINE_CTL_REQUEST_CODE, configDataBits); + int configDataBits = 0; + switch (dataBits) { + case DATABITS_5: + configDataBits |= 0x0500; + break; + case DATABITS_6: + configDataBits |= 0x0600; + break; + case DATABITS_7: + configDataBits |= 0x0700; + break; + case DATABITS_8: + configDataBits |= 0x0800; + break; + default: + configDataBits |= 0x0800; + break; + } + + switch (parity) { + case PARITY_ODD: + configDataBits |= 0x0010; + break; + case PARITY_EVEN: + configDataBits |= 0x0020; + break; + } + + switch (stopBits) { + case STOPBITS_1: + configDataBits |= 0; + break; + case STOPBITS_2: + configDataBits |= 2; + break; + } + setConfigSingle(SILABSER_SET_LINE_CTL_REQUEST_CODE, configDataBits); } @Override