FeatherHAB/wsprhab Changeset - dda4d4df3034

Changeset - dda4d4df3034

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca - 9 years ago 2016-10-25 22:15:21
ez@ethanzonca.com

Switch to 6ma drive current and fix issue with recurrent fixes

3 files changed with 14 insertions and 8 deletions:

inc/gpio.h

src/main.c

src/wspr.c

0 comments (0 inline, 0 general)

inc/gpio.h

➞

Show inline comments

 #ifndef __gpio_H
 #define __gpio_H
 #include "stm32f0xx_hal.h"
 enum _blinkrate
+{
     BLINK_FAST = 50,
     BLINK_MED = 250,
-    BLINK_SLOW = 1000
+    BLINK_SLOW = 2000
 };
 #define OSC_EN_Pin GPIO_PIN_1
 #define OSC_EN_GPIO_Port GPIOF
 #define OSC_NOTEN OSC_EN_GPIO_Port , OSC_EN_Pin
 #define GPS_NEN_Pin GPIO_PIN_0
 #define GPS_NEN_GPIO_Port GPIOF
 #define GPS_NOTEN GPS_NEN_GPIO_Port , GPS_NEN_Pin
 #define VBATT_SENSE_Pin GPIO_PIN_6
 #define VBATT_SENSE_GPIO_Port GPIOA
 #define LED_BLUE_Pin GPIO_PIN_0
 #define LED_BLUE_GPIO_Port GPIOB
 #define LED_BLUE LED_BLUE_GPIO_Port , LED_BLUE_Pin
 #define TCXO_EN_Pin GPIO_PIN_8
 #define TCXO_EN_GPIO_Port GPIOA
 #define TCXO_EN TCXO_EN_GPIO_Port  , TCXO_EN_Pin
 void gpio_init(void);

src/main.c

➞

Show inline comments

@@ @@ -19,204 +19,209 @@ @@
 // TODO: Add JT9 message with more grid locator digits + altitude + vbatt + temp
 // MSG13charmax:
 // 	X: gridloc
 //  Y: altitude
 //  Z: temperature
 //  KD8TDF XXYYZZ // could use alt callsign thing
 enum _state
+{
     SYSTEM_IDLE = 0, // awaiting RTC interrupt for wakeup TODO wake up before scheduled time to get fix?
     SYSTEM_GPSACQ, // RTC interrupted
     SYSTEM_WSPRTX, // Wait for timeslot and actually transmit the message
 };
 static void __calc_gridloc(char *dst, double lat, double lon);
 static void ledpulse(void);
 uint32_t statled_ontime = 0;
 int main(void)
+{
     HAL_Init();
     HAL_Delay(2000); // startup delay before infinisleep
     sysclk_init();
     rtc_init();
     gpio_init();
     adc_init();
     wspr_init();
     uint32_t led_timer = HAL_GetTick();
     led_blink(4);
     uint16_t blink_rate = BLINK_FAST;
     uint8_t state = SYSTEM_GPSACQ;
     uint32_t gps_polltimer = 0;
     uint32_t fix_acq_starttime = 0;
     uint32_t nextwspr_time = 0;
     uint8_t nextwspr_time_valid = 0;
     uint32_t last_wspr_tx_time = 0;
     uint8_t fix_ok = 0;
     uint8_t numsats = 0;
     while (1)
+    {
     	// Every 10 minutes, wake up and try to wspr
     	if(state == SYSTEM_IDLE && (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)
+        {
             if(gps_ison())
+            {
             	gps_update_data();
             	// If odd minute
             	if(gps_getdata()->minute % 2)
+            	{
             		// Wait until even minute, coming soon
             		nextwspr_time = HAL_GetTick() + (60000 - (gps_getdata()->second * 1000));
                     nextwspr_time_valid = 1;
+            	}
             	// If even minute
             	else
+            	{
             		// Wait until odd minute, one minute and some change away
             		nextwspr_time = HAL_GetTick() + 60000 + (60000 - (gps_getdata()->second * 1000));
                     nextwspr_time_valid = 1;
+            	}
+            }
             gps_polltimer = HAL_GetTick();
+        }
         switch(state)
+        {
             // Idling: sleep and wait for RTC timeslot trigger
             case SYSTEM_IDLE:
+            {
                 blink_rate = BLINK_SLOW;
                 // Actually sleep for real: disable systick and sleep until RTC interrupt
                 HAL_SuspendTick();
+//                HAL_SuspendTick();
                 // Enter sleep mode: wait for interrupt
                 HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                 // We have woken up!
                 // This is hopefully the only timer that needs to stay alive in idle mode
                 last_wspr_tx_time += 0; // move this timer forward based on sleep length
+ //               last_wspr_tx_time += 0; // move this timer forward based on sleep length
                 HAL_ResumeTick();
+ //               HAL_ResumeTick();
                 // TODO: Eventually use GPS time to calibrate the RTC maybe
             } break;
             // Attempt to acquire GPS fix
             case SYSTEM_GPSACQ:
+            {
                 blink_rate = BLINK_FAST;
                 HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                 HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                 HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                 HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                 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)
+                if( ((gps_getdata()->fixtype == 2) || (gps_getdata()->fixtype == 3)) && gps_getdata()->pdop < 10 && nextwspr_time_valid == 1)
+                {
                     // 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_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)
+            	{
             		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();
 						wspr_transmit(grid_locator);
 						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;
+            		}
                     nextwspr_time_valid = 0; // invalidate wspr time
+                }
             	else
+            	{
                     HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                     HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                     HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
                     HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
+            	}
                 // 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();
+        }
         if(statled_ontime && HAL_GetTick() - statled_ontime > 10)

src/wspr.c

➞

Show inline comments

@@ @@ -60,49 +60,50 @@ void wspr_transmit(uint8_t* grid_locator @@
     __TIM1_CLK_ENABLE();
     htim1.Instance = TIM1;
     htim1.Init.Prescaler = 512 / 4; // FIXED gives 64us ticks from 2mhz clock // 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)
 //    si5351_drive_strength(SI5351_CLK0, SI5351_DRIVE_8MA); // Set for max power if desired (8ma max)
     si5351_drive_strength(SI5351_CLK0, SI5351_DRIVE_6MA); // Set for max power if desired (8ma max)
     si5351_output_enable(SI5351_CLK0, 1);
     //si5351_pll_reset(SI5351_PLLA);
     // Make sure the other outputs of the SI5351 are disabled
     si5351_output_enable(SI5351_CLK1, 0); // Disable the clock initially
     si5351_output_enable(SI5351_CLK2, 0); // Disable the clock initially
     // disable clock powers
     si5351_set_clock_pwr(SI5351_CLK1, 0);
     si5351_set_clock_pwr(SI5351_CLK2, 0);
     // Encode message to transmit
     wspr_encode(call, loc, dbm, tx_buffer);
     // Key transmitter
     si5351_output_enable(SI5351_CLK0, 1);
     // Loop through and transmit symbols TODO: Do this from an ISR or ISR-triggered main loop function call (optimal)
     uint8_t i;
     for(i=0; i<symbol_count; i++)
+    {
         uint32_t freq2 = (freq * 100) + (tx_buffer[i] * tone_spacing);
         si5351_set_freq(freq2, 0, SI5351_CLK0);

0 comments (0 inline, 0 general)