FeatherHAB/wsprhab Changeset - 8bad90087cda

Changeset - 8bad90087cda

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 7 years ago 2019-09-04 21:11:14
ez@ethanzonca.com

Wspr transmissions now timed off of RTC directly

1 file changed with 5 insertions and 5 deletions:

src/main.c

0 comments (0 inline, 0 general)

src/main.c

➞

Show inline comments

@@ @@ -61,13 +61,13 @@ int main(void) @@
 //    state = SYSTEM_IDLE;
     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;
+    uint64_t last_wspr_tx_time = 0;
     uint64_t idle_blink_last = 0;
     uint8_t packet_type = 0;
     // Transmit pilot tone to test TX on bootup
     HAL_Delay(1000);
@@ @@ -79,13 +79,13 @@ int main(void) @@
 //    HAL_EnableDBGStopMode();  //  SET_BIT(DBGMCU->CR, DBGMCU_CR_DBG_STOP);
     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 && (rtc_timestamp() - last_wspr_tx_time > 60000 * 10))
+    	{
     		state = SYSTEM_GPSACQ;
+    	}
         // Update fix status every 2 seconds, only if the GPS is powered on
         if(HAL_GetTick() - gps_polltimer > 2000)
@@ @@ -179,13 +179,13 @@ int main(void) @@
                 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
+                    last_wspr_tx_time = rtc_timestamp(); // repeat acq/tx cycle after big time delay
                 	state = SYSTEM_IDLE;
+                }
                 else
+                {
                 	// We're waiting for a GPS fix, might as well sleep and let the GPS get a fix.
             		// Enter stop mode for 1 second. Blink in the GPS code above.
@@ @@ -213,20 +213,20 @@ int main(void) @@
             			__calc_gridloc(grid_locator, latitude_flt, longitude_flt);
                         // TODO: Switch between alternate and standard packet
 						wspr_transmit(grid_locator, packet_type);
                         packet_type = !packet_type; // alternate packet type
-						last_wspr_tx_time = HAL_GetTick();
+						last_wspr_tx_time = rtc_timestamp();
 						state = SYSTEM_IDLE;
                         adc_stop();
+            		}
             		else
+            		{
             			// Window was missed, go back to idle, and try again after time delay
-						last_wspr_tx_time = HAL_GetTick();
+						last_wspr_tx_time = rtc_timestamp();
             			state = SYSTEM_IDLE;
                         adc_stop();
+            		}
                     nextwspr_time_valid = 0; // invalidate wspr time
+                }
             	else

0 comments (0 inline, 0 general)