diff options
Diffstat (limited to 'esp8266/modules')
| -rw-r--r-- | esp8266/modules/ds18x20.py | 7 | ||||
| -rw-r--r-- | esp8266/modules/flashbdev.py | 2 | ||||
| -rw-r--r-- | esp8266/modules/onewire.py | 1 | ||||
| l--------- | esp8266/modules/upip.py | 1 | ||||
| l--------- | esp8266/modules/upip_utarfile.py | 1 | ||||
| -rw-r--r-- | esp8266/modules/webrepl.py | 14 | ||||
| -rw-r--r-- | esp8266/modules/webrepl_setup.py | 166 |
7 files changed, 115 insertions, 77 deletions
diff --git a/esp8266/modules/ds18x20.py b/esp8266/modules/ds18x20.py index eb22e2ae3..bf0609483 100644 --- a/esp8266/modules/ds18x20.py +++ b/esp8266/modules/ds18x20.py @@ -1,6 +1,8 @@ # DS18x20 temperature sensor driver for MicroPython. # MIT license; Copyright (c) 2016 Damien P. George +from micropython import const + _CONVERT = const(0x44) _RD_SCRATCH = const(0xbe) _WR_SCRATCH = const(0x4e) @@ -43,4 +45,7 @@ class DS18X20: t = buf[0] >> 1 return t - 0.25 + (buf[7] - buf[6]) / buf[7] else: - return (buf[1] << 8 | buf[0]) / 16 + t = buf[1] << 8 | buf[0] + if t & 0x8000: # sign bit set + t = -((t ^ 0xffff) + 1) + return t / 16 diff --git a/esp8266/modules/flashbdev.py b/esp8266/modules/flashbdev.py index 98b0208fb..e879895fb 100644 --- a/esp8266/modules/flashbdev.py +++ b/esp8266/modules/flashbdev.py @@ -3,7 +3,7 @@ import esp class FlashBdev: SEC_SIZE = 4096 - START_SEC = 0x90000 // SEC_SIZE + START_SEC = esp.flash_user_start() // SEC_SIZE NUM_BLK = 0x6b def __init__(self, blocks=NUM_BLK): diff --git a/esp8266/modules/onewire.py b/esp8266/modules/onewire.py index 06b216a57..83318d1a4 100644 --- a/esp8266/modules/onewire.py +++ b/esp8266/modules/onewire.py @@ -1,6 +1,7 @@ # 1-Wire driver for MicroPython on ESP8266 # MIT license; Copyright (c) 2016 Damien P. George +from micropython import const import _onewire as _ow class OneWireError(Exception): diff --git a/esp8266/modules/upip.py b/esp8266/modules/upip.py new file mode 120000 index 000000000..20d52a4ab --- /dev/null +++ b/esp8266/modules/upip.py @@ -0,0 +1 @@ +../../tools/upip.py
\ No newline at end of file diff --git a/esp8266/modules/upip_utarfile.py b/esp8266/modules/upip_utarfile.py new file mode 120000 index 000000000..149886291 --- /dev/null +++ b/esp8266/modules/upip_utarfile.py @@ -0,0 +1 @@ +../../tools/upip_utarfile.py
\ No newline at end of file diff --git a/esp8266/modules/webrepl.py b/esp8266/modules/webrepl.py index da3e70c59..5a76e9b26 100644 --- a/esp8266/modules/webrepl.py +++ b/esp8266/modules/webrepl.py @@ -31,6 +31,10 @@ def setup_conn(port, accept_handler): def accept_conn(listen_sock): global client_s cl, remote_addr = listen_sock.accept() + if uos.dupterm(): + print("\nConcurrent WebREPL connection from", remote_addr, "rejected") + cl.close() + return print("\nWebREPL connection from:", remote_addr) client_s = cl websocket_helper.server_handshake(cl) @@ -55,18 +59,16 @@ def start(port=8266, password=None): stop() if password is None: try: - import port_config - _webrepl.password(port_config.WEBREPL_PASS) + import webrepl_cfg + _webrepl.password(webrepl_cfg.PASS) setup_conn(port, accept_conn) print("Started webrepl in normal mode") except: - import webrepl_setup - setup_conn(port, webrepl_setup.handle_conn) - print("Started webrepl in setup mode") + print("WebREPL is not configured, run 'import webrepl_setup'") else: _webrepl.password(password) setup_conn(port, accept_conn) - print("Started webrepl in normal mode") + print("Started webrepl in manual override mode") def start_foreground(port=8266): diff --git a/esp8266/modules/webrepl_setup.py b/esp8266/modules/webrepl_setup.py index d0bf8465d..d91600e6e 100644 --- a/esp8266/modules/webrepl_setup.py +++ b/esp8266/modules/webrepl_setup.py @@ -1,83 +1,111 @@ import sys -import socket -import time +#import uos as os +import os +import machine -from websocket import * -import websocket_helper +RC = "./boot.py" +CONFIG = "./webrepl_cfg.py" - -def setup_server(): - s = socket.socket() - s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - - ai = socket.getaddrinfo("0.0.0.0", 8266) - addr = ai[0][4] - - s.bind(addr) - s.listen(1) - return s - -def getpass(stream, prompt): - stream.write(prompt) - passwd = b"" +def input_choice(prompt, choices): while 1: - c = stream.read(1) - if c in (b"\r", b"\n"): - stream.write("\r\n") - return passwd - passwd += c - stream.write("*") - -def handle_conn(listen_sock): - cl, remote_addr = listen_sock.accept() - - print(""" - -First-time WebREPL connection has been received. WebREPL initial setup -will now start over this connection. During setup, UART REPL will be -non-responsive. After setup finishes, the board will be rebooted. In -case of error during setup, current session will continue. - -If you receive this message unexpectedly, it may mean that your WebREPL -connection is being hacked (power off board if unsure). -""") - - websocket_helper.server_handshake(cl) - ws = websocket(cl) - - ws.write("""\ -Welcome to MicroPython WebREPL!\r -\r -This is the first time you connect to WebREPL, so please set a password\r -to use for the following WebREPL sessions. Once you enter the password\r -twice, your board will reboot with WebREPL running in active mode. On\r -some boards, you may need to press reset button or reconnect power.\r -\r -""") + resp = input(prompt) + if resp in choices: + return resp +def getpass(prompt): + return input(prompt) + +def input_pass(): while 1: - passwd1 = getpass(ws, "New password: ") + passwd1 = getpass("New password: ") if len(passwd1) < 4: - ws.write("Password too short\r\n") + print("Password too short") continue elif len(passwd1) > 9: - ws.write("Password too long\r\n") + print("Password too long") continue - passwd2 = getpass(ws, "Confirm password: ") + passwd2 = getpass("Confirm password: ") if passwd1 == passwd2: - break - ws.write("Passwords do not match\r\n") - - with open("port_config.py", "w") as f: - f.write("WEBREPL_PASS = %r\n" % passwd1.decode("ascii")) + return passwd1 + print("Passwords do not match") - ws.write("Password successfully set, restarting...\r\n") - cl.close() - time.sleep(2) - import machine - machine.reset() +def exists(fname): + try: + with open(fname): + pass + return True + except OSError: + return False -def test(): - s = setup_server() - handle_conn(s) +def copy_stream(s_in, s_out): + buf = bytearray(64) + while 1: + sz = s_in.readinto(buf) + s_out.write(buf, sz) + + +def get_daemon_status(): + with open(RC) as f: + for l in f: + if "webrepl" in l: + if l.startswith("#"): + return False + return True + return None + +def add_daemon(): + with open(RC) as old_f, open(RC + ".tmp", "w") as new_f: + new_f.write("import webrepl\nwebrepl.start()\n") + copy_stream(old_f, new_f) + +def change_daemon(action): + LINES = ("import webrepl", "webrepl.start()") + with open(RC) as old_f, open(RC + ".tmp", "w") as new_f: + for l in old_f: + for patt in LINES: + if patt in l: + if action and l.startswith("#"): + l = l[1:] + elif not action and not l.startswith("#"): + l = "#" + l + new_f.write(l) + # FatFs rename() is not POSIX compliant, will raise OSError if + # dest file exists. + os.remove(RC) + os.rename(RC + ".tmp", RC) + + +def main(): + status = get_daemon_status() + + print("WebREPL daemon auto-start status:", "enabled" if status else "disabled") + print("\nWould you like to (E)nable or (D)isable it running on boot?") + print("(Empty line to quit)") + resp = input("> ").upper() + + if resp == "E": + if exists(CONFIG): + resp2 = input_choice("Would you like to change WebREPL password? (y/n) ", ("y", "n", "")) + else: + print("To enable WebREPL, you must set password for it") + resp2 = "y" + + if resp2 == "y": + passwd = input_pass() + with open(CONFIG, "w") as f: + f.write("PASS = %r\n" % passwd) + + + if resp not in ("D", "E") or (resp == "D" and not status) or (resp == "E" and status): + print("No further action required") + sys.exit() + + change_daemon(resp == "E") + + print("Changes will be activated after reboot") + resp = input_choice("Would you like to reboot now? (y/n) ", ("y", "n", "")) + if resp == "y": + machine.reset() + +main() |