GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-05 00:10:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add esp32 wifi only env to use big FS

Browse Source 
Add new error code for FW update
Update package.json  versions
This commit is contained in:
Luc 2021-09-15 14:26:29 +02:00
parent 3a7ccdb167
commit 058236150d
5 changed files with 1089 additions and 982 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2020
embedded/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
embedded/package.json
View File

@ -15,29 +15,29 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.12.13", "@babel/core": "^7.15.5",
"@babel/preset-env": "^7.12.13", "@babel/preset-env": "^7.15.6",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"chalk": "^4.1.0", "chalk": "^4.1.2",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"compression-webpack-plugin": "^7.1.2", "compression-webpack-plugin": "^7.1.2",
"concurrently": "^5.3.0", "concurrently": "^5.3.0",
"core-js": "^3.8.3", "core-js": "^3.17.3",
"css-loader": "^5.0.2", "css-loader": "^5.2.7",
"espress": "0.0.0", "espress": "0.0.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-fileupload": "^1.2.1", "express-fileupload": "^1.2.1",
"express-ws": "^4.0.0", "express-ws": "^4.0.0",
"html-inline-css-webpack-plugin": "^1.10.1", "html-inline-css-webpack-plugin": "^1.11.1",
"html-inline-script-webpack-plugin": "^1.0.1", "html-inline-script-webpack-plugin": "^1.1.4",
"html-minimizer-webpack-plugin": "^2.1.0", "html-minimizer-webpack-plugin": "^2.1.0",
"html-webpack-plugin": "^5.0.0", "html-webpack-plugin": "^5.3.2",
"mini-css-extract-plugin": "^1.3.6", "mini-css-extract-plugin": "^1.6.2",
"nodemon": "^2.0.7", "nodemon": "^2.0.12",
"regenerator-runtime": "^0.13.7", "regenerator-runtime": "^0.13.9",
"style-loader": "^2.0.0", "style-loader": "^2.0.0",
"webpack": "^5.21.2", "webpack": "^5.52.1",
"webpack-cli": "^4.5.0", "webpack-cli": "^4.8.0",
"webpack-dev-server": "^3.11.2" "webpack-dev-server": "^3.11.2"
} }
} }

1
esp3d/src/include/defines.h
View File

@ -146,6 +146,7 @@
#define ESP_ERROR_BUFFER_OVERFLOW 11 #define ESP_ERROR_BUFFER_OVERFLOW 11
#define ESP_ERROR_START_UPLOAD 12 #define ESP_ERROR_START_UPLOAD 12
#define ESP_ERROR_SIZE 13 #define ESP_ERROR_SIZE 13
#define ESP_ERROR_UPDATE 14
//File system //File system
#define ESP_FILE_READ 0 #define ESP_FILE_READ 0

4
esp3d/src/modules/http/handles/upload-updatefw.cpp
View File

@ -112,12 +112,12 @@ void HTTP_Server::WebUpdateUpload ()
} else { } else {
output.printERROR("Update failed!",500); output.printERROR("Update failed!",500);
_upload_status=UPLOAD_STATUS_FAILED; _upload_status=UPLOAD_STATUS_FAILED;
pushError(ESP_ERROR_FILE_CLOSE, "File close failed"); pushError(ESP_ERROR_UPDATE, "Update FW failed");
} }
} else { } else {
_upload_status=UPLOAD_STATUS_FAILED; _upload_status=UPLOAD_STATUS_FAILED;
output.printERROR("Update failed!", 500); output.printERROR("Update failed!", 500);
pushError(ESP_ERROR_FILE_CLOSE, "File close failed"); pushError(ESP_ERROR_UPDATE, "Update FW failed");
} }
} else { } else {
output.printERROR("Update failed!",500); output.printERROR("Update failed!",500);

20
platformio.ini
View File

@ -38,6 +38,26 @@ extra_scripts = pre:platformIO/extra_script.py
lib_ignore = lib_ignore =
ESPAsyncTCP ESPAsyncTCP
[env:esp32devWiFiOnly]
platform = https://github.com/platformio/platform-espressif32.git
;theboard
board = esp32dev
framework = arduino
monitor_speed = 115200
monitor_flags = --echo
monitor_filters = send_on_enter, colorize, esp32_exception_decoder
; set frequency to 240MHz
;board_build.f_cpu = 240000000L
; set frequency to 80MHz
;board_build.f_flash = 80000000L
;board_build.flash_mode = qio
; None
build_flags = -DCORE_DEBUG_LEVEL=0
upload_speed = 921600
extra_scripts = pre:platformIO/extra_script.py
lib_ignore =
ESPAsyncTCP
[env:esp32cam] [env:esp32cam]
platform = https://github.com/platformio/platform-espressif32.git platform = https://github.com/platformio/platform-espressif32.git
;theboard ;theboard