FeatherHAB/wsprhab Changeset - 38f0f2457409

Changeset - 38f0f2457409

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca - 9 years ago 2016-10-13 20:21:04
ez@ethanzonca.com

Fix issue where code would constantly enter gpsacq state because of last wspr timeout expiring

3 files changed with 18 insertions and 0 deletions:

src/gps.c

src/main.c

src/uart.c

0 comments (0 inline, 0 general)

src/gps.c

➞

Show inline comments

@@ @@ -189,64 +189,78 @@ void gps_poweron(void) @@
 	HAL_UART_Transmit(uart_gethandle(), setGSA, sizeof(setGSA)/sizeof(uint8_t), 100);
 	HAL_Delay(100);
 	uint8_t setGSV[] = {0XB5, 0X62, 0X06, 0X01, 0X08, 0X00, 0XF0, 0X03, 0X00, 0X00, 0X00, 0X00, 0X00, 0X00, 0X02, 0X38};
 	HAL_UART_Transmit(uart_gethandle(), setGSV, sizeof(setGSV)/sizeof(uint8_t), 100);
 	HAL_Delay(100);
 	uint8_t setRMC[] = {0XB5, 0X62, 0X06, 0X01, 0X08, 0X00, 0XF0, 0X04, 0X00, 0X00, 0X00, 0X00, 0X00, 0X00, 0X03, 0X3F};
 	HAL_UART_Transmit(uart_gethandle(), setRMC, sizeof(setRMC)/sizeof(uint8_t), 100);
 	HAL_Delay(100);
 	uint8_t setVTG[] = {0XB5, 0X62, 0X06, 0X01, 0X08, 0X00, 0XF0, 0X05, 0X00, 0X00, 0X00, 0X00, 0X00, 0X00, 0X04, 0X46};
 	HAL_UART_Transmit(uart_gethandle(), setVTG, sizeof(setRMC)/sizeof(uint8_t), 100);
 	HAL_Delay(100);
 //    // Disable GLONASS mode
 //    uint8_t disable_glonass[20] = {0xB5, 0x62, 0x06, 0x3E, 0x0C, 0x00, 0x00, 0x00, 0x20, 0x01, 0x06, 0x08, 0x0E, 0x00, 0x00, 0x00, 0x01, 0x01, 0x8F, 0xB2};
 //
 //    //gps_sendubx(disable_glonass, 20);
 //    volatile HAL_StatusTypeDef res = HAL_UART_Transmit(uart_gethandle(), disable_glonass, 20, 100);
 //
 //    // Enable power saving
 //    uint8_t enable_powersave[10] = {0xB5, 0x62, 0x06, 0x11, 0x02, 0x00, 0x08, 0x01, 0x22, 0x92};
 //    //gps_sendubx(enable_powersave, 10);
 //    res = HAL_UART_Transmit(uart_gethandle(), enable_powersave, 10, 100);
 //
 //
 //    // Set dynamic model 6 (<1g airborne platform)
 //    uint8_t airborne_model[] = { 0xB5, 0x62, 0x06, 0x24, 0x24, 0x00, 0xFF, 0xFF, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00, 0x05, 0x00, 0xFA, 0x00, 0xFA, 0x00, 0x64, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0xDC };
 //    //gps_sendubx(airborne_model, sizeof(airborne_model)/sizeof(uint8_t));
 //    res = HAL_UART_Transmit(uart_gethandle(), airborne_model, sizeof(airborne_model)/sizeof(uint8_t), 100);
     // Begin DMA reception
     //HAL_UART_Receive_DMA(uart_gethandle(), nmeaBuffer, NMEABUFFER_SIZE);
     gpson = 1;
+}
 // Power off GPS module
 void gps_poweroff(void)
+{
     // NOTE: pchannel
 	position.hour = 0;
 	position.minute = 0;
 	position.second = 0;
 	position.altitude = 0;
 	position.latitude = 0;
 	position.longitude = 0;
 	position.day = 0;
 	position.month = 0;
 	position.fixtype = 0;
 	position.valid = 0;
 	position.pdop = 0;
 	position.sats_in_solution = 0;
 	position.speed = 0;
     uart_deinit();
     HAL_GPIO_WritePin(GPS_NOTEN, 1);
     gpson = 0;
+}
 gps_data_t* gps_getdata(void)
+{
     return &position;
+}
 uint8_t gps_ison(void)
