aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-06-27 13:53:48 -0700
committerPiotr Esden-Tempski2012-06-27 13:53:48 -0700
commit7753b919918be586e7e1d8a0483dde1c63c87d59 (patch)
tree80af4cb804f12e47debd60e476ac678647503d9f
parentdb505a87f7f9b0adc340a26481e830727b448f10 (diff)
parent9531d653fb83bd9864a882a190f286a92499ca72 (diff)
Merge pull request #9 "Even/Odd parity bit configs used the wrong bit"
Merge remote-tracking branch 'karlp/parity'
-rw-r--r--include/libopencm3/stm32/usart.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libopencm3/stm32/usart.h b/include/libopencm3/stm32/usart.h
index d9f2c8d..5c7f285 100644
--- a/include/libopencm3/stm32/usart.h
+++ b/include/libopencm3/stm32/usart.h
@@ -270,8 +270,8 @@
/* CR1_PCE / CR1_PS combined values */
#define USART_PARITY_NONE 0x00
-#define USART_PARITY_ODD USART_CR1_PS
-#define USART_PARITY_EVEN (USART_CR1_PS | USART_CR1_PCE)
+#define USART_PARITY_EVEN USART_CR1_PCE
+#define USART_PARITY_ODD (USART_CR1_PS | USART_CR1_PCE)
#define USART_PARITY_MASK (USART_CR1_PS | USART_CR1_PCE)
/* CR1_TE/CR1_RE combined values */