FeatherHAB/wsprhab Changeset - 779c7da65f38

Changeset - 779c7da65f38

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca - 9 years ago 2016-10-11 21:21:51
ez@ethanzonca.com

Fix deinitting things that aren't initted

2 files changed with 9 insertions and 2 deletions:

src/gps.c

src/uart.c

0 comments (0 inline, 0 general)

src/gps.c

➞

Show inline comments

@@ @@ -12,24 +12,31 @@ @@
 volatile gps_data_t position;
 uint8_t gpson = 0;
 // Private methods
 static void gps_ubx_checksum(uint8_t* data, uint8_t len, uint8_t* cka, uint8_t* ckb);
 static uint8_t _gps_verify_checksum(uint8_t* data, uint8_t len);
 // Poll for fix data from the GPS and update the internal structure
 void gps_update_data(void)
+{
 	// Error!
 	if(!gpson)
+	{
 		led_blink(5);
 		return;
+	}
     // Construct the request to the GPS
     uint8_t request[8] = {0xB5, 0x62, 0x01, 0x07, 0x00, 0x00, 0xFF, 0xFF};
     volatile uint8_t check_a = 0;
     volatile uint8_t check_b = 0;
     for(uint8_t i = 2; i<6; i++)
+    {
     	check_a += request[i];
     	check_b += check_a;
+    }
     request[6] = check_a;

src/uart.c

➞

Show inline comments

@@ @@ -81,26 +81,26 @@ void uart_init(void) @@
     HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
     //HAL_NVIC_EnableIRQ(USART1_IRQn);
     HAL_NVIC_DisableIRQ(USART1_IRQn);
     uart_initted = 1;
+}
 void uart_deinit(void)
+{
     if(uart_initted == 1)
+    {
         HAL_DMA_DeInit(&hdma_usart1_rx);
         HAL_DMA_DeInit(&hdma_usart1_tx);
         //HAL_DMA_DeInit(&hdma_usart1_rx);
         //HAL_DMA_DeInit(&hdma_usart1_tx);
         HAL_UART_DeInit(&huart1);
         uart_initted = 0;
+    }
+}
 UART_HandleTypeDef* uart_gethandle(void)
+{
     return &huart1;
+}
 DMA_HandleTypeDef* uart_get_txdma_handle(void)
+{

0 comments (0 inline, 0 general)