Skip to content

Commit 7ce1e0b

Browse files
jimmodpgeorge
authored andcommitted
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.
1 parent 7f235cb commit 7ce1e0b

File tree

6 files changed

+6
-3
lines changed

6 files changed

+6
-3
lines changed

extmod/webrepl/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
freeze('.', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',))

ports/esp8266/modules/webrepl.py renamed to extmod/webrepl/webrepl.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ def accept_conn(listen_sock):
4343
ws = uwebsocket.websocket(cl, True)
4444
ws = _webrepl._webrepl(ws)
4545
cl.setblocking(False)
46-
# notify REPL on socket incoming data
47-
cl.setsockopt(socket.SOL_SOCKET, 20, uos.dupterm_notify)
46+
# notify REPL on socket incoming data (ESP32/ESP8266-only)
47+
if hasattr(uos, 'dupterm_notify'):
48+
cl.setsockopt(socket.SOL_SOCKET, 20, uos.dupterm_notify)
4849
uos.dupterm(ws)
4950

5051

ports/esp32/boards/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
freeze('$(PORT_DIR)/modules')
22
freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py'))
33
freeze('$(MPY_DIR)/ports/esp8266/modules', 'ntptime.py')
4-
freeze('$(MPY_DIR)/ports/esp8266/modules', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',))
54
freeze('$(MPY_DIR)/drivers/dht', 'dht.py')
65
freeze('$(MPY_DIR)/drivers/onewire')
6+
include('$(MPY_DIR)/extmod/webrepl/manifest.py')

ports/esp8266/boards/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py'))
33
freeze('$(MPY_DIR)/drivers/dht', 'dht.py')
44
freeze('$(MPY_DIR)/drivers/onewire')
5+
include('$(MPY_DIR)/extmod/webrepl/manifest.py')

0 commit comments

Comments
 (0)