Merge pull request #135 from Tom-evnut/master

Add USART1 back in HWinit
damienmaguire · Dec 15, 2024 · 60b7d72 · 60b7d72
2 parents 55f87f0 + 9d50b3a
commit 60b7d72
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/include/hwinit.h b/include/hwinit.h
@@ -31,6 +31,7 @@ extern "C"
 void clock_setup(void);
 void usart_setup(void);
 void usart2_setup(void);
+void usart1_setup(void);
 void nvic_setup(void);
 void rtc_setup(void);
 void tim_setup(void);

diff --git a/src/hwinit.cpp b/src/hwinit.cpp
@@ -57,6 +57,7 @@ void clock_setup(void)
     rcc_periph_clock_enable(RCC_GPIOE);
     rcc_periph_clock_enable(RCC_USART3);
     rcc_periph_clock_enable(RCC_USART2);//GS450H Inverter Comms
+	rcc_periph_clock_enable(RCC_USART1);//LIN Comms
     rcc_periph_clock_enable(RCC_TIM1); //GS450H oil pump pwm
     rcc_periph_clock_enable(RCC_TIM2); //GS450H 500khz usart clock
     rcc_periph_clock_enable(RCC_TIM3); //PWM outputs
@@ -102,6 +103,26 @@ void spi3_setup()   //spi3 used for digi pots (fuel gauge etc)
     spi_enable(SPI3);
 }
 
+/**
+* Setup USART1 for LINbus
+*/
+
+void usart1_setup(void)
+{
+   /* Setup GPIO pin GPIO_USART1_TX and GPIO_USART1_RX. */
+   gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
+                 GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
+   gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
+                 GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
+   usart_set_baudrate(USART1, 19200);
+   usart_set_databits(USART1, 8);
+   usart_set_stopbits(USART1, USART_STOPBITS_1);
+   usart_set_mode(USART1, USART_MODE_TX_RX);
+   usart_set_parity(USART1, USART_PARITY_NONE);
+   usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE);
+   usart_enable(USART1);
+}
+
 /**
 * Setup USART2 500000 8N1 for Toyota inverter comms
 */