Skip to content

added 2M generic boards #5404

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
earlephilhower merged 13 commits into from
Dec 1, 2018
Merged

added 2M generic boards #5404

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
82f9afe
added generic boards
Nov 30, 2018
b0945b1
Merge branch 'master' into added_2M_boards_flash_mapping
apicquot Nov 30, 2018
ac24693
removed unecessary files
Nov 30, 2018
ae166c4
Merge branch 'added_2M_boards_flash_mapping' of https://github.com/ap…
Nov 30, 2018
063d8de
fixed name issue
Nov 30, 2018
b271581
removes orig file
apicquot Nov 30, 2018
498369d
Delete package_esp8266com_index.template.json.orig
apicquot Nov 30, 2018
6acbab8
restored:
apicquot Dec 1, 2018
de8fc03
Merge branch 'master' into added_2M_boards_flash_mapping
apicquot Dec 1, 2018
523feca
keeping boards.txt.py
apicquot Dec 1, 2018
6b29219
Merge branch 'added_2M_boards_flash_mapping' of https://github.com/ap…
apicquot Dec 1, 2018
799ba10
using python 2.7 for running boards.txt.py
apicquot Dec 1, 2018
6f71c14
Merge branch 'master' into added_2M_boards_flash_mapping
apicquot Dec 1, 2018
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
Prev Previous commit
Next Next commit
keeping boards.txt.py
  • Loading branch information
@apicquot
apicquot committed Dec 1, 2018
commit 523feca88154b67d43cf675883b78a667498ff79
6 changes: 3 additions & 3 deletions tools/boards.txt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,9 +1135,9 @@ def flash_map (flashsize_kb, spiffs_kb = 0):
spiffs_start = (flashsize_kb - spiffs_kb) * 1024
spiffs_blocksize = 8192

strsize = str(int(flashsize_kb / 1024)) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
strspiffs = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'
strspiffs_strip = str(int(spiffs_kb / 1024)) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) if (spiffs_kb > 0) else ''
strsize = str(flashsize_kb / 1024) + 'M' if (flashsize_kb >= 1024) else str(flashsize_kb) + 'K'
strspiffs = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) + 'K'
strspiffs_strip = str(spiffs_kb / 1024) + 'M' if (spiffs_kb >= 1024) else str(spiffs_kb) if (spiffs_kb > 0) else ''

ld = 'eagle.flash.' + strsize.lower() + strspiffs_strip.lower() + '.ld'
menu = '.menu.eesz.' + strsize + strspiffs_strip
Expand Down