Преглед изворни кода

Extra mode, more time to wait

eried пре 2 година
родитељ
комит
a03c48400a
1 измењених фајлова са 32 додато и 26 уклоњено
  1. 32 26
      esp32cam_marauder/esp32cam_marauder.ino

+ 32 - 26
esp32cam_marauder/esp32cam_marauder.ino

@@ -131,34 +131,10 @@ void backlightOff() {
 void setup()
 {
   WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0); //disable brownout detector
-  //pinMode(FLASH_BUTTON, INPUT);
-
-  #ifdef HAS_SCREEN
-    pinMode(TFT_BL, OUTPUT);
-  #endif
-  
-  backlightOff();
-#if BATTERY_ANALOG_ON == 1
-  pinMode(BATTERY_PIN, OUTPUT);
-  pinMode(CHARGING_PIN, INPUT);
-#endif
-  
-  // Preset SPI CS pins to avoid bus conflicts
-  #ifdef HAS_SCREEN
-    digitalWrite(TFT_CS, HIGH);
-  #endif
-
-  /*pinMode(SD_CS, OUTPUT);
-
-  delay(10);
-  
-  digitalWrite(SD_CS, HIGH);
-
-  delay(10);*/
 
   Serial.begin(230400);
 
-  unsigned long waitForStreamMode = millis() + 1000;
+  unsigned long waitForStreamMode = millis() + 3000;
 
   while (waitForStreamMode > millis()) {
     if (Serial.available())  // if we receive anything, just switch to another mode
@@ -174,13 +150,43 @@ void setup()
           for (;;)
             motion_detection_loop();
 
-        default:  // Camera stream
+        case 'c':  // Camera stream
           cam_stream_setup();
           for (;;)
             cam_stream_loop();
+        
+        case 'w':  // Marauder
+          goto continue_to_marauder;
       }
     }
   }
+  continue_to_marauder:;
+
+  //pinMode(FLASH_BUTTON, INPUT);
+
+  #ifdef HAS_SCREEN
+    pinMode(TFT_BL, OUTPUT);
+  #endif
+  
+  backlightOff();
+#if BATTERY_ANALOG_ON == 1
+  pinMode(BATTERY_PIN, OUTPUT);
+  pinMode(CHARGING_PIN, INPUT);
+#endif
+  
+  // Preset SPI CS pins to avoid bus conflicts
+  #ifdef HAS_SCREEN
+    digitalWrite(TFT_CS, HIGH);
+  #endif
+
+  /*pinMode(SD_CS, OUTPUT);
+
+  delay(10);
+  
+  digitalWrite(SD_CS, HIGH);
+
+  delay(10);*/
+  
   //Serial.begin(115200);
 
   //Serial.println("\n\nHello, World!\n");