+{
     return gpson;
+}
 // vim:softtabstop=4 shiftwidth=4 expandtab

src/main.c

➞

Show inline comments

@@ @@ -95,96 +95,98 @@ int main(void) @@
         switch(state)
+        {
             // Idling: sleep and wait for RTC timeslot trigger
             case SYSTEM_IDLE:
+            {
                 blink_rate = BLINK_SLOW;
                 HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                 // Wait for RTC wakeup interrupt
                 //wfi();
                 //enter_sleep();
                 // Somehow go to another state when we get an interrupt
 //                state = SYSTEM_GPSACQ;
             } break;
             // Attempt to acquire GPS fix
             case SYSTEM_GPSACQ:
+            {
                 blink_rate = BLINK_FAST;
                 if(!gps_ison())
+                {
                 	fix_acq_starttime = HAL_GetTick();
                     gps_poweron(); // power on and initialize GPS module
+                }
                 // If 3d fix with a decent enough precision
                 if( ((gps_getdata()->fixtype == 2) || (gps_getdata()->fixtype == 3)) && gps_getdata()->pdop < 10)
+                {
                     // Disable GPS module
                     gps_poweroff();
                     // TODO: Set RTC from GPS time
                     // TODO: Set RTC for countdown to next transmission timeslot!
                     // TODO: Set wspr countdown timer for this transmission!
                     fix_acq_starttime = 0;
                     state = SYSTEM_WSPRTX;
+                }
                 // If no decent fix in 3 minutes
                 else if(HAL_GetTick() - fix_acq_starttime > 60000 * 3)
+                {
                 	// Flash error code and go to idle, try again next time
                 	led_blink(4);
                     gps_poweroff();
                     fix_acq_starttime = 0;
                     last_wspr_tx_time = HAL_GetTick(); // repeat acq/tx cycle after big time delay
                 	state = SYSTEM_IDLE;
+                }
             } break;
             // Wait for wspr timeslot and start transmitting
             case SYSTEM_WSPRTX:
+            {
             	blink_rate = BLINK_SLOW;
                 // Wait for wspr countdown timer to expire and go to tx
 //                if(timeout_expired)
 //                {
             	// If we're after the minute but not more than 2s after the minute, start tx
             	if(HAL_GetTick() >= nextwspr_time)
+            	{
             		if(HAL_GetTick() < nextwspr_time + 2000)
+            		{
             			volatile double latitude_flt = (double)gps_getdata()->latitude / 10000000.0;
             			volatile double longitude_flt = (double)gps_getdata()->longitude / 10000000.0;
             			volatile uint8_t grid_locator[7];
             			__calc_gridloc(grid_locator, latitude_flt, longitude_flt);
 						wspr_transmit(grid_locator);
 						last_wspr_tx_time = HAL_GetTick();
 						state = SYSTEM_IDLE;
+            		}
             		else
+            		{
             			// Window was missed, go back to idle, and try again after time delay
 						last_wspr_tx_time = HAL_GetTick();
             			state = SYSTEM_IDLE;
+            		}
+                }
                 // Schedule next wakeup (maybe 2mins prior ot timeslot if no osc trim)
                 // Next wakeup should enter SYSTEM_GPSACQ state...
             } break;
+        }
         if(HAL_GetTick() - led_timer > blink_rate)
+        {
             ledpulse();
             led_timer = HAL_GetTick();

src/uart.c

➞

Show inline comments

@@ @@ -48,66 +48,68 @@ void uart_init(void) @@
     HAL_UART_Init(&huart1);
 //
 //    __DMA1_CLK_ENABLE();
 //
 //  // 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;
 //    hdma_usart1_rx.Init.MemInc = DMA_MINC_ENABLE;
 //    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(&huart1,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(&huart1,hdmatx,hdma_usart1_tx);
 //
 ////    HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 0, 0);
 ////    HAL_NVIC_EnableIRQ(DMA1_Channel2_3_IRQn);
     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_UART_DeInit(&huart1);
         __HAL_RCC_USART1_CLK_DISABLE();
         uart_initted = 0;
+    }
+}
 UART_HandleTypeDef* uart_gethandle(void)
+{
     return &huart1;
+}
 DMA_HandleTypeDef* uart_get_txdma_handle(void)
+{
     return &hdma_usart1_tx;
+}
 DMA_HandleTypeDef* uart_get_rxdma_handle(void)
+{
     return &hdma_usart1_rx;
+}

0 comments (0 inline, 0 general)