FeatherHAB/wsprhab Changeset - 1ecaddb549ab

Changeset - 1ecaddb549ab

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

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

Disable timer clocks, fix transmission issues

3 files changed with 37 insertions and 17 deletions:

src/i2c.c

src/main.c

src/wspr.c

0 comments (0 inline, 0 general)

src/i2c.c

➞

Show inline comments

@@ @@ -33,11 +33,18 @@ void i2c_init(void) @@
     HAL_I2C_Init(&hi2c1);
     HAL_I2CEx_AnalogFilter_Config(&hi2c1, I2C_ANALOGFILTER_ENABLED);
+}
 void i2c_deinit(void)
+{
     HAL_I2C_DeInit(&hi2c1);
     __I2C1_CLK_DISABLE();
+}
 // Get pointer to I2C port
 I2C_HandleTypeDef* i2c_get(void)
+{
     return &hi2c1;
+}

src/main.c

➞

Show inline comments

@@ @@ -35,13 +35,12 @@ int main(void) @@
     HAL_Init();
     sysclk_init();
     rtc_init();
     gpio_init();
     adc_init();
     i2c_init();
     wspr_init();
     uint32_t led_timer = HAL_GetTick();
     led_blink(4);
@@ @@ -58,13 +57,13 @@ int main(void) @@
     while (1)
+    {
     	// Every 10 minutes, wake up and try to wspr
     	if(HAL_GetTick() - last_wspr_tx_time > 60000 * 10)
+    	if(state == SYSTEM_IDLE && (HAL_GetTick() - last_wspr_tx_time > 60000 * 10))
+    	{
     		state = SYSTEM_GPSACQ;
+    	}
         // Update fix status every 2 seconds
         if(HAL_GetTick() - gps_polltimer > 2000)
@@ @@ -147,13 +146,13 @@ int main(void) @@
             } break;
             // Wait for wspr timeslot and start transmitting
             case SYSTEM_WSPRTX:
+            {
-            	blink_rate = BLINK_SLOW;
+            	blink_rate = BLINK_MED;
                 // 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)
@@ @@ -163,14 +162,14 @@ int main(void) @@
             			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);
 						last_wspr_tx_time = HAL_GetTick();
 						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();

src/wspr.c

➞

Show inline comments

@@ @@ -27,25 +27,12 @@ volatile uint8_t proceed = 0; @@
 TIM_HandleTypeDef htim1;
 void wspr_init(void)
+{
     // Start timer for WSPR
     __TIM1_CLK_ENABLE();
     htim1.Instance = TIM1;
     htim1.Init.Prescaler = 512; // gives 64uS ticks from 8MHz ahbclk
     htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
     htim1.Init.Period = ctc; // Count up to this value (how many 64uS ticks per symbol)
     htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
     htim1.Init.RepetitionCounter = 0;
     HAL_TIM_Base_Init(&htim1);
     HAL_TIM_Base_Start_IT(&htim1);
     HAL_NVIC_SetPriority(TIM1_BRK_UP_TRG_COM_IRQn, 0, 0);
     HAL_NVIC_EnableIRQ(TIM1_BRK_UP_TRG_COM_IRQn);
     // Turn off ICs
     HAL_GPIO_WritePin(OSC_NOTEN, 1);
     HAL_GPIO_WritePin(TCXO_EN, 0);
+}
 // Do anything needed to prepare for sleep
@@ @@ -65,17 +52,33 @@ void wspr_transmit(uint8_t* grid_locator @@
+{
 	// Copy 4 digit grid locator to local buffer; null terminate
 	for(uint8_t i=0; i<4; i++)
 		loc[i] = grid_locator[i];
 	loc[4] = '\0';
     // Start timer for WSPR
     __TIM1_CLK_ENABLE();
     htim1.Instance = TIM1;
     htim1.Init.Prescaler = 512; // gives 64uS ticks from 8MHz ahbclk
     htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
     htim1.Init.Period = ctc; // Count up to this value (how many 64uS ticks per symbol)
     htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
     htim1.Init.RepetitionCounter = 0;
     HAL_TIM_Base_Init(&htim1);
     HAL_TIM_Base_Start_IT(&htim1);
     HAL_NVIC_SetPriority(TIM1_BRK_UP_TRG_COM_IRQn, 0, 0);
     HAL_NVIC_EnableIRQ(TIM1_BRK_UP_TRG_COM_IRQn);
     HAL_GPIO_WritePin(OSC_NOTEN, 0);
     HAL_GPIO_WritePin(TCXO_EN, 1);
     HAL_Delay(100);
     // Bring up the chip
     i2c_init();
     si5351_init(i2c_get(), SI5351_CRYSTAL_LOAD_8PF, 0);
     si5351_set_correction(0);
     //si5351_set_pll(SI5351_PLL_FIXED, SI5351_PLLA);
     //si5351_set_ms_source(SI5351_CLK0, SI5351_PLLA);
     si5351_set_freq(WSPR_DEFAULT_FREQ * 100, 0, SI5351_CLK0);
     si5351_drive_strength(SI5351_CLK0, SI5351_DRIVE_8MA); // Set for max power if desired (8ma max)
@@ @@ -111,8 +114,19 @@ void wspr_transmit(uint8_t* grid_locator @@
     // Disable transmitter
     si5351_output_enable(SI5351_CLK0, 0);
     HAL_GPIO_WritePin(OSC_NOTEN, 1);
     HAL_GPIO_WritePin(TCXO_EN, 0);
     i2c_deinit();
     // Disable timer
     HAL_NVIC_DisableIRQ(TIM1_BRK_UP_TRG_COM_IRQn);
     HAL_TIM_Base_Stop_IT(&htim1);
     HAL_TIM_Base_DeInit(&htim1);
     __TIM1_CLK_DISABLE();
+}

0 comments (0 inline, 0 general)