fully initialize radio in first cycle

Author: jonathanjma

src/ControlTasks/RadioControlTask.cpp

@@ -7,10 +7,9 @@ RadioControlTask::RadioControlTask()
 void RadioControlTask::init()
 {
     if (!sfr::radio::initialized) {
-        switch (sfr::radio::start_progress) {
-        case 0:
+        if (sfr::radio::start_progress == 0) {
 #ifdef VERBOSE
-            Serial.print(F("Radio: Initializing ... "));
+            Serial.println(F("Radio: Initializing ... "));
 #endif
             // initialize SX1278 with default settings
             code = radio.begin(constants::radio::freq, constants::radio::bw, constants::radio::sf, constants::radio::cr,
@@ -23,10 +22,11 @@ void RadioControlTask::init()
                 Serial.println(code);
 #endif
             }
-            break;
-        case 1:
+        }
+
+        if (sfr::radio::start_progress == 1) {
 #ifdef VERBOSE
-            Serial.print(F("Radio: Setting CRC parameter ... "));
+            Serial.println(F("Radio: Setting CRC parameter ... "));
 #endif
             // set CRC parameter to true so it matches the CRC parameter on the TinyGS side
             code = radio.setCRC(true);
@@ -38,25 +38,22 @@ void RadioControlTask::init()
                 Serial.println(code);
 #endif
             }
-            break;
-        case 2:
+
+            if (sfr::radio::start_progress == 2) {
 #ifdef VERBOSE
-            Serial.print(F("Radio: Setting forceLDRO parameter ... "));
+                Serial.println(F("Radio: Setting forceLDRO parameter ... "));
 #endif
-            // set forceLDRO parameter to true so it matches the forceLDRO parameter on the TinyGS side
-            code = radio.forceLDRO(true);
-            if (code == RADIOLIB_ERR_NONE) {
-                sfr::radio::start_progress++;
-            } else {
+                // set forceLDRO parameter to true so it matches the forceLDRO parameter on the TinyGS side
+                code = radio.forceLDRO(true);
+                if (code == RADIOLIB_ERR_NONE) {
+                    sfr::radio::initialized = true;
+                } else {
 #ifdef VERBOSE
-                Serial.print(F("failed, code "));
-                Serial.println(code);
+                    Serial.print(F("failed, code "));
+                    Serial.println(code);
 #endif
+                }
             }
-            break;
-        case 3: // completed initialization
-            sfr::radio::initialized = true;
-            break;
         }
     }
 }

src/MainControlLoop.cpp

@@ -61,9 +61,12 @@ void MainControlLoop::execute()
     Serial.print(F("GPS Altitude (m): "));
     Serial.println(sfr::gps::altitude);
 
-    Serial.print("Downlink Slot: ");
+    Serial.print(F("Downlink Slot: "));
     Serial.println(sfr::radio::downlink_slot);
 
+    Serial.print(F("Alive Time: "));
+    Serial.println(millis() - sfr::gps::boot_time);
+
 #endif
 
     temp_monitor.execute();

src/main.cpp

@@ -12,6 +12,8 @@ void setup()
     Serial.begin(9600);
 #endif
 
+    sfr::gps::boot_time = millis();
+
     // sets ChipSat LED high for debugging
     pinMode(constants::led::led_pin, OUTPUT);
     digitalWrite(constants::led::led_pin, HIGH);
@@ -24,8 +26,6 @@ void setup()
     pinMode(constants::gps::tx_pin, OUTPUT);
     digitalWrite(constants::gps::tx_pin, LOW);
 
-    sfr::gps::boot_time = millis();
-
     // seed random number gen with noise from unconnected analog pin
     randomSeed(analogRead(A0));
 }