FeatherHAB/wsprhab Changeset - 0b86288f0749

Changeset - 0b86288f0749

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

Fix deinitting things that aren't initted

1 file changed with 14 insertions and 8 deletions:

src/main.c

0 comments (0 inline, 0 general)

src/main.c

➞

Show inline comments

@@ @@ -21,106 +21,112 @@ enum _state @@
     SYSTEM_POWERUP_SYNC = 0, // on powerup, get a GPS fix and set the RTC
     SYSTEM_IDLE, // 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
 };
 int main(void)
+{
     HAL_Init();
     sysclk_init();
     gpio_init();
     adc_init();
     i2c_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 fixinfo_timer = 0;
     uint32_t gps_polltimer = 0;
     uint32_t fix_acq_starttime = 0;
     uint8_t fix_ok = 0;
     uint8_t numsats = 0;
     while (1)
+    {
         // Update fix status every 2 seconds
-        if(HAL_GetTick() - fixinfo_timer > 2000)
+        if(HAL_GetTick() - gps_polltimer > 2000)
+        {
             if(gps_ison())
                 gps_update_data();
-        	fixinfo_timer = HAL_GetTick();
+            gps_polltimer = HAL_GetTick();
+        }
         switch(state)
+        {
             // Idling: sleep and wait for RTC timeslot trigger
             case SYSTEM_IDLE:
+            {
                 blink_rate = BLINK_SLOW;
                 // 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_starttime = HAL_GetTick();
                     gps_poweron(); // power on and initialize GPS module
+                }
                 if(gps_getdata()->fixtype > 0 && gps_getdata()->pdop < 5)
+                {
                     // 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;
+                }
 //                else if(fix_timeout)
  //               {
   //                  // Flash error code and go to idle probably? or just try forever?
    //             }
                 else if(HAL_GetTick() - fix_acq_starttime > 60000)
+                {
                 	  // Flash error code and go to idle probably? or just try forever?
                 	led_blink(4);
+                }
             } 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)
 //                {
 //                    wspr_transmit();
 //                }
                 // Schedule next wakeup (maybe 2mins prior ot timeslot if no osc trim)
                 // Next wakeup should enter SYSTEM_GPSACQ state...
 //                state = SYSTEM_IDLE;
             } break;
+        }

0 comments (0 inline, 0 general)