mirror of
https://github.com/esp8266/Arduino.git
synced 2025-12-07 17:42:43 +03:00
Revert to nonos-sdk 2.2.1, new sdk-switching option in IDE menu for generic board only (#5763)
This commit allows switching SDK firmware:
nonos-sdk-pre-v3 shipped with release 2.5.0 has issues:
* Some boards show erratic behavior (radio connection is quickly lost), with an unknown cause.
These boards work well with previous nonos-sdk-2.2.1 firmware (#5736)
* Overall performances seem to have decreased (#5513)
This PR restores sdk2.2.1 (as in core-2.4.2).
SDK-pre-3.0 - which has brought long awaited fixes (WiFi sleep modes) - is still available through a menu option available only with generic board.
BREAKING
* new define `-DNONOSDK221=1` or `-DNONOSDK3V0=1`
* for external build systems: new library directory: `tools/sdk/lib/<version>/lib`
* PIO: variable `PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3` is needed for sdk-pre-v3.
Fix #5736
This commit is contained in:
@@ -70,6 +70,7 @@ boards = collections.OrderedDict([
|
||||
'flashmode_menu',
|
||||
'512K', '1M', '2M', '4M', '8M', '16M',
|
||||
'led',
|
||||
'sdk',
|
||||
],
|
||||
'desc': [ 'These modules come in different form factors and pinouts. See the page at ESP8266 community wiki for more info: `ESP8266 Module Family <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`__.',
|
||||
'',
|
||||
@@ -1326,6 +1327,18 @@ def led (default,max):
|
||||
]))
|
||||
return { 'led': led }
|
||||
|
||||
################################################################
|
||||
# sdk selection
|
||||
|
||||
def sdk ():
|
||||
return { 'sdk': collections.OrderedDict([
|
||||
('.menu.sdk.nonosdk221', 'nonos-sdk 2.2.1'),
|
||||
('.menu.sdk.nonosdk221.build.sdk', 'NONOSDK221'),
|
||||
('.menu.sdk.nonosdk3v0', 'nonos-sdk pre-3'),
|
||||
('.menu.sdk.nonosdk3v0.build.sdk', 'NONOSDK3V0'),
|
||||
])
|
||||
}
|
||||
|
||||
################################################################
|
||||
|
||||
def all_boards ():
|
||||
@@ -1344,6 +1357,7 @@ def all_boards ():
|
||||
macros.update(all_flash_map())
|
||||
macros.update(all_debug())
|
||||
macros.update(led(led_default, led_max))
|
||||
macros.update(sdk())
|
||||
|
||||
print('#')
|
||||
print('# Do not create pull-requests for this file only, CI will not accept them.')
|
||||
@@ -1367,6 +1381,7 @@ def all_boards ():
|
||||
print('menu.exception=Exceptions')
|
||||
print('menu.led=Builtin Led')
|
||||
print('menu.wipe=Erase Flash')
|
||||
print('menu.sdk=Espressif FW')
|
||||
print('')
|
||||
|
||||
for id in boards:
|
||||
@@ -1498,12 +1513,12 @@ def usage (name,ret):
|
||||
print("usage: %s [options]" % name)
|
||||
print("")
|
||||
print(" -h, --help")
|
||||
print(" --lwip - preferred default lwIP version (default %d)" % lwip)
|
||||
print(" --led - preferred default builtin led for generic boards (default %d)" % led_default)
|
||||
print(" --board b - board to modify:")
|
||||
print(" --speed s - change default serial speed")
|
||||
print(" --customspeed s - new serial speed for all boards")
|
||||
print(" --nofloat - disable float support in printf/scanf")
|
||||
print(" --lwip - preferred default lwIP version (default %d)" % lwip)
|
||||
print(" --led - preferred default builtin led for generic boards (default %d)" % led_default)
|
||||
print(" --board <b> - board to modify:")
|
||||
print(" --speed <s> - change default serial speed")
|
||||
print(" --customspeed <s> - new serial speed for all boards")
|
||||
print(" --nofloat - disable float support in printf/scanf")
|
||||
print("")
|
||||
print(" mandatory option (at least one):")
|
||||
print("")
|
||||
@@ -1610,7 +1625,7 @@ for o, a in opts:
|
||||
elif o in ("--noextra4kheap", "--allowWPS"):
|
||||
print('option ' + o + ' is now deprecated, without effect, and will be removed')
|
||||
|
||||
elif o in ("--ldshow"):
|
||||
elif o in ("--ld"):
|
||||
ldshow = True
|
||||
|
||||
elif o in ("--ldgen"):
|
||||
|
||||
Reference in New Issue
Block a user