Skip to content

Switch default FW to "2.2.2-dev(38a443e)" (menu:2.2.1+100) #6272

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

Merged
merged 12 commits into from
Jul 9, 2019
Merged

Switch default FW to "2.2.2-dev(38a443e)" (menu:2.2.1+100) #6272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
620b465
enable by default latest 2.2.x firmware, including fixed espnow
d-a-v Jul 8, 2019
6740cca
LittleFS: avoid crash when FS size is 0
d-a-v Jul 8, 2019
3a1bc95
serial speed defaults to 921k in menu for all boards (testing, since …
d-a-v Jul 8, 2019
d83c31d
flash size defaults: 1M for generic board, not empty FS for all
d-a-v Jul 8, 2019
f789003
default FW for PlatformIO too
d-a-v Jul 8, 2019
6048f23
cosmetics
d-a-v Jul 8, 2019
ee7fac5
Merge branch 'master' into defaultFW2.2.1+100
d-a-v Jul 8, 2019
3387574
fix boards.txt
d-a-v Jul 8, 2019
802ab5b
revert serial speeds
d-a-v Jul 9, 2019
38cd19f
Merge branch 'master' into defaultFW2.2.1+100
d-a-v Jul 9, 2019
59596ec
merge: regenerate boards.txt
d-a-v Jul 9, 2019
07c463e
+2M64
d-a-v Jul 9, 2019
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
978 changes: 503 additions & 475 deletions boards.txt
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion cores/esp8266/FS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,12 @@ bool FS::setConfig(const FSConfig &cfg) {

bool FS::begin() {
if (!_impl) {
DEBUGV("#error: FS: no implementation");
return false;
}
return _impl->begin();
bool ret = _impl->begin();
DEBUGV("%s\n", ret? "": "#error: FS could not start");
return ret;
}

void FS::end() {
Expand Down
1 change: 0 additions & 1 deletion doc/boards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ Parameters in Arduino IDE:
- Card: "WEMOS D1 Mini Lite"
- Flash Size: "1M (512K SPIFFS)"
- CPU Frequency: "80 Mhz"
- Upload Speed: "230400"

Power:
~~~~~~
Expand Down
6 changes: 3 additions & 3 deletions libraries/LittleFS/src/LittleFS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ class LittleFSImpl : public FSImpl
_lfs_cfg.read_size = 64;
_lfs_cfg.prog_size = 64;
_lfs_cfg.block_size = _blockSize;
_lfs_cfg.block_count = _size / _blockSize;
_lfs_cfg.block_cycles = 16; // TODO - need better explanation
_lfs_cfg.cache_size = 64;
_lfs_cfg.block_count =_blockSize? _size / _blockSize: 0;
_lfs_cfg.block_cycles = 16; // TODO - need better explanation
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space to tab problems?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

_lfs_cfg.cache_size = 64;
_lfs_cfg.lookahead_size = 64;
_lfs_cfg.read_buffer = nullptr;
_lfs_cfg.prog_buffer = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ build.stdcpp_lib=-lstdc++

build.float=-u _printf_float -u _scanf_float
build.led=
build.sdk=NONOSDK221
build.sdk=NONOSDK22y

compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
compiler.sdk.path={runtime.platform.path}/tools/sdk
Expand Down
77 changes: 39 additions & 38 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
'crystalfreq_menu',
'flashfreq_menu',
'flashmode_menu',
'512K', '1M', '2M', '4M', '8M', '16M',
'1M', '2M', '4M', '8M', '16M', '512K',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the 512K moved to then end of lists in other spots, is this on purpose?

Copy link
Collaborator Author

@d-a-v d-a-v Jul 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, so the default flash space for esp8266 generic board is 1MB.
512K boards are obsolete and not sold anymore, also abandoned / not usable in nonos-sdk-v3.
We still have them anyway, but no more as default.

'led',
'sdk',
],
Expand Down Expand Up @@ -328,7 +328,7 @@
'Product page: https://www.adafruit.com/product/2821'
],
}),
( 'inventone', {
( 'inventone', {
'name': 'Invent One',
'opts': {
'.build.board': 'ESP8266_GENERIC',
Expand Down Expand Up @@ -589,28 +589,28 @@
],
'serial': '921',
'desc': [
'Parameters in Arduino IDE:',
'~~~~~~~~~~~~~~~~~~~~~~~~~~',
'',
'- Card: "WEMOS D1 Mini Lite"',
'- Flash Size: "1M (512K SPIFFS)"',
'- CPU Frequency: "80 Mhz"',
'- Upload Speed: "230400"',
'',
'Power:',
'~~~~~~',
'',
'- 5V pin : 4.7V 500mA output when the board is powered by USB ; 3.5V-6V input',
'- 3V3 pin : 3.3V 500mA regulated output',
'- Digital pins : 3.3V 30mA.',
'',
'links:',
'~~~~~~',
'',
'- Product page: https://www.wemos.cc/',
'- Board schematic: https://wiki.wemos.cc/_media/products:d1:sch_d1_mini_lite_v1.0.0.pdf',
'- ESP8285 datasheet: https://www.espressif.com/sites/default/files/0a-esp8285_datasheet_en_v1.0_20160422.pdf',
'- Voltage regulator datasheet: http://pdf-datasheet.datasheet.netdna-cdn.com/pdf-down/M/E/6/ME6211-Microne.pdf',
'Parameters in Arduino IDE:',
'~~~~~~~~~~~~~~~~~~~~~~~~~~',
'',
'- Card: "WEMOS D1 Mini Lite"',
'- Flash Size: "1M (512K SPIFFS)"',
'- CPU Frequency: "80 Mhz"',
# '- Upload Speed: "230400"',
'',
'Power:',
'~~~~~~',
'',
'- 5V pin : 4.7V 500mA output when the board is powered by USB ; 3.5V-6V input',
'- 3V3 pin : 3.3V 500mA regulated output',
'- Digital pins : 3.3V 30mA.',
'',
'links:',
'~~~~~~',
'',
'- Product page: https://www.wemos.cc/',
'- Board schematic: https://wiki.wemos.cc/_media/products:d1:sch_d1_mini_lite_v1.0.0.pdf',
'- ESP8285 datasheet: https://www.espressif.com/sites/default/files/0a-esp8285_datasheet_en_v1.0_20160422.pdf',
'- Voltage regulator datasheet: http://pdf-datasheet.datasheet.netdna-cdn.com/pdf-down/M/E/6/ME6211-Microne.pdf',
],
}),
( 'd1', {
Expand Down Expand Up @@ -1197,7 +1197,7 @@ def flash_map (flashsize_kb, fs_kb = 0):
ld = 'eagle.flash.' + strsize.lower() + strfs_strip.lower() + '.ld'
menu = '.menu.eesz.' + strsize + strfs_strip
menub = menu + '.build.'
desc = 'no' if (fs_kb == 0) else strfs + 'B'
desc = 'none' if (fs_kb == 0) else strfs + 'B'
d = collections.OrderedDict([
( menu, strsize + 'B (FS:' + desc + ' OTA:~%iKB)' % (max_ota_size / 1024)),
( menub + 'flash_size', strsize ),
Expand Down Expand Up @@ -1276,37 +1276,38 @@ def all_flash_map ():

# flash(KB) spiffs(KB)

f512.update(flash_map( 512))
f512.update(flash_map( 512, 32 ))
f512.update(flash_map( 512, 64 ))
f512.update(flash_map( 512, 128 ))

f1m.update( flash_map( 1024))
f1m.update( flash_map( 1024, 64 ))
f1m.update( flash_map( 1024, 128 ))
f1m.update( flash_map( 1024, 144 ))
f1m.update( flash_map( 1024, 160 ))
f1m.update( flash_map( 1024, 192 ))
f1m.update( flash_map( 1024, 256 ))
f1m.update( flash_map( 1024, 512 ))
f1m.update( flash_map( 1024))

f2m.update( flash_map( 2*1024))
f2m.update( flash_map( 2*1024, 64 ))
f2m.update( flash_map( 2*1024, 128 ))
f2m.update( flash_map( 2*1024, 256 ))
f2m.update( flash_map( 2*1024, 512 ))
f2m.update( flash_map( 2*1024, 1024 ))
f2m.update( flash_map( 2*1024))

f4m.update( flash_map( 4*1024))
f4m.update( flash_map( 4*1024, 1024 ))
f4m.update( flash_map( 4*1024, 2*1024 ))
f4m.update( flash_map( 4*1024, 3*1024 ))
f4m.update( flash_map( 4*1024, 1024 ))
f4m.update( flash_map( 4*1024))

f8m.update( flash_map( 8*1024, 6*1024 ))
f8m.update( flash_map( 8*1024, 7*1024 ))

f16m.update(flash_map( 16*1024, 14*1024 ))
f16m.update(flash_map( 16*1024, 15*1024 ))

f512.update(flash_map( 512, 32 ))
f512.update(flash_map( 512, 64 ))
f512.update(flash_map( 512, 128 ))
f512.update(flash_map( 512))

if ldgen:
print("generated: ldscripts (in %s)" % lddir)

Expand Down Expand Up @@ -1341,12 +1342,12 @@ def led (default,max):

def sdk ():
return { 'sdk': collections.OrderedDict([
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
('.menu.sdk.nonosdk222_100', 'nonos-sdk 2.2.1+100 (testing)'),
('.menu.sdk.nonosdk222_100.build.sdk', 'NONOSDK22y'),
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1 (legacy)'),
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
# ('.menu.sdk.nonosdk222_61', 'nonos-sdk 2.2.1+61 (testing)'),
# ('.menu.sdk.nonosdk222_61.build.sdk', 'NONOSDK22x'),
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3 (known issues)'),
('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
])
Expand Down
14 changes: 7 additions & 7 deletions tools/platformio-build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,17 @@ def scons_patched_match_splitext(path, suffixes=None):
CPPDEFINES=[("NONOSDK22x", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22x")]
)
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22y", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
)
# PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 (default)
else:
elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221" in flatten_cppdefines:
#(previous default)
env.Append(
CPPDEFINES=[("NONOSDK221", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK221")]
)
else: #(default) elif "PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22y" in flatten_cppdefines:
env.Append(
CPPDEFINES=[("NONOSDK22y", 1)],
LIBPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lib", "NONOSDK22y")]
)

#
# lwIP
Expand Down