diff --git a/ESP/ini/boards.ini b/ESP/ini/boards.ini index 7c8316b..0a01c8d 100644 --- a/ESP/ini/boards.ini +++ b/ESP/ini/boards.ini @@ -1,18 +1,9 @@ -#!! DO NOT CHANGE ANYTHING WITHIN THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING +#!! DO NOT CHANGE ANYTHING BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING +# IF YOU ARE A USER DO NOT TOUCH THIS FILE [env:esp32AIThinker] board = esp32cam -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -monitor_filters = ${common.monitor_filters} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = - ${common.lib_deps} build_type = ${common.build_type} -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=4 ; set the debug level -DDEBUG_MODE=1 ; Set the debug mode @@ -21,16 +12,7 @@ build_flags = ${common.build_flags} [env:esp32AIThinker_release] board = esp32cam -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = - ${common.lib_deps} build_type = release -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=0 ; Set the debug mode -DCORE_DEBUG_LEVEL=1 @@ -46,35 +28,16 @@ build_flags = ${common.build_flags} -DDEBUG_ESP_OTA ; CAMERA PINOUT DEFINITIONS ${pinoutsAIThinker.build_flags} - -lib_deps = ${common.lib_deps} -upload_speed = ${common.upload_speed} -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} upload_port = ${ota.otaserverip} upload_protocol = espota upload_flags = --port=${ota.otaserverport} --auth=${ota.otapassword} build_type = release -extra_scripts = ${common.extra_scripts} [env:esp32M5Stack] board = esp32cam -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -monitor_filters = ${common.monitor_filters} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = - ${common.lib_deps} build_type = ${common.build_type} -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=1 -DCORE_DEBUG_LEVEL=4 @@ -82,16 +45,7 @@ build_flags = ${common.build_flags} [env:esp32M5Stack_release] board = esp32cam -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = - ${common.lib_deps} build_type = release -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=0 -DCORE_DEBUG_LEVEL=1 @@ -104,35 +58,16 @@ build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=1 -DDEBUG_ESP_OTA ${pinoutsESPCAM_M5STACK.build_flags} -lib_deps = - ${common.lib_deps} -upload_speed = ${common.upload_speed} -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} upload_port = ${ota.otaserverip} upload_protocol = espota upload_flags = --port=${ota.otaserverport} --auth=${ota.otapassword} build_type = release -extra_scripts = ${common.extra_scripts} [env:esp32Cam] board = esp32cam -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -monitor_filters = ${common.monitor_filters} -;build_unflags = ${common.build_unflags} -board_build.partitions = ${common.board_build.partitions} ; -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = ${common.lib_deps} build_type = ${common.build_type} -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=1 ; Set the debug mode ; CAMERA PINOUT DEFINITIONS @@ -140,16 +75,7 @@ build_flags = ${common.build_flags} [env:esp32Cam_release] board = esp32cam -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -;build_unflags = ${common.build_unflags} -board_build.partitions = ${common.board_build.partitions} ; -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = ${common.lib_deps} build_type = release -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=0 ; Set the debug mode -DCORE_DEBUG_LEVEL=1 @@ -165,38 +91,18 @@ build_flags = ${common.build_flags} -DDEBUG_ESP_OTA ; CAMERA PINOUT DEFINITIONS ${pinoutsESPCam.build_flags} - -lib_deps = ${common.lib_deps} -upload_speed = ${common.upload_speed} -monitor_speed = ${common.monitor_speed} -monitor_rts = ${common.monitor_rts} -monitor_dtr = ${common.monitor_dtr} -;build_unflags = ${common.build_unflags} -board_build.partitions = ${common.board_build.partitions} ; uncomment this to use the min_spiffs partition table, great for using OTA -lib_ldf_mode = ${common.lib_ldf_mode} upload_port = ${ota.otaserverip} upload_protocol = espota upload_flags = --port=${ota.otaserverport} --auth=${ota.otapassword} build_type = release -extra_scripts = ${common.extra_scripts} [env:esp_eye] board = esp-wrover-kit ;board_build.f_flash = 80000000L ;board_build.flash_mode = qio -monitor_speed = ${common.monitor_speed} -; monitor_rts = ${common.monitor_rts} -; monitor_dtr = ${common.monitor_dtr} -monitor_filters = ${common.monitor_filters} -;build_unflags = ${common.build_unflags} -board_build.partitions = ${common.board_build.partitions} ; -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = ${common.lib_deps} build_type = ${common.build_type} -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=1 ; Set the debug mode ; CAMERA PINOUT DEFINITIONS @@ -206,16 +112,7 @@ build_flags = ${common.build_flags} board = esp-wrover-kit ;board_build.f_flash = 80000000L ;board_build.flash_mode = qio -monitor_speed = ${common.monitor_speed} -; monitor_rts = ${common.monitor_rts} -; monitor_dtr = ${common.monitor_dtr} -;build_unflags = ${common.build_unflags} -board_build.partitions = ${common.board_build.partitions} ; -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = ${common.lib_deps} build_type = release -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=0 ; Set the debug mode -DCORE_DEBUG_LEVEL=1 @@ -225,61 +122,35 @@ build_flags = ${common.build_flags} ; Experimental OTA Environment - do not select unless you know what you are doing [env:esp_eye_OTA] board = esp-wrover-kit -;board_build.f_flash = 80000000L -;board_build.flash_mode = qio build_flags = ${common.build_flags} -DDEBUG_MODE=0 ; Set the debug mode -DCORE_DEBUG_LEVEL=1 -DDEBUG_ESP_OTA ; CAMERA PINOUT DEFINITIONS ${pinoutsESP-EYE.build_flags} -lib_deps = ${common.lib_deps} -upload_speed = ${common.upload_speed} -monitor_speed = ${common.monitor_speed} -;monitor_rts = ${common.monitor_rts} -;monitor_dtr = ${common.monitor_dtr} -;build_unflags = ${common.build_unflags} -board_build.partitions = ${common.board_build.partitions} ; uncomment this to use the min_spiffs partition table, great for using OTA -lib_ldf_mode = ${common.lib_ldf_mode} upload_port = ${ota.otaserverip} upload_protocol = espota upload_flags = --port=${ota.otaserverport} --auth=${ota.otapassword} build_type = release -extra_scripts = ${common.extra_scripts} [env:wrover] board = esp-wrover-kit board_build.f_flash = 80000000L board_build.flash_mode = qio -monitor_speed = ${common.monitor_speed} -monitor_filters = ${common.monitor_filters} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = - ${common.lib_deps} build_type = ${common.build_type} -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DCORE_DEBUG_LEVEL=4 ; set the debug level -DDEBUG_MODE=1 ; Set the debug mode ; CAMERA PINOUT DEFINITIONS ${pinoutsESPWROVER.build_flags} + [env:wrover_release] board = esp-wrover-kit board_build.f_flash = 80000000L board_build.flash_mode = qio -monitor_speed = ${common.monitor_speed} -monitor_filters = ${common.monitor_filters} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = - ${common.lib_deps} build_type = ${common.build_type} -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=0 ; Set the debug mode -DCORE_DEBUG_LEVEL=1 @@ -290,14 +161,6 @@ build_flags = ${common.build_flags} board = esp-wrover-kit board_build.f_flash = 80000000L board_build.flash_mode = qio -monitor_speed = ${common.monitor_speed} -monitor_filters = ${common.monitor_filters} -board_build.partitions = ${common.board_build.partitions} -lib_ldf_mode = ${common.lib_ldf_mode} -upload_speed = ${common.upload_speed} -lib_deps = - ${common.lib_deps} -extra_scripts = ${common.extra_scripts} build_flags = ${common.build_flags} -DDEBUG_MODE=0 ; Set the debug mode -DCORE_DEBUG_LEVEL=1 diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini new file mode 100644 index 0000000..577ebad --- /dev/null +++ b/ESP/ini/dev_config.ini @@ -0,0 +1,54 @@ +#!! DO NOT CHANGE ANYTHING BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING +# IF YOU ARE A USER DO NOT TOUCH THIS FILE + +[env] +platform = espressif32 +framework = arduino +monitor_speed = 115200 +monitor_rts = 0 +monitor_dtr = 0 +monitor_filters = + log2file + time + default + esp32_exception_decoder +board_build.partitions = min_spiffs.csv +;build_unflags = -Os ; disable optimization for size +lib_ldf_mode = deep+ +;115200 is used for compatability - if you are on windows and want the code to flash faster use 921600 +upload_speed = 921600 +lib_deps = + https://github.com/me-no-dev/ESPAsyncWebServer.git + https://github.com/me-no-dev/AsyncTCP.git +extra_scripts = + pre:tools/customname.py + post:tools/createzip.py + +[common] +build_type = debug +build_flags = + !python tools/git_rev.py + -DENABLE_ADHOC=${wifi.enableadhoc} + -DADHOC_CHANNEL=${wifi.adhocchannel} + -DWIFI_CHANNEL=${wifi.channel} + -DDEBUG_ESP_PORT=Serial ; set the debug port + '-DMDNS_HOSTNAME=${wifi.mDNSName}' ; Set the OTA password + '-DWIFI_SSID=${wifi.ssid}' + '-DWIFI_PASSWORD=${wifi.password}' + '-DWIFI_AP_SSID=${wifi.ap_ssid}' + '-DWIFI_AP_PASSWORD=${wifi.ap_password}' + '-DWIFI_AP_CHANNEL=${wifi.adhocchannel}' + + -DENABLE_OTA=${ota.enableota} + -DOTA_SERVER_PORT=${ota.otaserverport} + '-DOTA_PASSWORD=${ota.otapassword}' ; Set the OTA password + '-DOTA_IP=${ota.otaserverip}' ; Set the OTA password + + -O2 ; optimize for speed + -DASYNCWEBSERVER_REGEX ; enable regex in asyncwebserver + + # Comment these out if you are not using psram + -DBOARD_HAS_PSRAM ; enable psram + -mfix-esp32-psram-cache-issue ; fix for psram + ; Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run faster + -DHTTP_PARSER_STRICT=0 diff --git a/ESP/ini/pinouts.ini b/ESP/ini/pinouts.ini index d5d31e5..28b23ed 100644 --- a/ESP/ini/pinouts.ini +++ b/ESP/ini/pinouts.ini @@ -1,4 +1,5 @@ #!! DO NOT CHANGE ANYTHING BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING +# IF YOU ARE A USER DO NOT TOUCH THIS FILE [pinoutsESPCAM_M5STACK] pwdn_gpio_num = -1 diff --git a/ESP/platformio.ini b/ESP/platformio.ini index d834133..def8c5b 100644 --- a/ESP/platformio.ini +++ b/ESP/platformio.ini @@ -15,59 +15,4 @@ extra_configs = ini/boards.ini ini/pinouts.ini ini/user_config.ini - -[env] -platform = espressif32 -framework = arduino - -[common] -monitor_speed = 115200 -monitor_rts = 0 -monitor_dtr = 0 -monitor_filters = - log2file - time - default - esp32_exception_decoder -board_build.partitions = min_spiffs.csv -build_flags = - - !python tools/git_rev.py - - -DENABLE_ADHOC=${wifi.enableadhoc} - -DADHOC_CHANNEL=${wifi.adhocchannel} - -DWIFI_CHANNEL=${wifi.channel} - -DDEBUG_ESP_PORT=Serial ; set the debug port - '-DMDNS_HOSTNAME=${wifi.mDNSName}' ; Set the OTA password - '-DWIFI_SSID=${wifi.ssid}' - '-DWIFI_PASSWORD=${wifi.password}' - '-DWIFI_AP_SSID=${wifi.ap_ssid}' - '-DWIFI_AP_PASSWORD=${wifi.ap_password}' - '-DWIFI_AP_CHANNEL=${wifi.adhocchannel}' - - -DENABLE_OTA=${ota.enableota} - -DOTA_SERVER_PORT=${ota.otaserverport} - '-DOTA_PASSWORD=${ota.otapassword}' ; Set the OTA password - '-DOTA_IP=${ota.otaserverip}' ; Set the OTA password - - -O2 ; optimize for speed - -DASYNCWEBSERVER_REGEX ; enable regex in asyncwebserver - - # Comment these out if you are not using psram - -DBOARD_HAS_PSRAM ; enable psram - -mfix-esp32-psram-cache-issue ; fix for psram - ; Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run faster - -DHTTP_PARSER_STRICT=0 - -;build_unflags = -Os ; disable optimization for size -lib_ldf_mode = deep+ -;115200 is used for compatability - if you are on windows and want the code to flash faster use 921600 -upload_speed = 921600 -lib_deps = - https://github.com/me-no-dev/ESPAsyncWebServer.git - https://github.com/me-no-dev/AsyncTCP.git - -build_type = debug -extra_scripts = - pre:tools/customname.py - post:tools/createzip.py + ini/dev_config.ini