DMX: New board

diff --git a/dmx/README b/dmx/README
index 8d351f9b15cbfd4f46c5407042201bf2413c256e..f4f82c635e2d365d12f83615665c6a9a2e2a08ef 100644 (file)
--- 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 f2b89f7f769966a6a37251b59f69701911d1ec6b..47ff5d35e3cb7d34fa70e8c46552f2692626f997 100644 (file)
--- 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)