Fix board macros for Arduino framework

ivankravets · ivankravets · commit 23d85b0d73d6 · 2019-03-05T12:21:38.000+02:00
diff --git a/boards/d1.json b/boards/d1.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_WEMOS_D1MINI",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WEMOS_D1R1",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
@@ -17,7 +17,7 @@
     "esp8266-rtos-sdk",
     "esp8266-nonos-sdk"
   ],
-  "name": "WEMOS D1 R1 (Retired)",
+  "name": "WEMOS D1 R1",
   "upload": {
     "maximum_ram_size": 81920,
     "maximum_size": 4194304,
diff --git a/boards/d1_mini.json b/boards/d1_mini.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_WEMOS_D1MINI",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WEMOS_D1MINI",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
diff --git a/boards/d1_mini_lite.json b/boards/d1_mini_lite.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_WEMOS_D1MINI -DESP8266_WEMOS_D1MINILITE",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WEMOS_D1MINILITE",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
diff --git a/boards/d1_mini_pro.json b/boards/d1_mini_pro.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_WEMOS_D1MINIPRO",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WEMOS_D1MINIPRO",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
diff --git a/boards/esp8285.json b/boards/esp8285.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_ESP01",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dout",
diff --git a/boards/espectro.json b/boards/espectro.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESPECTRO",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESPECTRO_CORE",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
diff --git a/boards/oak.json b/boards/oak.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_OAK",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_OAK",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
diff --git a/boards/phoenix_v1.json b/boards/phoenix_v1.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_PHOENIX_V1",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_PHOENIX_V1",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
diff --git a/boards/phoenix_v2.json b/boards/phoenix_v2.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_PHOENIX_V2",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_PHOENIX_V2",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
diff --git a/boards/wifinfo.json b/boards/wifinfo.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DWIFINFO",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WIFINFO",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",
diff --git a/boards/wio_link.json b/boards/wio_link.json
@@ -1,7 +1,7 @@
 {
   "build": {
     "core": "esp8266",
-    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_AMPERKA_WIFI_SLOT",
+    "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WIO_LINK",
     "f_cpu": "80000000L",
     "f_flash": "40000000L",
     "flash_mode": "qio",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"build": {`
`3`	`3`	`"core": "esp8266",`
`4`		`- "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DESP8266_WEMOS_D1MINI",`
	`4`	`+ "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_WEMOS_D1MINI",`
`5`	`5`	`"f_cpu": "80000000L",`
`6`	`6`	`"f_flash": "40000000L",`
`7`	`7`	`"flash_mode": "dio",`