From a40f7412dbf9a6617b28f85b3f879a9f50a14c12 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 12 Jul 2020 17:55:52 +0200 Subject: [PATCH] DMX: New board --- dmx/README | 4 ++-- dmx/firmware/main.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dmx/README b/dmx/README index 8d351f9..f4f82c6 100644 --- a/dmx/README +++ b/dmx/README @@ -21,8 +21,8 @@ BluePill LED | PC13 GND | | PA6 PA15 | | PA7 PA12 | | PB0 PA11 | - | PB1 PA10 | RXD1 - debugging console -TXD3 - DMX TX (5V OC) | PB10 PA9 | TXD1 - debugging console +DMX TX enable | PB1 PA10 | RXD1 - debugging console +TXD3 - DMX TX | PB10 PA9 | TXD1 - debugging console RXD3 - DMX RX (5V) | PB11 PA8 | | RESET PB15 | | 3.3 V PB14 | diff --git a/dmx/firmware/main.c b/dmx/firmware/main.c index f2b89f7..47ff5d3 100644 --- a/dmx/firmware/main.c +++ b/dmx/firmware/main.c @@ -57,8 +57,12 @@ static void gpio_init(void) // PB10 = TXD3 for DMX // PB11 = RXD3 for DMX - gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_ALTFN_OPENDRAIN, GPIO10); + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO10); gpio_set_mode(GPIOB, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO11); + + // PB1 = TX enable for DMX (always on) + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, GPIO_CNF_OUTPUT_PUSHPULL, GPIO1); + gpio_set(GPIOB, GPIO1); } static void usart_init(void) -- 2.39.2