Changeset - ddd34459834e
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Ethan Zonca - 10 years ago 2016-03-31 21:20:26
ez@ethanzonca.com
Add GPS code
5 files changed with 65 insertions and 144 deletions:
inc/gps.h
12
8
inc/usart.h
2
2
src/gps.c
22
96
src/main.c
3
5
src/usart.c
26
33
0 comments (0 inline, 0 general)
inc/gps.h
➞
Show inline comments
 
@@ -30,17 +30,21 @@
 
#include <stdint.h>
 

			




	
	
	
		
 
// Hardware config

			




	
	
	
		
 
#define GPS_USART USART1

			




	
	
	
		
 
/*#define GPS_USART USART1

			




	
	
	
		
 
#define GPS_IRQ NVIC_USART1_IRQ

			




	
	
	
		
 

			




	
	
	
		
 
#define GPS_TX_PIN GPIO_PIN_6

			




	
	
	
		
 
#define GPS_RX_PIN GPIO_PIN_7

			




	
	
	
		
 
#define GPS_RXTX_PORT GPIOB

			




	
	
	
		
 
#define GPS_TX_PORT GPIOB

			




	
	
	
		
 
#define GPS_TX_PIN GPIO6

			




	
	
	
		
 
#define GPS_TX_AF GPIO_AF0

			




	
	
	
		
 

			




	
	
	
		
 
#define GPS_ONOFF_PORT GPIOF

			




	
	
	
		
 
#define GPS_ONOFF_PIN GPIO_PIN_1

			




	
	
	
		
 
#define GPS_RX_PORT GPIOB

			




	
	
	
		
 
#define GPS_RX_PIN GPIO7

			




	
	
	
		
 
#define GPS_RX_AF GPIO_AF0

			




	
	
	
		
 

			




	
	
	
		
 
#define GPS_ONOFF_PORT GPIOA

			




	
	
	
		
 
#define GPS_ONOFF_PIN GPIO1

			




	
	
	
		
 
#define GPS_ONOFF GPS_ONOFF_PORT, GPS_ONOFF_PIN

			




	
	
	
		
 

			




	
	
	
		
 
*/

			




	
	
	
		
 
// Messages (REMOVEME?)

			




	
	
	
		
 
#define GGA_MESSAGE

			




	
	
	
		
 
#define RMC_MESSAGE

			




	
	
		
 
@@ -62,7 +66,7 @@ char* get_hdop(void);

			




	
	
	
		
 
char* get_sv(void);

			




	
	
	
		
 
char* get_dayofmonth(void);

			




	
	
	
		
 
uint8_t gps_hasfix(void);

			




	
	
	
		
 
void gps_process(void);

			




	
	
	
		
 
void parse_gps_transmission(void);

			




	
	
	
		
 
void XORbyteWithChecksum(uint8_t byte);

			




	
	
	
		
 

			




	
	
	
		
 
#endif /* GPS_H_ */

			




        

    


    
    

    

        

                

                    inc/usart.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -3,7 +3,7 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "stm32f0xx_hal.h"

			




	
	
	
		
 

			




	
	
	
		
 
extern UART_HandleTypeDef huart1;

			




	
	
	
		
 
void MX_USART1_UART_Init(void);

			




	
	
	
		
 
void uart_init(void);

			




	
	
	
		
 
UART_HandleTypeDef* uart_gethandle(void);

			




	
	
	
		
 

			




	
	
	
		
 
#endif 

			




        

    


    
    

    

        

                

                    src/gps.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
