Skip to content

Added 1M (No SPIFFS) board option #3203

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
igrr merged 35 commits into from
May 12, 2017
Merged

Added 1M (No SPIFFS) board option #3203

Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
be5d59d
Changed WifInfo settings and WeMos board name
hallard May 24, 2016
5d803af
Added board name to have in sketch and MDNS/OTA
hallard May 24, 2016
248577e
board naming convention
hallard Jun 1, 2016
eb9932b
Merge remote-tracking branch 'upstream/master'
hallard Jun 1, 2016
07da577
Added Serial.baudRate() to get current baud rate
hallard Jun 1, 2016
c72426a
Added more description
hallard Jun 2, 2016
498342f
Merge remote-tracking branch 'upstream/master'
hallard Jun 5, 2016
27e4146
Merge remote-tracking branch 'upstream/master'
hallard Jun 6, 2016
fa06c85
Merge remote-tracking branch 'upstream/master'
hallard Jun 8, 2016
d765972
Merge remote-tracking branch 'upstream/master'
hallard Jun 15, 2016
365d1a1
Merge remote-tracking branch 'upstream/master'
hallard Jun 21, 2016
594dd62
Merge remote-tracking branch 'upstream/master'
hallard Jun 23, 2016
044758d
Merge remote-tracking branch 'upstream/master'
hallard Jun 28, 2016
b700162
Merge remote-tracking branch 'upstream/master'
hallard Jul 4, 2016
8660c34
Merge remote-tracking branch 'upstream/master'
hallard Jul 6, 2016
875a48d
Merge remote-tracking branch 'upstream/master'
hallard Jul 9, 2016
f14cd96
Merge remote-tracking branch 'upstream/master'
hallard Jul 12, 2016
10754b6
Merge remote-tracking branch 'upstream/master'
hallard Jul 18, 2016
11c27f2
Merge remote-tracking branch 'upstream/master'
hallard Jul 20, 2016
617fb90
Merge remote-tracking branch 'upstream/master'
hallard Jul 21, 2016
014ac71
Merge remote-tracking branch 'upstream/master'
hallard Jul 26, 2016
df3c459
Merge remote-tracking branch 'upstream/master'
hallard Aug 2, 2016
b4383dc
Merge remote-tracking branch 'upstream/master'
hallard Aug 23, 2016
08fc8f3
Merge remote-tracking branch 'upstream/master'
hallard Aug 29, 2016
74d630d
Merge remote-tracking branch 'upstream/master'
hallard Sep 15, 2016
88bff55
Merge remote-tracking branch 'upstream/master'
hallard Nov 23, 2016
77ba511
Merge remote-tracking branch 'upstream/master'
hallard Jan 16, 2017
9baea4f
Merge remote-tracking branch 'upstream/master'
hallard Feb 5, 2017
ac0ee14
Merge remote-tracking branch 'upstream/master'
hallard Feb 27, 2017
10952e6
Merge remote-tracking branch 'upstream/master'
hallard Mar 16, 2017
bab1911
Merge remote-tracking branch 'upstream/master'
hallard Apr 26, 2017
3ec3944
Merge remote-tracking branch 'upstream/master'
hallard May 4, 2017
90319a8
Added 1M (No SPIFFS) board option
hallard May 5, 2017
aa229f4
Merge branch 'master' into master
hallard May 11, 2017
322e16a
Merge branch 'master' into master
igrr May 12, 2017
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
Merge remote-tracking branch 'upstream/master'
  • Loading branch information
@hallard
hallard committed Jul 4, 2016
commit b7001628d8e736106127c12138ff35314372e885

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.