Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into newflags
Browse files Browse the repository at this point in the history
  • Loading branch information
KipK committed May 10, 2023
2 parents f377466 + 8170b69 commit 2b7cba6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion min_spiffs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x1E0000,
app1, app, ota_1, 0x1F0000,0x1E0000,
spiffs, data, spiffs, 0x3D0000,0x30000,
spiffs, data, spiffs, 0x3D0000,0x20000,
coredump, data, coredump,0x3F0000,0x10000,
3 changes: 2 additions & 1 deletion min_spiffs_debug.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x3C0000,
spiffs, data, spiffs, 0x3D0000,0x30000,
spiffs, data, spiffs, 0x3D0000,0x20000,
coredump, data, coredump,0x3F0000,0x10000,

0 comments on commit 2b7cba6

Please sign in to comment.