// TODO: Transition to using https://github.com/cuspaceflight/joey-m/blob/master/firmware/gps.c requesting UBX data

			




	
	
	
		
 

			




	
	
	
		
 
#include "stm32f0xx_hal.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include <string.h>

			




	
	
	
		
 

			




	
	
	
		
 
#include "config.h"

			




	
	
	
		
 
#include "usart.h"

			




	
	
	
		
 
#include "gps.h"

			




	
	
	
		
 
/*

			




	
	
	
		
 

			




	
	
	
		
 
void serial0_sendString(const char* string) {

			




	
	
	
		
 
	while(*string != 0x00)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		usart_send_blocking(USART1, *string);

			




	
	
	
		
 
		string++;

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 
*/

			




	
	
	
		
 
// Circular buffer for incoming data

			




	
	
	
		
 
uint8_t nmeaBuffer[NMEABUFFER_SIZE];

			




	
	
	
		
 

			




	
	
		
 
@@ -44,13 +36,13 @@ char tramsmissionType[7];

			




	
	
	
		
 
void gps_poweron(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // NOTE: pchannel

			




	
	
	
		
 
    HAL_GPIO_WritePin(GPS_ONOFF, 0);

			




	
	
	
		
 
    gpio_clear(GPS_ONOFF);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void gps_poweroff(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // NOTE: pchannel

			




	
	
	
		
 
    HAL_GPIO_WritePin(GPS_ONOFF, 1);

			




	
	
	
		
 
    gpio_set(GPS_ONOFF);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
char timestamp[12];	//hhmmss.ss

			




	
	
		
 
@@ -111,9 +103,9 @@ char* get_gpsaltitude()

			




	
	
	
		
 
	return altitude;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
//char wgs84Height[8];	//sxxx.x

			




	
	
	
		
 
//char lastUpdated[8];	//blank - included for testing

			




	
	
	
		
 
//char stationID[8];	//blank - included for testing

			




	
	
	
		
 
char wgs84Height[8];	//sxxx.x

			




	
	
	
		
 
char lastUpdated[8];	//blank - included for testing

			




	
	
	
		
 
char stationID[8];	//blank - included for testing

			




	
	
	
		
 
char checksum[3];	//xx

			




	
	
	
		
 

			




	
	
	
		
 
char knots[8];		//xxx.xx

			




	
	
		
 
@@ -180,24 +172,15 @@ enum decodeState {

			




	
	
	
		
 

			




	
	
	
		
 
void usart1_isr(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
//	uint8_t recv = usart_recv(GPS_USART);

			




	
	
	
		
 
//    HAL_UART_Receive(huart1, uint8_t *pData, uint16_t Size, uint32_t Timeout);

			




	
	
	
		
 

			




	
	
	
		
 
	uint8_t recv = usart_recv(GPS_USART);

			




	
	
	
		
 
	//ECHO debug: usart_send_blocking(GPS_USART, recv);

			




	
	
	
		
 
//	nmeaBuffer[nmeaBufferDataPosition % NMEABUFFER_SIZE] = recv;

			




	
	
	
		
 
	nmeaBuffer[nmeaBufferDataPosition % NMEABUFFER_SIZE] = recv;

			




	
	
	
		
 
	nmeaBufferDataPosition = (nmeaBufferDataPosition + 1) % NMEABUFFER_SIZE;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
UART_HandleTypeDef huart1;

			




	
	
	
		
 
DMA_HandleTypeDef hdma_usart1_rx;

			




	
	
	
		
 
DMA_HandleTypeDef hdma_usart1_tx;

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
void gps_init() 

			




	
	
	
		
 
{

			




	
	
	
		
 
    uart_init();

			




	
	
	
		
 
    timestamp[0] = 0x00;

			




	
	
	
		
 
    latitude[0] = 0x00;

			




	
	
	
		
 
    longitude[0] = 0x00;

			




	
	
		
 
@@ -207,66 +190,6 @@ void gps_init()

			




	
	
	
		
 
    course[0] = 0x00;

			




	
	
	
		
 
    dayofmonth[0] = 0x00;

			




	
	
	
		
 

			




	
	
	
		
 
    // Initialize GPS pins

			




	
	
	
		
 
    __GPIOF_CLK_ENABLE();

			




	
	
	
		
 
    GPIO_InitTypeDef GPIO_InitStruct;

			




	
	
	
		
 
    GPIO_InitStruct.Pin = GPS_ONOFF_PIN;

			




	
	
	
		
 
    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;

			




	
	
	
		
 
    GPIO_InitStruct.Pull = GPIO_NOPULL;

			




	
	
	
		
 
    GPIO_InitStruct.Speed = GPIO_SPEED_LOW;

			




	
	
	
		
 
    HAL_GPIO_Init(GPS_ONOFF_PORT, &GPIO_InitStruct);

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    __USART1_CLK_ENABLE();

			




	
	
	
		
 
    GPIO_InitStruct.Pin = GPS_TX_PIN|GPS_RX_PIN;

			




	
	
	
		
 
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

			




	
	
	
		
 
    GPIO_InitStruct.Pull = GPIO_PULLUP;

			




	
	
	
		
 
    GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;

			




	
	
	
		
 
    GPIO_InitStruct.Alternate = GPIO_AF0_USART1;

			




	
	
	
		
 
    HAL_GPIO_Init(GPS_RXTX_PORT, &GPIO_InitStruct);

			




	
	
	
		
 

			




	
	
	
		
 
/*  

			




	
	
	
		
 
    hdma_usart1_rx.Instance = DMA1_Channel3;

			




	
	
	
		
 
    hdma_usart1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;

			




	
	
	
		
 
    hdma_usart1_rx.Init.PeriphInc = DMA_PINC_DISABLE;

			




	
	
	
		
 
    hdma_usart1_rx.Init.MemInc = DMA_MINC_DISABLE;

			




	
	
	
		
 
    hdma_usart1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;

			




	
	
	
		
 
    hdma_usart1_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;

			




	
	
	
		
 
    hdma_usart1_rx.Init.Mode = DMA_CIRCULAR;

			




	
	
	
		
 
    hdma_usart1_rx.Init.Priority = DMA_PRIORITY_LOW;

			




	
	
	
		
 
    HAL_DMA_Init(&hdma_usart1_rx);

			




	
	
	
		
 

			




	
	
	
		
 
    __HAL_LINKDMA(huart,hdmarx,hdma_usart1_rx);

			




	
	
	
		
 

			




	
	
	
		
 
    hdma_usart1_tx.Instance = DMA1_Channel2;

			




	
	
	
		
 
    hdma_usart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;

			




	
	
	
		
 
    hdma_usart1_tx.Init.PeriphInc = DMA_PINC_DISABLE;

			




	
	
	
		
 
    hdma_usart1_tx.Init.MemInc = DMA_MINC_DISABLE;

			




	
	
	
		
 
    hdma_usart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;

			




	
	
	
		
 
    hdma_usart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;

			




	
	
	
		
 
    hdma_usart1_tx.Init.Mode = DMA_NORMAL;

			




	
	
	
		
 
    hdma_usart1_tx.Init.Priority = DMA_PRIORITY_LOW;

			




	
	
	
		
 
    HAL_DMA_Init(&hdma_usart1_tx);

			




	
	
	
		
 

			




	
	
	
		
 
    __HAL_LINKDMA(huart,hdmatx,hdma_usart1_tx);

			




	
	
	
		
 
*/

			




	
	
	
		
 
//    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);

			




	
	
	
		
 
//    HAL_NVIC_EnableIRQ(USART1_IRQn);

			




	
	
	
		
 
 

			




	
	
	
		
 

			




	
	
	
		
 
    huart1.Instance = USART1;

			




	
	
	
		
 
    huart1.Init.BaudRate = 9600;

			




	
	
	
		
 
    huart1.Init.WordLength = UART_WORDLENGTH_8B;

			




	
	
	
		
 
    huart1.Init.StopBits = UART_STOPBITS_1;

			




	
	
	
		
 
    huart1.Init.Parity = UART_PARITY_NONE;

			




	
	
	
		
 
    huart1.Init.Mode = UART_MODE_TX_RX;

			




	
	
	
		
 
    huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;

			




	
	
	
		
 
    huart1.Init.OverSampling = UART_OVERSAMPLING_16;

			




	
	
	
		
 
    huart1.Init.OneBitSampling = UART_ONEBIT_SAMPLING_DISABLED ;

			




	
	
	
		
 
    huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;

			




	
	
	
		
 
    HAL_UART_Init(&huart1);

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    gps_poweron();

			




	
	
	
		
 
    HAL_Delay(100); // Make sure GPS is awake and alive

			




	
	
	
		
 

			




	
	
		
 
@@ -286,10 +209,13 @@ void gps_init()

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
void gps_sendubx(uint8_t* dat, uint8_t size)

			




	
	
	
		
 
{

			




	
	
	
		
 
    HAL_UART_Transmit(&huart1, dat, size, 100);

			




	
	
	
		
 
    uint8_t sendctr;

			




	
	
	
		
 
    for(sendctr = 0; sendctr < size; sendctr++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        usart_send(GPS_USART, dat[sendctr]);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
// Could inline if program space available

			




	
	
		
 
@@ -310,7 +236,7 @@ static void setParserState(uint8_t state

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
//// MKa GPS transmission parser START

			




	
	
	
		
 
void gps_process(void){

			




	
	
	
		
 
void parse_gps_transmission(void){

			




	
	
	
		
 
	

			




	
	
	
		
 
	// Pull byte off of the buffer

			




	
	
	
		
 
	char byte;

			




	
	
		
 
@@ -530,14 +456,14 @@ void gps_process(void){

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else if(byte == ',') //end of this data type

			




	
	
	
		
 
			{

			




	
	
	
		
 
				//wgs84Height[numBytes] = 0x00;

			




	
	
	
		
 
				wgs84Height[numBytes] = 0x00;

			




	
	
	
		
 
				setParserState(GGA_LAST_UPDATE);

			




	
	
	
		
 
				skipBytes = 0; //prep for next phase of parse

			




	
	
	
		
 
				numBytes = 0;

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else //store data

			




	
	
	
		
 
			{

			




	
	
	
		
 
				//wgs84Height[numBytes] = byte; //adjust number of bytes to fit array

			




	
	
	
		
 
				wgs84Height[numBytes] = byte; //adjust number of bytes to fit array

			




	
	
	
		
 
				numBytes++;

			




	
	
	
		
 
				setParserState(GGA_WGS84);

			




	
	
	
		
 
			}

			




	
	
		
 
@@ -548,13 +474,13 @@ void gps_process(void){

			




	
	
	
		
 
		{

			




	
	
	
		
 
			if (byte == ',') //end of this data type

			




	
	
	
		
 
			{

			




	
	
	
		
 
				//lastUpdated[numBytes] = 0x00;

			




	
	
	
		
 
				lastUpdated[numBytes] = 0x00;

			




	
	
	
		
 
				setParserState(GGA_STATION_ID);

			




	
	
	
		
 
				numBytes = 0; //prep for next phase of parse

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else //store data - this should be blank

			




	
	
	
		
 
			{

			




	
	
	
		
 
				//lastUpdated[numBytes] = byte; //adjust number of bytes to fit array

			




	
	
	
		
 
				lastUpdated[numBytes] = byte; //adjust number of bytes to fit array

			




	
	
	
		
 
				numBytes++;

			




	
	
	
		
 
				setParserState(GGA_LAST_UPDATE);

			




	
	
	
		
 
			}

			




	
	
		
 
@@ -565,13 +491,13 @@ void gps_process(void){

			




	
	
	
		
 
		{

			




	
	
	
		
 
			if (byte == ',' || byte == '*') //end of this data type

			




	
	
	
		
 
			{

			




	
	
	
		
 
				//stationID[numBytes] = 0x00;

			




	
	
	
		
 
				stationID[numBytes] = 0x00;

			




	
	
	
		
 
				setParserState(GPS_CHECKSUM);

			




	
	
	
		
 
				numBytes = 0; //prep for next phase of parse

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else //store data - this should be blank

			




	
	
	
		
 
			{

			




	
	
	
		
 
				//stationID[numBytes] = byte; //adjust number of bytes to fit array

			




	
	
	
		
 
				stationID[numBytes] = byte; //adjust number of bytes to fit array

			




	
	
	
		
 
				numBytes++;

			




	
	
	
		
 
				setParserState(GGA_STATION_ID);

			




	
	
	
		
 
			}

			




        

    


    
    

    

        

                

                    src/main.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -88,6 +88,7 @@ int main(void)

			




	
	
	
		
 
    dma_init();

			




	
	
	
		
 
    adc_init();

			




	
	
	
		
 
    i2c_init();

			




	
	
	
		
 
    gps_init();

			




	
	
	
		
 

			




	
	
	
		
 
    // Disable ICs

			




	
	
	
		
 
    HAL_GPIO_WritePin(OSC_NOTEN, 1);

			




	
	
		
 
@@ -110,8 +111,6 @@ int main(void)

			




	
	
	
		
 
    HAL_Delay(100);

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
//    MX_USART1_UART_Init();

			




	
	
	
		
 

			




	
	
	
		
 
    jtencode_init();

			




	
	
	
		
 
    //gps_init();

			




	
	
	
		
 

			




	
	
		
 
@@ -139,7 +138,7 @@ int main(void)

			




	
	
	
		
 
        

			




	
	
	
		
 
        if(HAL_GetTick() - led_timer > 100)

			




	
	
	
		
 
        {

			




	
	
	
		
 
            HAL_GPIO_TogglePin(LED_BLUE);

			




	
	
	
		
 
//            HAL_GPIO_TogglePin(LED_BLUE);

			




	
	
	
		
 
            led_timer = HAL_GetTick();

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if(HAL_GetTick() - last_gps > 3000)

			




	
	
		
 
@@ -150,7 +149,6 @@ int main(void)

			




	
	
	
		
 

			




	
	
	
		
 
        enter_sleep();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
		
 
@@ -163,6 +161,7 @@ void enter_sleep(void)

			




	
	
	
		
 
    //HAL_ResumeTick();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
void enter_deepsleep(void) 

			




	
	
	
		
 
{

			




	
	
	
		
 
    // Request to enter STOP mode with regulator in low power mode

			




	
	
		
 
@@ -172,7 +171,6 @@ void enter_deepsleep(void)

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
// Initialize system clocks

			




	
	
	
		
 
void sysclk_init(void)

			




	
	
	
		
 
{

			




        

    


    
    

    

        

                

                    src/usart.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
#include "stm32f0xx_hal.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "usart.h"

			




	
	
	
		
 

			




	
	
	
		
 
#include "config.h"

			




	
	
	
		
 
#include "gpio.h"

			




	
	
	
		
 
#include "dma.h"

			




	
	
	
		
 

			




	
	
	
		
 
/* USER CODE BEGIN 0 */

			




	
	
	
		
 

			




	
	
	
		
 
/* USER CODE END 0 */

			




	
	
	
		
 
UART_HandleTypeDef huart1;

			




	
	
	
		
 
DMA_HandleTypeDef hdma_usart1_rx;

			




	
	
	
		
 
DMA_HandleTypeDef hdma_usart1_tx;

			




	
	
	
		
 

			




	
	
	
		
 
//UART_HandleTypeDef huart1;

			




	
	
	
		
 
//DMA_HandleTypeDef hdma_usart1_rx;

			




	
	
	
		
 
//DMA_HandleTypeDef hdma_usart1_tx;

			




	
	
	
		
 
void uart_init(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
    __USART1_CLK_ENABLE();

			




	
	
	
		
 

			




	
	
	
		
 
    GPIO_InitTypeDef GPIO_InitStruct;

			




	
	
	
		
 

			




	
	
	
		
 
/* USART1 init function */

			




	
	
	
		
 
/*

			




	
	
	
		
 
void MX_USART1_UART_Init(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
    // Init gpio pins for uart

			




	
	
	
		
 
    GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7;

			




	
	
	
		
 
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

			




	
	
	
		
 
    GPIO_InitStruct.Pull = GPIO_PULLUP;

			




	
	
	
		
 
    GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;

			




	
	
	
		
 
    GPIO_InitStruct.Alternate = GPIO_AF0_USART1;

			




	
	
	
		
 
    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

			




	
	
	
		
 

			




	
	
	
		
 
    // Init UART periph

			




	
	
	
		
 
  huart1.Instance = USART1;

			




	
	
	
		
 
  huart1.Init.BaudRate = 9600;

			




	
	
	
		
 
    huart1.Init.BaudRate = GPS_BAUDRATE;

			




	
	
	
		
 
  huart1.Init.WordLength = UART_WORDLENGTH_8B;

			




	
	
	
		
 
  huart1.Init.StopBits = UART_STOPBITS_1;

			




	
	
	
		
 
  huart1.Init.Parity = UART_PARITY_NONE;

			




	
	
		
 
@@ -28,25 +36,7 @@ void MX_USART1_UART_Init(void)

			




	
	
	
		
 
  huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;

			




	
	
	
		
 
  HAL_UART_Init(&huart1);

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 
*/

			




	
	
	
		
 
/*

			




	
	
	
		
 
void HAL_UART_MspInit(UART_HandleTypeDef* huart)

			




	
	
	
		
 
{

			




	
	
	
		
 

			




	
	
	
		
 
  GPIO_InitTypeDef GPIO_InitStruct;

			




	
	
	
		
 
  if(huart->Instance==USART1)

			




	
	
	
		
 
  {

			




	
	
	
		
 
    __USART1_CLK_ENABLE();

			




	
	
	
		
 

			




	
	
	
		
 
    GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7;

			




	
	
	
		
 
    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;

			




	
	
	
		
 
    GPIO_InitStruct.Pull = GPIO_PULLUP;

			




	
	
	
		
 
    GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;

			




	
	
	
		
 
    GPIO_InitStruct.Alternate = GPIO_AF0_USART1;

			




	
	
	
		
 
    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);

			




	
	
	
		
 

			




	
	
	
		
 
  

			




	
	
	
		
 
 /* // Init UART DMA 

			




	
	
	
		
 
    hdma_usart1_rx.Instance = DMA1_Channel3;

			




	
	
	
		
 
    hdma_usart1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;

			




	
	
	
		
 
    hdma_usart1_rx.Init.PeriphInc = DMA_PINC_DISABLE;

			




	
	
		
 
@@ -70,9 +60,12 @@ void HAL_UART_MspInit(UART_HandleTypeDef

			




	
	
	
		
 
    HAL_DMA_Init(&hdma_usart1_tx);

			




	
	
	
		
 

			




	
	
	
		
 
    __HAL_LINKDMA(huart,hdmatx,hdma_usart1_tx);

			




	
	
	
		
 

			




	
	
	
		
 
*/

			




	
	
	
		
 
    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);

			




	
	
	
		
 
    HAL_NVIC_EnableIRQ(USART1_IRQn);

			




	
	
	
		
 
  }

			




	
	
	
		
 

			




	
	
	
		
 
UART_HandleTypeDef* uart_gethandle(void)

			




	
	
	
		
 
{

			




	
	
	
		
 
    return &huart1;

			




	
	
	
		
 
}

			




	
	
	
		
 
*/

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-626845
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support