Correct merge of wifi persistence code, make 2.x builds platformio compatible

Author: easytarget

esp32-cam-webserver.ino

@@ -364,7 +364,6 @@ void setup() {
 
   // We need a working Wifi before we can start the http handlers
   Serial.println("Starting WiFi");
-
   #if defined(WIFI_AP_ENABLE)
     WifiSetup();
   #else
@@ -404,30 +403,6 @@ void setup() {
   }
 }
 
-// Notification LED 
-void flashLED(int flashtime) {
-#ifdef LED_PIN                    // If we have it; flash it.
-  digitalWrite(LED_PIN, LED_ON);  // On at full power.
-  delay(flashtime);               // delay
-  digitalWrite(LED_PIN, LED_OFF); // turn Off
-#else
-  return;                         // No notifcation LED, do nothing, no delay
-#endif
-} 
-
-// Lamp Control
-void setLamp(int newVal) {
-  if (newVal != -1) {
-    // Apply a logarithmic function to the scale.
-    int brightness = round((pow(2,(1+(newVal*0.02)))-2)/6*pwmMax);
-    ledcWrite(lampChannel, brightness);
-    Serial.print("Lamp: ");
-    Serial.print(newVal);
-    Serial.print("%, pwm = ");
-    Serial.println(brightness);
-  }
-} 
-
 void loop() {
   // Just loop forever, reconnecting Wifi As necesscary.
   // The stream and URI handler processes initiated by the startCameraServer() call at the