Просмотр исходного кода

Update firmware and auto flasher.

Cody Tolene 2 лет назад
Родитель
Сommit
bf5bfc973e
3 измененных файлов с 18 добавлено и 13 удалено
  1. 0 1
      .gitignore
  2. 9 2
      firmware/cli/cli-install.bat
  3. 9 10
      firmware/firmware.ino

+ 0 - 1
.gitignore

@@ -10,7 +10,6 @@
 /firmware/cli/**/*
 !/firmware/cli/cli-install.bat
 !/firmware/cli/arduino-cli.yaml
-/firmware/compile.flag
 /venv
 __pycache__
 dist/*

+ 9 - 2
firmware/cli/cli-install.bat

@@ -6,7 +6,7 @@ set CONFIG_FILE=--config-file .\arduino-cli.yaml
 set DEFAULT_BOARD_FQBN=esp32:esp32:esp32cam
 set SELECTED_BOARD=%DEFAULT_BOARD_FQBN%
 set CLI_FOUND_FOLLOW_UP=0
-set COMPILE_FLAG=..\compile.flag
+set COMPILE_FLAG=compile.flag
 
 echo Initializing...
 
@@ -39,9 +39,16 @@ if not exist "%CLI_TEMP%" (
     echo Assets already installed. Skipping...
 )
 
-echo Ensure your Flipper Zero is plugged in via USB before continuing.
+echo.
+echo -------------------------------------------------------------------------
+echo Make sure your Flipper Zero is plugged in via a transfer capable USB.
+echo Then on your Flipper Zero, open the GPIO menu and select USB-UART Bridge.
+echo If you have already done this, you may skip this step.
+echo -------------------------------------------------------------------------
+echo.
 pause
 
+echo.
 echo Ready for installation...
 
 if not exist "%COMPILE_FLAG%" (

+ 9 - 10
firmware/firmware.ino

@@ -1,13 +1,12 @@
 #include "esp_camera.h"
-#include "Arduino.h"
 #include "FS.h"
 #include "SD_MMC.h"
-#include "soc/soc.h"
-#include "soc/rtc_cntl_reg.h"
-#include "driver/rtc_io.h"
-#include <vector>
-#include <tuple>
-#include <cstdint>
+
+// Potential future includes for use.
+// #include "Arduino.h"
+// #include "soc/soc.h"
+// #include "soc/rtc_cntl_reg.h"
+// #include "driver/rtc_io.h"
 
 // Define Pin numbers used by the camera.
 #define FLASH_GPIO_NUM 4
@@ -70,9 +69,9 @@ bool storeJpeg = false;
 
 void setup() {
   // Disable the brownout detector.
-  WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0);
-  // Start serial communication at 115200 baud rate.
-  Serial.begin(115200); // Prev 230400
+  // WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0);
+
+  Serial.begin(230400); // 115200
   initializeCamera();
 }