Skip to content

Commit

Permalink
ports: Use micropython-lib version of drivers in manifests.
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmo committed Sep 8, 2022
1 parent aeff691 commit d84c6ef
Show file tree
Hide file tree
Showing 19 changed files with 48 additions and 46 deletions.
3 changes: 1 addition & 2 deletions ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include("$(PORT_DIR)/boards/manifest.py")
freeze("modules")

include("$(MPY_DIR)/drivers/display", ssd1306=True)
require("ssd1306")
3 changes: 1 addition & 2 deletions ports/esp32/boards/LOLIN_S2_PICO/manifest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include("$(PORT_DIR)/boards/manifest.py")
freeze("./modules")

include("$(MPY_DIR)/drivers/display", ssd1306=True)
require("ssd1306")
17 changes: 9 additions & 8 deletions ports/esp32/boards/manifest.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
freeze("$(PORT_DIR)/modules")
module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/drivers/neopixel")
include("$(MPY_DIR)/extmod/uasyncio")
include("$(MPY_DIR)/extmod/webrepl")

# Require some micropython-lib modules.
require("urequests")
require("upysh")
require("umqtt.simple")
require("dht")
require("ds18x20")
require("neopixel")
require("ntptime")
require("onewire")
require("umqtt.robust")
require("umqtt.simple")
require("upysh")
require("urequests")
require("webrepl")
2 changes: 1 addition & 1 deletion ports/esp8266/boards/GENERIC/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
include("$(MPY_DIR)/extmod/uasyncio")

# drivers
include("$(MPY_DIR)/drivers/display", ssd1306=True)
require("ssd1306")

# micropython-lib: file utilities
require("upysh")
Expand Down
11 changes: 6 additions & 5 deletions ports/esp8266/boards/GENERIC_512K/manifest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module("_boot.py", opt=3)
module("apa102.py", base_path="$(PORT_DIR)/modules", opt=3)
module("port_diag.py", base_path="$(PORT_DIR)/modules", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/webrepl")
include("$(MPY_DIR)/drivers/neopixel")
require("ntptime")
require("dht")
require("onewire")
require("ds18x20")
require("webrepl")
require("neopixel")
11 changes: 6 additions & 5 deletions ports/esp8266/boards/manifest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
freeze("$(PORT_DIR)/modules")
module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/extmod/webrepl")
include("$(MPY_DIR)/drivers/neopixel")
require("ntptime")
require("dht")
require("onewire")
require("ds18x20")
require("neopixel")
require("webrepl")
5 changes: 3 additions & 2 deletions ports/mimxrt/boards/manifest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
freeze("$(PORT_DIR)/modules")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/extmod/uasyncio")
require("onewire")
require("ds18x20")
require("dht")
6 changes: 3 additions & 3 deletions ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("$(PORT_DIR)/modules/manifest.py")
include("$(MPY_DIR)/drivers/hts221")
include("$(MPY_DIR)/drivers/lps22h")
include("$(MPY_DIR)/drivers/lsm9ds1")
require("hts221")
require("lps22h")
require("lsm9ds1")
2 changes: 1 addition & 1 deletion ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# We do not want to include default frozen modules,
include("$(MPY_DIR)/drivers/sdcard")
require("sdcard")
2 changes: 1 addition & 1 deletion ports/renesas-ra/boards/RA4M1_EK/manifest.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# We do not want to include default frozen modules,
include("$(MPY_DIR)/drivers/sdcard")
require("sdcard")
6 changes: 3 additions & 3 deletions ports/renesas-ra/boards/manifest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("$(MPY_DIR)/extmod/uasyncio")
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
include("$(MPY_DIR)/drivers/sdcard")
require("dht")
require("onewire")
require("sdcard")
4 changes: 2 additions & 2 deletions ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
include("$(PORT_DIR)/boards/manifest.py")

# Networking
include("$(MPY_DIR)/extmod/webrepl")
require("webrepl")
require("urequests")

# Drivers
include("$(MPY_DIR)/drivers/lsm6dsox")
require("lsm6dsox")

# Bluetooth
require("aioble", client=True, central=True, l2cap=True, security=True)
2 changes: 1 addition & 1 deletion ports/rp2/boards/PICO_W/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)

require("ntptime")
require("urequests")
7 changes: 4 additions & 3 deletions ports/rp2/boards/manifest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
freeze("$(PORT_DIR)/modules")
include("$(MPY_DIR)/drivers/onewire")
include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/extmod/uasyncio")
include("$(MPY_DIR)/drivers/neopixel")
require("onewire")
require("ds18x20")
require("dht")
require("neopixel")
2 changes: 1 addition & 1 deletion ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include("$(PORT_DIR)/boards/manifest.py")
include("$(MPY_DIR)/extmod/webrepl")
require("webrepl")
require("aioble", client=True, central=True, l2cap=True, security=True)
3 changes: 1 addition & 2 deletions ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# Note: Freezes to display.ssd1306, so must use deprecated "freeze" function.
freeze("$(MPY_DIR)/drivers/", ("display/ssd1306.py"))
require("ssd1306")
2 changes: 1 addition & 1 deletion ports/stm32/boards/PYBD_SF2/manifest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include("$(PORT_DIR)/boards/manifest.py")
include("$(PORT_DIR)/boards/manifest_pyboard.py")
include("$(MPY_DIR)/extmod/webrepl")
require("webrepl")
4 changes: 2 additions & 2 deletions ports/stm32/boards/manifest.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include("$(MPY_DIR)/extmod/uasyncio")

include("$(MPY_DIR)/drivers/dht")
include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
require("dht")
require("onewire")
2 changes: 1 addition & 1 deletion ports/stm32/boards/manifest_pyboard.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include("$(MPY_DIR)/drivers/display", lcd160cr=True)
require("lcd160cr")

0 comments on commit d84c6ef

Please sign in to comment.