From 247f72793fab8d8a7460d3a8d657cbdc709e454d Mon Sep 17 00:00:00 2001 From: wemos Date: Fri, 27 Jul 2018 12:32:32 +0800 Subject: [PATCH 1/4] fix digitalPinToBitMask(), portOutputRegister(), portInputRegister() and portModeRegister() error when the pin is GPIO16. --- cores/esp8266/Arduino.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index c1e185414f..fbb370f125 100644 --- a/cores/esp8266/Arduino.h +++ b/cores/esp8266/Arduino.h @@ -224,12 +224,13 @@ void loop(void); void yield(void); void optimistic_yield(uint32_t interval_us); -#define digitalPinToPort(pin) (0) -#define digitalPinToBitMask(pin) (1UL << (pin)) +#define _PORT_GPIO16 1 +#define digitalPinToPort(pin) (pin==16)?(_PORT_GPIO16):(0) +#define digitalPinToBitMask(pin) (pin==16)?(1):(1UL << (pin)) #define digitalPinToTimer(pin) (0) -#define portOutputRegister(port) ((volatile uint32_t*) &GPO) -#define portInputRegister(port) ((volatile uint32_t*) &GPI) -#define portModeRegister(port) ((volatile uint32_t*) &GPE) +#define portOutputRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16O):((volatile uint32_t*) &GPO) +#define portInputRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16I):((volatile uint32_t*) &GPI) +#define portModeRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16E):((volatile uint32_t*) &GPE) #define NOT_A_PIN -1 #define NOT_A_PORT -1 From 0824c0f358f38156442245089cdb88e8c7f4d6aa Mon Sep 17 00:00:00 2001 From: wemos Date: Sat, 28 Jul 2018 09:25:59 +0800 Subject: [PATCH 2/4] fix macros (..) parenthesis lost --- cores/esp8266/Arduino.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index fbb370f125..ae51372a7e 100644 --- a/cores/esp8266/Arduino.h +++ b/cores/esp8266/Arduino.h @@ -225,12 +225,12 @@ void yield(void); void optimistic_yield(uint32_t interval_us); #define _PORT_GPIO16 1 -#define digitalPinToPort(pin) (pin==16)?(_PORT_GPIO16):(0) -#define digitalPinToBitMask(pin) (pin==16)?(1):(1UL << (pin)) +#define digitalPinToPort(pin) ((pin)==16)?(_PORT_GPIO16):(0) +#define digitalPinToBitMask(pin) ((pin)==16)?(1):(1UL << (pin)) #define digitalPinToTimer(pin) (0) -#define portOutputRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16O):((volatile uint32_t*) &GPO) -#define portInputRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16I):((volatile uint32_t*) &GPI) -#define portModeRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16E):((volatile uint32_t*) &GPE) +#define portOutputRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16O):((volatile uint32_t*) &GPO) +#define portInputRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16I):((volatile uint32_t*) &GPI) +#define portModeRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16E):((volatile uint32_t*) &GPE) #define NOT_A_PIN -1 #define NOT_A_PORT -1 From 090ae545fab797d0a23eb6e76447fafe09906ff3 Mon Sep 17 00:00:00 2001 From: wemos Date: Sat, 28 Jul 2018 14:26:31 +0800 Subject: [PATCH 3/4] surround the entire ternary --- cores/esp8266/Arduino.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h index ae51372a7e..b13817ae8f 100644 --- a/cores/esp8266/Arduino.h +++ b/cores/esp8266/Arduino.h @@ -225,12 +225,12 @@ void yield(void); void optimistic_yield(uint32_t interval_us); #define _PORT_GPIO16 1 -#define digitalPinToPort(pin) ((pin)==16)?(_PORT_GPIO16):(0) -#define digitalPinToBitMask(pin) ((pin)==16)?(1):(1UL << (pin)) +#define digitalPinToPort(pin) (((pin)==16)?(_PORT_GPIO16):(0)) +#define digitalPinToBitMask(pin) (((pin)==16)?(1):(1UL << (pin))) #define digitalPinToTimer(pin) (0) -#define portOutputRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16O):((volatile uint32_t*) &GPO) -#define portInputRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16I):((volatile uint32_t*) &GPI) -#define portModeRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16E):((volatile uint32_t*) &GPE) +#define portOutputRegister(port) (((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16O):((volatile uint32_t*) &GPO)) +#define portInputRegister(port) (((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16I):((volatile uint32_t*) &GPI)) +#define portModeRegister(port) (((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16E):((volatile uint32_t*) &GPE)) #define NOT_A_PIN -1 #define NOT_A_PORT -1 From cd6a643531ef95777e1fd90ed5c75f36c75aeb35 Mon Sep 17 00:00:00 2001 From: wemos Date: Mon, 30 Jul 2018 14:09:57 +0800 Subject: [PATCH 4/4] change "WeMos" to new brand name "LOLIN" --- boards.txt | 6 +++--- doc/boards.rst | 12 ++++++------ package/package_esp8266com_index.template.json | 6 +++--- tools/boards.txt.py | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/boards.txt b/boards.txt index 92751ec80d..e1f98d11c8 100644 --- a/boards.txt +++ b/boards.txt @@ -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 @@ -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 @@ -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 diff --git a/doc/boards.rst b/doc/boards.rst index dccc4b543f..5fda66cb8e 100644 --- a/doc/boards.rst +++ b/doc/boards.rst @@ -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: ~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json index ff5295a80a..98a5d0acc6 100644 --- a/package/package_esp8266com_index.template.json +++ b/package/package_esp8266com_index.template.json @@ -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" diff --git a/tools/boards.txt.py b/tools/boards.txt.py index 77f6283372..8df91566df 100755 --- a/tools/boards.txt.py +++ b/tools/boards.txt.py @@ -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', @@ -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', @@ -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',