Move begin functions to separate tab.

Author: nseidle

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -250,6 +250,8 @@ void setup()
 
 void loop()
 {
+  myGPS.checkUblox(); //Regularly poll to get latest data and any RTCM
+  
   //Update Bluetooth LED status
   if (bluetoothState == BT_ON_NOCONNECTION)
   {
@@ -421,203 +423,3 @@ void updateDisplay()
     }
   }
 }
-
-void beginSD()
-{
-  pinMode(PIN_MICROSD_CHIP_SELECT, OUTPUT);
-  digitalWrite(PIN_MICROSD_CHIP_SELECT, HIGH); //Be sure SD is deselected
-
-  if (settings.enableSD == true)
-  {
-    //Max power up time is 250ms: https://www.kingston.com/datasheets/SDCIT-specsheet-64gb_en.pdf
-    //Max current is 200mA average across 1s, peak 300mA
-    delay(10);
-
-    if (sd.begin(PIN_MICROSD_CHIP_SELECT, SD_SCK_MHZ(24)) == false) //Standard SdFat
-    {
-      printDebug("SD init failed (first attempt). Trying again...\r\n");
-      //Give SD more time to power up, then try again
-      delay(250);
-      if (sd.begin(PIN_MICROSD_CHIP_SELECT, SD_SCK_MHZ(24)) == false) //Standard SdFat
-      {
-        Serial.println(F("SD init failed (second attempt). Is card present? Formatted?"));
-        digitalWrite(PIN_MICROSD_CHIP_SELECT, HIGH); //Be sure SD is deselected
-        online.microSD = false;
-        return;
-      }
-    }
-
-    //Change to root directory. All new file creation will be in root.
-    if (sd.chdir() == false)
-    {
-      Serial.println(F("SD change directory failed"));
-      online.microSD = false;
-      return;
-    }
-
-    online.microSD = true;
-  }
-  else
-  {
-    online.microSD = false;
-  }
-}
-
-void beginDisplay()
-{
-  //0x3D is default on Qwiic board
-  if (isConnected(0x3D) == true || isConnected(0x3C) == true)
-  {
-    online.display = true;
-
-    //Init and display splash
-    oled.begin();     // Initialize the OLED
-    oled.clear(PAGE); // Clear the display's internal memory
-
-    oled.setCursor(10, 2); //x, y
-    oled.setFontType(0); //Set font to smallest
-    oled.print("SparkFun");
-
-    oled.setCursor(21, 13);
-    oled.setFontType(1);
-    oled.print("RTK");
-
-    int surveyorTextY = 25;
-    int surveyorTextX = 2;
-    int surveyorTextKerning = 8;
-    oled.setFontType(1);
-
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("S");
-
-    surveyorTextX += surveyorTextKerning;
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("u");
-
-    surveyorTextX += surveyorTextKerning;
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("r");
-
-    surveyorTextX += surveyorTextKerning;
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("v");
-
-    surveyorTextX += surveyorTextKerning;
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("e");
-
-    surveyorTextX += surveyorTextKerning;
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("y");
-
-    surveyorTextX += surveyorTextKerning;
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("o");
-
-    surveyorTextX += surveyorTextKerning;
-    oled.setCursor(surveyorTextX, surveyorTextY);
-    oled.print("r");
-
-    oled.setCursor(20, 41);
-    oled.setFontType(0); //Set font to smallest
-    oled.printf("v%d.%d", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
-    oled.display();
-  }
-}
-
-//Connect to and configure ZED-F9P
-void beginGNSS()
-{
-  if (myGPS.begin() == false)
-  {
-    //Try again with power on delay
-    delay(1000); //Wait for ZED-F9P to power up before it can respond to ACK
-    if (myGPS.begin() == false)
-    {
-      Serial.println(F("u-blox GNSS not detected at default I2C address. Hard stop."));
-      blinkError(ERROR_NO_I2C);
-    }
-  }
-
-  //Check the firmware version of the ZED-F9P. Based on Example21_ModuleInfo.
-  //  if (myGPS.getModuleInfo(1100) == true) // Try to get the module info
-  //  {
-  //    if (strcmp(myGPS.minfo.extension[1], latestZEDFirmware) != 0)
-  //    {
-  //      Serial.print("The ZED-F9P appears to have outdated firmware. Found: ");
-  //      Serial.println(myGPS.minfo.extension[1]);
-  //      Serial.print("The Surveyor works best with ");
-  //      Serial.println(latestZEDFirmware);
-  //      Serial.print("Please upgrade using u-center.");
-  //      Serial.println();
-  //    }
-  //    else
-  //    {
-  //      Serial.println("ZED-F9P firmware is current");
-  //    }
-  //  }
-
-  bool response = configureUbloxModule();
-  if (response == false)
-  {
-    //Try once more
-    Serial.println(F("Failed to configure module. Trying again."));
-    delay(1000);
-    response = configureUbloxModule();
-
-    if (response == false)
-    {
-      Serial.println(F("Failed to configure module. Hard stop."));
-      blinkError(ERROR_GPS_CONFIG_FAIL);
-    }
-  }
-  Serial.println(F("GNSS configuration complete"));
-}
-
-//Get MAC, start radio
-void beginBT()
-{
-  //Get unit MAC address
-  esp_read_mac(unitMACAddress, ESP_MAC_WIFI_STA);
-  unitMACAddress[5] += 2; //Convert MAC address to Bluetooth MAC (add 2): https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/system.html#mac-address
-
-  SerialBT.register_callback(btCallback);
-  if (startBluetooth() == false)
-  {
-    Serial.println("An error occurred initializing Bluetooth");
-    bluetoothState = BT_OFF;
-    digitalWrite(bluetoothStatusLED, LOW);
-  }
-  else
-  {
-    bluetoothState = BT_ON_NOCONNECTION;
-    digitalWrite(bluetoothStatusLED, HIGH);
-    lastBluetoothLEDBlink = millis();
-  }
-}
-
-//Set LEDs for output and configure PWM
-void beginLEDs()
-{
-  pinMode(positionAccuracyLED_1cm, OUTPUT);
-  pinMode(positionAccuracyLED_10cm, OUTPUT);
-  pinMode(positionAccuracyLED_100cm, OUTPUT);
-  pinMode(baseStatusLED, OUTPUT);
-  pinMode(bluetoothStatusLED, OUTPUT);
-  pinMode(baseSwitch, INPUT_PULLUP); //HIGH = rover, LOW = base
-
-  digitalWrite(positionAccuracyLED_1cm, LOW);
-  digitalWrite(positionAccuracyLED_10cm, LOW);
-  digitalWrite(positionAccuracyLED_100cm, LOW);
-  digitalWrite(baseStatusLED, LOW);
-  digitalWrite(bluetoothStatusLED, LOW);
-
-  ledcSetup(ledRedChannel, freq, resolution);
-  ledcSetup(ledGreenChannel, freq, resolution);
-
-  ledcAttachPin(batteryLevelLED_Red, ledRedChannel);
-  ledcAttachPin(batteryLevelLED_Green, ledGreenChannel);
-
-  ledcWrite(ledRedChannel, 0);
-  ledcWrite(ledGreenChannel, 0);
-}