Skip to content
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

Jump to bottom

change "WeMos" to new brand name "LOLIN" #4984

Merged
merged 8 commits into from
Aug 1, 2018
Merged

change "WeMos" to new brand name "LOLIN" #4984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
247f727
fix digitalPinToBitMask(), portOutputRegister(), portInputRegister() …
wemos Jul 27, 2018
a5a5db3
Merge branch 'master' into master
earlephilhower Jul 27, 2018
7ad04e0
Merge branch 'master' into master
devyte Jul 27, 2018
0824c0f
fix macros (..) parenthesis lost
wemos Jul 28, 2018
090ae54
surround the entire ternary
wemos Jul 28, 2018
2443aaa
Merge remote-tracking branch 'remotes/upstream/master'
wemos Jul 28, 2018
c6dc637
Merge remote-tracking branch 'remotes/upstream/master'
wemos Jul 30, 2018
cd6a643
change "WeMos" to new brand name "LOLIN"
wemos Jul 30, 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
6 changes: 3 additions & 3 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2633,7 +2633,7 @@ esp210.menu.UploadSpeed.921600=921600
esp210.menu.UploadSpeed.921600.upload.speed=921600

##############################################################
d1_mini.name=WeMos D1 R2 & mini
d1_mini.name=LOLIN(WEMOS) D1 R2 & mini
d1_mini.build.board=ESP8266_WEMOS_D1MINI
d1_mini.build.variant=d1_mini
d1_mini.upload.tool=esptool
Expand Down Expand Up @@ -2787,7 +2787,7 @@ d1_mini.menu.UploadSpeed.512000.windows=512000
d1_mini.menu.UploadSpeed.512000.upload.speed=512000

##############################################################
d1_mini_pro.name=WeMos D1 mini Pro
d1_mini_pro.name=LOLIN(WEMOS) D1 mini Pro
d1_mini_pro.build.board=ESP8266_WEMOS_D1MINIPRO
d1_mini_pro.build.variant=d1_mini
d1_mini_pro.upload.tool=esptool
Expand Down Expand Up @@ -2921,7 +2921,7 @@ d1_mini_pro.menu.UploadSpeed.512000.windows=512000
d1_mini_pro.menu.UploadSpeed.512000.upload.speed=512000

##############################################################
d1_mini_lite.name=WeMos D1 mini Lite
d1_mini_lite.name=LOLIN(WEMOS) D1 mini Lite
d1_mini_lite.build.board=ESP8266_WEMOS_D1MINILITE
d1_mini_lite.build.variant=d1_mini
d1_mini_lite.upload.tool=esptool
Expand Down
12 changes: 6 additions & 6 deletions doc/boards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,18 +315,18 @@ SweetPea ESP-210

*TODO*

WeMos D1 R2 & mini
------------------
LOLIN(WEMOS) D1 R2 & mini
-------------------------

Product page: https://www.wemos.cc/

WeMos D1 mini Pro
-----------------
LOLIN(WEMOS) D1 mini Pro
------------------------

Product page: https://www.wemos.cc/

WeMos D1 mini Lite
------------------
LOLIN(WEMOS) D1 mini Lite
-------------------------

Parameters in Arduino IDE:
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
6 changes: 3 additions & 3 deletions package/package_esp8266com_index.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@
"name": "SweetPea ESP-210"
},
{
"name": "WeMos D1 R2 & mini"
"name": "LOLIN(WEMOS) D1 R2 & mini"
},
{
"name": "WeMos D1 mini Pro"
"name": "LOLIN(WEMOS) D1 mini Pro"
},
{
"name": "WeMos D1 mini Lite"
"name": "LOLIN(WEMOS) D1 mini Lite"
},
{
"name": "WeMos D1 R1"
Expand Down
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 @@ -526,7 +526,7 @@
'desc': [ '*TODO*' ],
}),
( 'd1_mini', {
'name': 'WeMos D1 R2 & mini',
'name': 'LOLIN(WEMOS) D1 R2 & mini',
'opts': {
'.build.board': 'ESP8266_WEMOS_D1MINI',
'.build.variant': 'd1_mini',
Expand All @@ -541,7 +541,7 @@
'desc': [ 'Product page: https://www.wemos.cc/' ],
}),
( 'd1_mini_pro', {
'name': 'WeMos D1 mini Pro',
'name': 'LOLIN(WEMOS) D1 mini Pro',
'opts': {
'.build.board': 'ESP8266_WEMOS_D1MINIPRO',
'.build.variant': 'd1_mini',
Expand All @@ -556,7 +556,7 @@
'desc': [ 'Product page: https://www.wemos.cc/' ],
}),
( 'd1_mini_lite', {
'name': 'WeMos D1 mini Lite',
'name': 'LOLIN(WEMOS) D1 mini Lite',
'opts': {
'.build.board': 'ESP8266_WEMOS_D1MINILITE',
'.build.variant': 'd1_mini',
Expand Down