summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ports/esp8266/Makefile2
-rw-r--r--ports/esp8266/boards/GENERIC/manifest.py19
-rw-r--r--ports/esp8266/boards/manifest_release.py23
3 files changed, 20 insertions, 24 deletions
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 38b91a545d..02ea05f76e 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -50,7 +50,7 @@ INC += -I$(ESP_SDK)/include
# UART for "os" messages. 0 is normal UART as used by MicroPython REPL,
# 1 is debug UART (tx only), -1 to disable.
-UART_OS = 0
+UART_OS = -1
CFLAGS_XTENSA = -fsingle-precision-constant -Wdouble-promotion \
-D__ets__ -DICACHE_FLASH \
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index 4e65b256f9..46f3b837be 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -1,2 +1,21 @@
+# base modules
include("$(PORT_DIR)/boards/manifest.py")
+
+# uasyncio
include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+
+# drivers
+freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
+
+# Libraries from micropython-lib, include only if the library directory exists
+if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
+ # file utilities
+ freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
+
+ # requests
+ freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
+ freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py")
+
+ # umqtt
+ freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
+ freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
diff --git a/ports/esp8266/boards/manifest_release.py b/ports/esp8266/boards/manifest_release.py
deleted file mode 100644
index 5a3194ae9b..0000000000
--- a/ports/esp8266/boards/manifest_release.py
+++ /dev/null
@@ -1,23 +0,0 @@
-include("manifest.py")
-
-# drivers
-freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
-
-# file utilities
-freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
-
-# requests
-freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
-freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py")
-
-# umqtt with examples
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
-freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "example_pub_button.py")
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "example_sub_led.py")
-
-# HTTP examples
-freeze("$(MPY_DIR)/examples/network", "http_client.py")
-freeze("$(MPY_DIR)/examples/network", "http_client_ssl.py")
-freeze("$(MPY_DIR)/examples/network", "http_server.py")
-freeze("$(MPY_DIR)/examples/network", "http_server_ssl.py")