From 22bfbf10c8c8786db35cef13c27e8d384cdcbc4d Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 18 Jun 2021 12:48:35 +0200
Subject: [PATCH 1/3] Create esp8266_zbbridge.json

---
 boards/esp8266_zbbridge.json | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 boards/esp8266_zbbridge.json

diff --git a/boards/esp8266_zbbridge.json b/boards/esp8266_zbbridge.json
new file mode 100644
index 000000000..975c1bc8c
--- /dev/null
+++ b/boards/esp8266_zbbridge.json
@@ -0,0 +1,32 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "eagle.flash.2m256.ld"
+    },
+    "core": "esp8266",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
+    "f_cpu": "160000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dout",
+    "mcu": "esp8266",
+    "variant": "generic"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "frameworks": [
+    "arduino",
+    "esp8266-rtos-sdk",
+    "esp8266-nonos-sdk"
+  ],
+  "name": "Sonoff ZbBridge Tasmota 1M sketch 772k OTA 256k SPIFFS",
+  "upload": {
+    "maximum_ram_size": 81920,
+    "maximum_size": 995326,
+    "require_upload_port": true,
+    "resetmethod": "ck",
+    "speed": 115200
+  },
+  "url": "https://templates.blakadder.com/sonoff_ZBBridge.html",
+  "vendor": "Espressif"
+}

From 14346a8d72d79657c057ef194c67983d8e61e0c5 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 18 Jun 2021 12:51:13 +0200
Subject: [PATCH 2/3] Use esp8266_zbbridge board

---
 platformio_tasmota_env.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index eed8ec891..5a17320bd 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -62,8 +62,7 @@ build_flags             = ${common.build_flags} ${irremoteesp_full.build_flags}
 
 [env:tasmota-zbbridge]
 build_flags             = ${common.build_flags} -DFIRMWARE_ZBBRIDGE
-board                   = esp8266_2M256
-board_build.f_cpu       = 160000000L
+board                   = esp8266_zbbridge
 lib_extra_dirs          = lib/lib_ssl
 
 [env:tasmota-zigbee]

From e28b36528a883f8433b37b1371cf19cd5213c970 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 18 Jun 2021 13:13:20 +0200
Subject: [PATCH 3/3] Update platformio_override_sample.ini

---
 platformio_override_sample.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 69f2a7bed..4d72d8541 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -11,7 +11,6 @@
 [platformio]
 ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run
 ;core_dir = .platformio
-; Custom config Zigbee [env] -> platformio_tasmota_cenv_example.ini
 extra_configs = platformio_tasmota_cenv.ini
 
 ; *** Build/upload environment