diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2019-10-21 15:55:18 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-12-20 12:59:13 +1100 |
| commit | 7ce1e0b1dc466e48606164aad223c81c93a9cea2 (patch) | |
| tree | 7ee755742cb06393c13b420610525b85b77f10aa | |
| parent | 7f235cbee924305e2d8a8aa86876770af66d7d82 (diff) | |
| download | micropython-7ce1e0b1dc466e48606164aad223c81c93a9cea2.tar.gz micropython-7ce1e0b1dc466e48606164aad223c81c93a9cea2.zip | |
extmod/webrepl: Move webrepl scripts to common place and use manifest.
Move webrepl support code from ports/esp8266/modules into extmod/webrepl
(to be alongside extmod/modwebrepl.c), and use frozen manifests to include
it in the build on esp8266 and esp32.
A small modification is made to webrepl.py to make it work on non-ESP
ports, i.e. don't call dupterm_notify if not available.
| -rw-r--r-- | extmod/webrepl/manifest.py | 1 | ||||
| -rw-r--r-- | extmod/webrepl/webrepl.py (renamed from ports/esp8266/modules/webrepl.py) | 5 | ||||
| -rw-r--r-- | extmod/webrepl/webrepl_setup.py (renamed from ports/esp8266/modules/webrepl_setup.py) | 0 | ||||
| -rw-r--r-- | extmod/webrepl/websocket_helper.py (renamed from ports/esp8266/modules/websocket_helper.py) | 0 | ||||
| -rw-r--r-- | ports/esp32/boards/manifest.py | 2 | ||||
| -rw-r--r-- | ports/esp8266/boards/manifest.py | 1 |
6 files changed, 6 insertions, 3 deletions
diff --git a/extmod/webrepl/manifest.py b/extmod/webrepl/manifest.py new file mode 100644 index 0000000000..0f2b440058 --- /dev/null +++ b/extmod/webrepl/manifest.py @@ -0,0 +1 @@ +freeze('.', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',)) diff --git a/ports/esp8266/modules/webrepl.py b/extmod/webrepl/webrepl.py index bbf8bdb320..24c63299d5 100644 --- a/ports/esp8266/modules/webrepl.py +++ b/extmod/webrepl/webrepl.py @@ -43,8 +43,9 @@ def accept_conn(listen_sock): ws = uwebsocket.websocket(cl, True) ws = _webrepl._webrepl(ws) cl.setblocking(False) - # notify REPL on socket incoming data - cl.setsockopt(socket.SOL_SOCKET, 20, uos.dupterm_notify) + # notify REPL on socket incoming data (ESP32/ESP8266-only) + if hasattr(uos, 'dupterm_notify'): + cl.setsockopt(socket.SOL_SOCKET, 20, uos.dupterm_notify) uos.dupterm(ws) diff --git a/ports/esp8266/modules/webrepl_setup.py b/extmod/webrepl/webrepl_setup.py index 129313a21c..129313a21c 100644 --- a/ports/esp8266/modules/webrepl_setup.py +++ b/extmod/webrepl/webrepl_setup.py diff --git a/ports/esp8266/modules/websocket_helper.py b/extmod/webrepl/websocket_helper.py index 9c06db5023..9c06db5023 100644 --- a/ports/esp8266/modules/websocket_helper.py +++ b/extmod/webrepl/websocket_helper.py diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py index 2b07639ee9..bab2b614ba 100644 --- a/ports/esp32/boards/manifest.py +++ b/ports/esp32/boards/manifest.py @@ -1,6 +1,6 @@ freeze('$(PORT_DIR)/modules') freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py')) freeze('$(MPY_DIR)/ports/esp8266/modules', 'ntptime.py') -freeze('$(MPY_DIR)/ports/esp8266/modules', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',)) freeze('$(MPY_DIR)/drivers/dht', 'dht.py') freeze('$(MPY_DIR)/drivers/onewire') +include('$(MPY_DIR)/extmod/webrepl/manifest.py') diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py index 779e840880..b6df53fc64 100644 --- a/ports/esp8266/boards/manifest.py +++ b/ports/esp8266/boards/manifest.py @@ -2,3 +2,4 @@ freeze('$(PORT_DIR)/modules') freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py')) freeze('$(MPY_DIR)/drivers/dht', 'dht.py') freeze('$(MPY_DIR)/drivers/onewire') +include('$(MPY_DIR)/extmod/webrepl/manifest.py') |