Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed Ethernet not reliable issue #648

Merged
merged 4 commits into from
Aug 17, 2023
Merged

Fixed Ethernet not reliable issue #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1027e1
Fixed missing data in file response when no SD is installed.
MartinMueller2003 Aug 17, 2023
0e12c4b
Added a debug comment
MartinMueller2003 Aug 17, 2023
970fc59
Moved platform version back to a version in which Ethernet interfaces…
MartinMueller2003 Aug 17, 2023
f614250
Merge branch 'forkineye:main' into main
MartinMueller2003 Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ESPixelStick/src/FileMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,12 +863,12 @@ void c_FileMgr::GetListOfSdFiles (String & Response)
break;
}

// DEBUG_V(String("ResponseJsonDoc.size(): ") + String(ResponseJsonDoc.size()));
Response.reserve(1024);
serializeJson (ResponseJsonDoc, Response);

} while (false);

// DEBUG_V(String("ResponseJsonDoc.size(): ") + String(ResponseJsonDoc.size()));
Response.reserve(1024);
serializeJson (ResponseJsonDoc, Response);

// DEBUG_V (String ("Response: ") + Response);

// DEBUG_END;
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ gulp.task('js', function() {
return gulp.src(['html/js/jquery*.js', 'html/js/bootstrap.js', 'html/js/jqColorPicker.js', 'html/script.js', 'html/js/dropzone.js', 'html/js/FileSaver.js', 'html/script.js'])
.pipe(plumber())
.pipe(concat('esps.js'))
.pipe(terser({ 'toplevel': true }))
.pipe(terser({ 'toplevel': true })) /* comment out this line to debug the script file */
.pipe(gzip())
.pipe(gulp.dest('ESPixelStick/data/www'));
});
Expand Down
7 changes: 4 additions & 3 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ extra_scripts = ${env.extra_scripts}
extends = esp32
build_flags = ${esp32.build_flags} -mtext-section-literals
; platform = https://github.com/platformio/platform-espressif32.git#48c4226e5240c873dae6b28adbb93ad8ca582b5d
platform = https://github.com/platformio/platform-espressif32.git @ ~6.3.2
; platform = https://github.com/platformio/platform-espressif32.git#eb7eba4 ; unstable 6.3.2
platform = https://github.com/platformio/platform-espressif32.git#8100ac5 ; works 6.3.1
platform_packages =
framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.11 ;
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3 ;
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.11 ;
framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3 ;
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.2 ; runs real slow
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1 ; Has general issues
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.0 ; SD card not stable on cam card
Expand Down