Switch default FW to "2.2.2-dev(38a443e)" (menu:2.2.1+100) #6272
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,7 +68,7 @@ | |
| 'crystalfreq_menu', | ||
| 'flashfreq_menu', | ||
| 'flashmode_menu', | ||
| '1M', '2M', '4M', '8M', '16M', '512K', | ||
|
There was a problem hiding this comment. I see the 512K moved to then end of lists in other spots, is this on purpose? There was a problem hiding this comment. Yes, so the default flash space for esp8266 generic board is 1MB. |
||
| 'led', | ||
| 'sdk', | ||
| ], | ||
|
|
@@ -328,7 +328,7 @@ | |
| 'Product page: https://www.adafruit.com/product/2821' | ||
| ], | ||
| }), | ||
| ( 'inventone', { | ||
| 'name': 'Invent One', | ||
| 'opts': { | ||
| '.build.board': 'ESP8266_GENERIC', | ||
|
|
@@ -542,7 +542,7 @@ | |
| 'flashfreq_40', | ||
| '4M', | ||
| ], | ||
| # 'serial': '57', | ||
|
There was a problem hiding this comment. Why disabling the hardcoded serial speeds? If it's 921 it will silently use 400k. If it's 56K, there might be a HW reason for it on those specific boards.... There was a problem hiding this comment. (like a really, really cheap USB<->serial chip, or high resistance/capacitance on the lines due to something else like LEDs sharing the pin, etc.) There was a problem hiding this comment. That's true. I was wrongly thinking esptool would try at lower rates. |
||
| 'desc': [ '*TODO*' ], | ||
| }), | ||
| ( 'd1_mini', { | ||
|
|
@@ -557,7 +557,7 @@ | |
| 'flashfreq_40', | ||
| '4M', | ||
| ], | ||
| # 'serial': '921', | ||
| 'desc': [ 'Product page: https://www.wemos.cc/' ], | ||
| }), | ||
| ( 'd1_mini_pro', { | ||
|
|
@@ -572,7 +572,7 @@ | |
| 'flashfreq_40', | ||
| '16M', | ||
| ], | ||
| # 'serial': '921', | ||
| 'desc': [ 'Product page: https://www.wemos.cc/' ], | ||
| }), | ||
| ( 'd1_mini_lite', { | ||
|
|
@@ -587,30 +587,30 @@ | |
| 'flashfreq_40', | ||
| '1M', | ||
| ], | ||
| # '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', | ||
| ], | ||
| }), | ||
| ( 'd1', { | ||
|
|
@@ -625,7 +625,7 @@ | |
| 'flashfreq_40', | ||
| '4M', | ||
| ], | ||
| # 'serial': '921', | ||
| 'desc': [ 'Product page: https://www.wemos.cc/' ], | ||
| }), | ||
| ( 'espino', { | ||
|
|
@@ -767,7 +767,7 @@ | |
| 'flashfreq_40', | ||
| '4M', | ||
| ], | ||
| # 'serial': '921', | ||
| 'desc': [ 'The Oak requires an `Serial Adapter`_ for a serial connection or flashing; its micro USB port is only for power.', | ||
| '', | ||
| 'To make a serial connection, wire the adapter\'s **TX to P3**, **RX to P4**, and **GND** to **GND**. Supply 3.3v from the serial adapter if not already powered via USB.', | ||
|
|
@@ -787,7 +787,7 @@ | |
| 'flashfreq_40', | ||
| '4M', | ||
| ], | ||
| # 'serial': '921', | ||
| 'desc': [ 'Product page: https://wifiduino.com/esp8266' ], | ||
| }), | ||
| ( 'wifi_slot', { | ||
|
|
@@ -1194,7 +1194,7 @@ def flash_map (flashsize_kb, spiffs_kb = 0): | |
| ld = 'eagle.flash.' + strsize.lower() + strspiffs_strip.lower() + '.ld' | ||
| menu = '.menu.eesz.' + strsize + strspiffs_strip | ||
| menub = menu + '.build.' | ||
| desc = 'none' if (spiffs_kb == 0) else strspiffs + 'B' | ||
| d = collections.OrderedDict([ | ||
| ( menu, strsize + 'B (FS:' + desc + ' OTA:~%iKB)' % (max_ota_size / 1024)), | ||
| ( menub + 'flash_size', strsize ), | ||
|
|
@@ -1277,37 +1277,37 @@ def all_flash_map (): | |
|
|
||
| # flash(KB) spiffs(KB) | ||
|
|
||
| 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, 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, 2*1024 )) | ||
| f4m.update( flash_map( 4*1024, 1024 )) | ||
| f4m.update( flash_map( 4*1024, 3*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) | ||
|
|
||
|
|
@@ -1342,12 +1342,12 @@ def led (default,max): | |
|
|
||
| def sdk (): | ||
| return { 'sdk': collections.OrderedDict([ | ||
| ('.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'), | ||
| ]) | ||
|
|
@@ -1573,7 +1573,7 @@ def usage (name,ret): | |
| # entry point | ||
|
|
||
| lwip = 2 | ||
| default_speed = '921' | ||
|
There was a problem hiding this comment. I'm a little worried here about the speed change, see above comment. There was a problem hiding this comment. Speed change is now reverted. |
||
| led_default = 2 | ||
| led_max = 16 | ||
| nofloat = False | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Space to tab problems?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes