8000 Add ESP32 port by dpgeorge · Pull Request #3461 · micropython/micropython · GitHub
[go: up one dir, main page]
Skip to content

Add ESP32 port #3461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 20 commits into from
Dec 13, 2017
Merged

Add ESP32 port #3461

merged 20 commits into from
Dec 13, 2017

Conversation

dpgeorge
Copy link
Member

This PR merges the development of the ESP32 port of MicroPython into this main repository. The ESP32 port has been, for its initial stages, separately developed over the past year in the repository found at https://github.com/micropython/micropython-esp32 . In that time the port has matured enough and gained enough interest that I consider it ready to be pulled into this repository and for work on the port to continue here.

The plan is for the original repository to remain for historical purposes, and the only activity there will be to discuss and close existing issues.

Not all of the git history of the initial development of the ESP32 port has been kept in the PR here. There were roughly 250 commits and many of the early ones were back-and-forth commits to get things working. The first commit in this PR contains the first 216 original commits squashed together, with a large comment detailing who commited what. The main reason to squash at that point was because it was just after the code was moved from the directory esp32/ to the directory ports/esp32/. Keeping commits earlier than that would have resulting in a much messier PR. In the squashed commit I've aimed (in the commit message there) to give proper credit to those who contributed. If full traceability of this code is needed then one can look through the original repository.

Comments are welcome! In particular @nickzoic @MrSurly I'd appreciate if you could comment on the way this merge is constructed, if you think it's the right way to do it or not. Thanks!

@hoihu
Copy link
Contributor
hoihu commented Nov 30, 2017

excellent news! 👍

Looking forward to the merge. Thanks to all the contributors for their hard work on this port.

@MrSurly
Copy link
Contributor
MrSurly commented Nov 30, 2017

Yay!

@MrSurly
Copy link
Contributor
MrSurly commented Nov 30, 2017

What about current active PRs? Some of them have been open a long time (*cough* deepsleep *cough*), and if ESP32 marches forward in a different repo, synchronization can become difficult. Will mainline ESP32 changes be merged back into micropython-esp32 until outstanding PRs/ issues are resolved?

@dpgeorge
Copy link
Member Author
dpgeorge commented Dec 1, 2017

What about current active PRs? ... Will mainline ESP32 changes be merged back into micropython-esp32 until outstanding PRs/ issues are resolved?

I'd rather shift all code development to this repo, and freeze micropython-esp32, if possible. That said, it's not too difficult to just mirror all commits made here into that repo (by simply merging upstream, ie micropython into micropython-esp32).

It's possible to merge PRs from the micropython-esp32 repo into this repo. They are after all just diffs/patch files.

For people who have a fork of micropython-esp32 with custom branches and commits it would be recommended to move those branches and commits to a fork of this repo (eg using git format-patch and git am).

@dpgeorge dpgeorge mentioned this pull request Dec 1, 2017
Closed
@dpgeorge
Copy link
Member Author
dpgeorge commented Dec 1, 2017

That said, it's not too difficult to just mirror all commits made here into that repo (by simply merging upstream, ie micropython into micropython-esp32).

Actually, it's probably a good idea to do this for a fixed "deprecation" period, to help those who have forked micropython-esp32 to migrate to this repo. In that case, micropython-esp32 will continue to evolve as though nothing had changed. The only difference would be that commits in that repo would be all coming from a merge of upstream, rather than being original ones.

@nickzoic
Copy link
Contributor
nickzoic commented Dec 1, 2017

Wow, okay, cool. I'll have a look at this when I'm back from BuzzConf, probably Tuesday.

@0x1abin
Copy link
0x1abin commented Dec 6, 2017

Exciting!

@jeremyherbert
Copy link
Contributor

I gave this a run through tonight, worked great! One thing though: it's not 100% clear to me why ESPIDF env variable is needed, given that the espressif tools setup documentation asks you to set the variable IDF_PATH instead. Perhaps if ESPIDF is unset it should default to the value of IDF_PATH?

Also, fwiw, the ESP32 examples use make flash to program the chip rather than make deploy. Perhaps flash could be added as an alias for deploy?

@MrSurly
Copy link
Contributor
MrSurly commented Dec 11, 2017

Also, fwiw, the ESP32 examples use make flash to program the chip rather than make deploy. Perhaps flash could be added as an alias for deploy?

I'm doing both MP and "pure" ESP-IDF projects, and I second this. Also, maybe pick up IDF_PATH if ESPIDF isn't set. Same with erase_flash --> erase. And finally, even add a monitor target, which I'm finding really handy when doing ESP-IDF projects, though I do miss the picocom CTRL-A, CTRL-P sequence to reset the chip.

@jeremyherbert
Copy link
Contributor

I have found a new issue with this tonight, I flashed the image on a never used device (although I did run erase first) and I tried to use the code in the readme to connect to wifi (the wlan_connect function). However, I get the following error:

E (634409) wifi: invalid magic number 1, call WIFI_INIT_CONFIG_DEFAULT to init config
E (634409) wifi: wifi_init 1395 ret=258
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "<stdin>", line 3, in wlan_connect
OSError: Wifi Invalid Argument

I'm not exactly sure what this means, but I will try to look into it when I can.

@jeremyherbert
Copy link
Contributor

Ok this is an oops on my part: micropython/micropython-esp32#163

@jeremyherbert
Copy link
Contributor

Ok, another issue. When using ampy or something similar, it only works the very first time after reset.

On further investigation in a serial terminal, CTRL+A enters raw REPL, but CTRL+B doesn't exit it. The ESP32 doesn't respond when connecting to a serial terminal after running ampy once.

@jeremyherbert
Copy link
Contributor

Appears to fail only on a revision 0 chip. Revision 1 works fine.

@robert-hh
Copy link
Contributor
robert-hh commented Dec 12, 2017 •
edited
Loading

@MrSurly IDF_PATH is used by the pycom branch, which has its own tailored copy of the esp idf. If you use both variants, then having two names for the two esp idf trees is helpful.
@jeremyherbert With respect to Ctrl-A/Ctrl-B handling, I experience no difference between a revision 0 and revision 1 device.

@MrSurly
Copy link
Contributor
MrSurly commented Dec 12, 2017

IDF_PATH is used by the pycom branch, which has its own tailored copy of the esp idf. If you use both variants, then having two names for the two esp idf trees is helpful.

Sure, but if only one is set, why not just use whichever is set?

@nickzoic
Copy link
Contributor
nickzoic commented Dec 12, 2017 via email

dpgeorge and others added 13 commits December 13, 2017 14:48
@dpgeorge
py/builtinimport: Call __init__ for modules imported via a weak link.
f1c9e77 
This is a bit of a clumsy way of doing it but solves the issue of __init__
not running when a module is imported via its weak-link name.  Ideally a
better solution would be found.
@dpgeorge
esp32: Add new port to Espressif ESP32 SoC.
bc08c88 
This commit is a combination of 216 commits from the initial stages of
development of this port, up to and including the point where the code was
moved to the ports/esp32 directory.  These commits were mostly concerned
with setting up the build system and getting a reliable port working with
basic features.  The following is a digest of the original commits in their
original order (most recent listed first), grouped where possible per
author.  The list is here to give credit for the work and provide some
level of traceability and accountability.  For the full history of
development please consult the original repository.

All code is MIT licensed and the relevant copyright holders are listed in
the comment-header of each file.

Damien George <damien.p.george@gmail.com>
  esp32: Update to latest ESP IDF.
  esp32: Update module symlinks now that code lives under the ports dir.
  esp32: Update to compile with new ports/esp32 directory structure.
  esp32: Move it to the ports/ directory.
  esp32/machine_uart: Don't save baudrate but compute it instead.
  esp32/modsocket: Add socket.readinto() method.
  esp32/modesp: Add esp.gpio_matrix_in and esp.gpio_matrix_out functions.
  esp32/machine_uart: Wait for all data to be tx'd before changing config.

NyxCode <moritz.bischof1@gmail.com>
  esp32: Add note to README.md about updating the submodules of ESP IDF.

Anthony Briggs <anthony.briggs@gmail.com>
  esp32: Update README.md installation and flashing instructions.

Javier Candeira <javier@candeira.com>
  esp32: Raise error when setting input-only pin to output.

  With help from Adrian Smith (fon@thefon.net)

Javier Candeira <javier@candeira.com>
  esp32: Replace exception raising with corresponding mp_raise_XXX funcs.

Tisham Dhar <whatnickd@gmail.com>
  esp32: Add some specific notes about building on Windows using WSL.

Ben Gamari <ben@smart-cactus.org>
  esp32: Provide machine.Signal class.

Damien George <damien.p.george@gmail.com>
  esp32/modnetwork: Implement AP version of network.isconnected().

Eric Poulsen <eric@zyxod.com>
  esp32/README.md: Add note about btree submodule initialization.

Damien George <damien.p.george@gmail.com>
  esp32: Make firmware.bin start at 0x1000 to allow flash size autodetect.
  esp32: Changes to follow latest version of upstream uPy.
  esp32/Makefile: Separate ESP-specific inc dirs to avoid header clashes.
  esp32: Enable "btree" database module.
  esp32: Update to latest ESP IDF.

Roosted7 <thomasroos@live.nl>
  esp32: Update to latest ESP-IDF.

Alex King <alex_w_king@yahoo.com>
  esp32/machine_timer: Add support for esp32 hardware timer.

  Code lineage:
  Timer() is based loosely on the version in esp8266, although the
  implementation is differs significantly because of the change in
  the underlying platform.

Damien George <damien.p.george@gmail.com>
  esp32/machine_uart: Increase UART TX buffer size to 64.
  esp32/modules: Update dht symlink.
  esp32/mpconfigport.h: Enable utimeq module, needed for uasyncio.
  esp32: Changes to follow latest version of upstream uPy.
  esp32: Update to latest ESP-IDF.
  esp32/machine_uart: Add uart.any() method.
  esp32/machine_uart: Uninstall the UART driver before installing it.

Thomas Roos <mail@thomasroos.nl>
  esp32: Update to latest ESP-IDF.

Eric Poulsen <eric@zyxod.com>
  esp32/modsocket: Make read/write return None when in non-blocking mode.
  esp32/modsocket.c: Fix send/sendto/write for non-blocking sockets.

Odd Stråbø <oddstr13@openshell.no>
  esp32: Initial working implementation of machine.UART.

  Code lineage (as seen by previous commits): I copied the ESP8266 code,
  renamed pyb -> machine, and used esp-idf as a reference while implementing
  minimal functionality.  I provide all of my changes under the MIT license.

Odd Stråbø <oddstr13@openshell.no>
  esp32/machine_uart: Rename pyb to machine.
  esp32: Copy machine_uart.c from esp8266 port.

Damien George <damien.p.george@gmail.com>
  esp32/moduos: Add uos.ilistdir() function.
  esp32: Mount filesystem at the root of the VFS, following esp8266.

Andy Valencia <vandyswa@gmail.com>
  esp32: Add hardware SHA1/SHA256 support via mbedtls API.

  Code lineage: a copy of extmod/moduhashlib with the API invocation details
  edited.  Total derivative work.

Andy Valencia <vandyswa@gmail.com>
  esp32: Add PWM support via machine.PWM class.

  Code lineage:
  I started by copying the esp8266 machine_pwm.c. I used information from the
  ESP32 Technical Reference Manual, the esp-idf documentation, and the SDK's
  sample ledc example code (but I did not copy that code, just studied it to
  understand the SDK's API for PWM). So aside from the code copied from the
  esp8266 PWM support, everything else you see is just new code I wrote.

  I wasn't an employee of anybody when I wrote it, and I wrote it with the
  understanding and intention that it's simply a derivative work of the
  existing micropython code. I freely and willingly contribute it to the
  project and intend that it not change the legal status of the micropython
  code base in any way, even if it is included in that base in whole or part.

Damien George <damien.p.george@gmail.com>
  esp32/modules: Add symlinks for upysh and upip.

Eric Poulsen <eric@zyxod.com>
  esp32/modmachine: Add unique_id() function to machine module.

Damien George <damien.p.george@gmail.com>
  esp32: Change dac_out_voltage to dac_output_voltage for new IDF API.
  esp32: Update esp32.custom_common.ld to align with changes in ESP IDF.

Eric Poulsen <eric@zyxod.com>
  esp32: Update to latest ESP IDF.

Damien George <damien.p.george@gmail.com>
  esp32/modsocket: When resolving IP addr handle the case of host=''.
  esp32: Update to latest ESP IDF.

Eric Poulsen <eric@zyxod.com>
  esp32/Makefile: Change default FLASH_MODE to dio for WROOM-32 module.
  esp32: Move FAT FS to start at 0x200000 and increase size to 2MiB.

Damien George <damien.p.george@gmail.com>
  esp32: Remove enable_irq/disable_irq and use ATOMIC_SECTION instead.
  esp32/mpconfigport.h: Provide ATOMIC_SECTION macros.
  esp32/main: Restart the MCU if there is a failed NLR jump.

Daniel Campora <daniel@pycom.io>
  esp32: Enable threading; be sure to exit GIL when a thread will block.
  esp32: Trace the registers when doing a gc collect. Also make it thread ready.
  esp32: Add threading implementation, disabled for the time being.

Damien George <damien.p.george@gmail.com>
  esp32: Update to latest ESP IDF.
  esp32/uart: Use high-level function to install UART0 RX ISR handler.
  esp32/Makefile: Make FreeRTOS private include dir really private.

Eric Poulsen <eric@zyxod.com>
  esp32: Add support for hardware SPI peripheral (block 1 and 2).

Sergio Conde Gómez <skgsergio@gmail.com>
  esp32/modules/inisetup.py: Mount filesystem at /flash like ESP8266

Damien George <damien.p.george@gmail.com>
  esp32: Convert to use core-provided KeyboardInterrupt exception.
  esp32: Pump the event loop while waiting for rx-chr or delay_ms.
  esp32: Implement Pin.irq() using "soft" scheduled interrupts.
  esp32: Update to latest ESP IDF version.

Eric Poulsen <eric@zyxod.com>
  esp32/README: Add troubleshooting section to the end.

tyggerjai <tyggerjai@gmail.com>
  esp32: Add support for WS2812 and APA106 RGB LEDs.

Damien George <damien.p.george@gmail.com>
  esp32: Add makeimg.py script to build full firmware; use it in Makefile.
  esp32/modsocket: Make socket.read return when socket closes.
  esp32/modsocket: Initialise the timeout on an accepted socket.
  esp32/mphalport: Provide proper implementations of disable_/enable_irq.
  esp32/modmachine: Add disable_irq/enable_irq functions.

Nick Moore <nick@zoic.org>
  esp32/modsocket.c: add comment explaining timeout behaviour
  esp32/modsocket.c: clean up send methods for retries too
  esp32/modsocket.c: sockets always nonblocking, accept timeout in modsocket
  esp32: Update to latest ESP IDF version.
  esp32/modsocket.c: remove MSG_PEEK workaround on select ioctl.
  esp32/modsocket.c: Initialize tcp when modsocket loads.

Damien George <damien.p.george@gmail.com>
  esp32/main: Bump heap size from 64k to 96k.
  esp32/modutime: Add time.time() function.
  esp32/modsocket: Convert lwip errnos to uPy ones.
  esp32/modules: Provide symlink to ds18x20 module.
  esp32: Add support for onewire protocol via OneWire module.
  esp32: Add support for DHT11 and DHT22 sensors.
  esp32/mphalport: Improve delay and ticks functions.
  esp32: Update to latest ESP IDF.
  esp32/modules: Provide symlink to urequests from micropython-lib.
  esp32: Populate sys.path.

Nick Moore <nick@zoic.org>
  esp32/machine_dac.c: implement DAC pins as well
  esp32/machine_adc.c: also machine.ADC
  esp32/machine_touchpad.c: add support for touchpad

Damien George <damien.p.george@gmail.com>
  esp32/README: Add hint about using GNUmakefile on case-insensitive FS.
  esp32/mpconfigport.h: Enable maximum speed software SPI.
  esp32: Provide improved version of mp_hal_delay_us_fast.
  esp32/mpconfigport.h: Enable MICROPY_PY_BUILTINS_POW3 option.
  esp32: Update to latest ESP IDF.
  esp32: Convert to use new oofatfs library and generic VFS sub-system.
  esp32: Enable help('modules') to list builtin modules.
  esp32: Convert to use new builtin help function.

Aaron Kelly <AaronKelly@email.com>
  esp32/README: Add comment about ESP-IDF version

Damien George <damien.p.george@gmail.com>
  esp32: Consistently use size_t instead of mp_uint_t.
  esp32: Change "Micro Python" to "MicroPython" in license comments.
  esp32/Makefile: Use -C argument to git instead of cd'ing.
  esp32/help: Add section to help about using the network module.
  esp32/README: Add section about configuring and using an ESP32 board.
  esp32/README: Remove paragraph about buggy toolchain, it's now fixed.
  esp32/modnetwork: Change network init logging from info to debug.
  esp32/modnetwork: Don't start AP automatically when init'ing wifi.
  esp32/modsocket: Implement socket.setsockopt, to support SO_REUSEADDR.
  esp32: Update to latest ESP IDF.
  esp32/sdkconfig.h: Remove unused CONFIG_ESPTOOLPY_xxx config settings.
  esp32/modsocket: Add support for DGRAM and RAW, and sendto/recvfrom.
  esp32/modsocket: Fix return value of "port" in socket.accept.
  esp32/modsocket: Make socket.recv take exactly 2 args.
  esp32: Enable ussl module, using mbedtls component from ESP IDF.
  esp32/modsocket: Rename "socket" module to "usocket".
  esp32/sdkconfig: Increase max number of open sockets from 4 to 8.
  esp32/modsocket: Add error checking for creating and closing sockets.
  esp32/modsocket: Use _r (re-entrant) versions of LWIP socket API funcs.
  esp32/modsocket: Raise an exception if socket.connect did not succeed.
  esp32/modsocket: Make socket.accept return a tuple: (client, addr).
  esp32/modsocket: Use m_new_obj_with_finaliser instead of calloc.
  esp32/Makefile: Add check for IDF version, and warn if not supported.
  esp32/esp32.custom_common.ld: Update to follow changes in IDF.
  esp32: Update to latest ESP IDF.

nubcore <x@nubcore.com>
  esp32: add #define CONFIG_ESP32_WIFI_RX_BUFFER_NUM 25

Nick Moore <nick@zoic.org>
  esp32/modsocket.c: add in sendall and makefile methods #10
  esp32/modsocket.c: fixups for #10
  esp32/modsocket.c: fix copyright, socket_recv gets param and exception
  esp32/modnetwork.c: fix copyright, network.active param to bool

Damien George <damien.p.george@gmail.com>
  esp32/modnetwork: Implement wlan.isconnected() method.
  esp32/modnetwork: Add initial implementation of wlan.config().
  esp32/modnetwork: Simplify event_handler messages.

Nick Moore <nick@zoic.org>
  esp32/modsocket.c: support for ioctl, settimeout, setblocking, getaddrinfo

Damien George <damien.p.george@gmail.com>
  esp32/README: Add comment about FLASH_MODE being dio.
  esp32: Update to latest ESP IDF.
  esp32/modnetwork: Remove unnecessary indirection variable for scan list.
  esp32/modnetwork: Check that STA is active before trying to scan.
  esp32/mphalport: Replace portTICK_RATE_MS with portTICK_PERIOD_MS.
  esp32/README: Add comment about using $(HOME) in makefile.
  esp32/modnetwork: Use memset instead of bzero, the latter is deprecated.
  esp32/modnetwork: Improve error handling when STA is connecting to AP.
  esp32/Makefile: Use tab instead of spaces, and use shorter variable.

Nick Moore <nick@zoic.org>
  esp32/modsocket.c: AF_*, SOCK_* and IPPROTO_* constants
  esp32/modsocket.c: socket.settimeout implementation

Damien George <damien.p.george@gmail.com>
  esp32/Makefile: Update to latest ESP IDF.

Nick Moore <nick@zoic.org>
  esp32/modsocket.c: use mp streams for sockets
  esp32: network.WLAN.ifconfig based on esp8266 version
  esp32: Fix up exception handling
  esp32: sketchy modsocket ... revisit this once modnetwork is sorted
  esp32: First cut at modnetwork, manually rebased from prev. version

Damien George <damien.p.george@gmail.com>
  esp32/help: Update help text.
  esp32: Add info about Microbric Pty Ltd being the sponsor of this port.
  esp32: Add README.md file.
  esp32/mpconfigport.h: Add weak links to many of the builtin modules.
  esp32: Enable soft implementation of machine.SPI class.
  esp32/Makefile: Simplify APP_LD_ARGS by using OBJ variable.
  esp32/Makefile: Reorganise Makefile and add some comments.
  esp32/Makefile: Clean up CFLAGS for ESP IDF components.
  esp32/Makefile: Tidy up names of ESP IDF components, to match dir name.
  esp32/Makefile: Define and use ESPCOMP variable.
  esp32: Update to latest ESP IDF.
  esp32/main: Enable filesystem support.
  esp32: Use custom ld script to ensure correct code get placed in iram.
  esp32: Update to latest ESP IDF.
  esp32/main: Pin the uPy task to core 0.
  esp32: Update to use latest ESP IDF.
  esp32: Disable boot-up scripts, spi_flash_erase_sector no longer works.
  esp32: Add scripts to init and mount filesystem.
  esp32: Enable frozen bytecode, with scripts stored in "modules/" dir.
  esp32/modesp: Increase flash_user_start position to 1Mbyte.
  esp32/Makefile: Add "erase" target for convenient erasure.
  esp32/sdkconfig: Reorder config settings to put common things together.
  esp32/sdkconfig: Change to use single core only.
  esp32: Add esp module.
  esp32/uart.c: Make sure uart ISR handler is all in iram.
  esp32/main.c: Use ESP_TASK_PRIO_MIN + 1 for mp_task's priority.
  esp32/Makefile: Use only bare-minimum flags when compiling .S files.
  esp32/Makefile: Rename "firmware" to "application".
  esp32: Update ESP IDF version.
  esp32/Makefile: Add declarations to build bootloader and partitions.
  esp32/Makefile: When deploying, write the application last.
  esp32/Makefile: Use $(INC) variable instead of listing include dirs.
  esp32/Makefile: Use locally built versions of freertos and newlib libs.
  esp32: Add low-level uart handler with ISR and ringbuf for stdin.
  esp32: Add machine.idle() function.
  esp32: Add machine.I2C class.
  esp32: Enable machine.time_pulse_us.
  esp32: Add initial implementation of machine.Pin class.
  esp32: Prepare main.c for using xTaskCreateStatic.
  esp32: Clean up mphalport.h.
  esp32: Add initial uos module.
  esp32: Clean up mpconfigport.h, enable more features.
  esp32: Use new reset function.
  esp32: Update to latest ESP IDF.
  esp32: Add idf-version target to Makefile, to track IDF commit.
  esp32: Initial port to ESP32.
@dpgeorge
esp32/modnetwork: Give better error msgs for AP timeout and not-found.
bfc9845
@Timmenem @dpgeorge
esp32/modsocket: Implement setsockopt(IP_ADD_MEMBERSHIP).
6cc716c 
Allows to join multicast groups.
@nickzoic @dpgeorge
esp32/mpconfigport.h: Add missing uhashlib.
b74809c
@MrSurly @dpgeorge
esp32/mphalport.h: Make mp_hal_pin_<dir> select gpio on the pad.
5adc133 
Otherwise interfaces like software I2C and SPI don't initialise correctly.
@nickzoic @dpgeorge
esp32: Call initialization function on sha1 and sha256.
5f8ad60 
Add in calls to mbedtls_sha1_starts() and mbedtls_sha256_starts().
@MrSurly @dpgeorge
esp32: Implement machine.WDT() class.
31747fe
@dpgeorge
esp32/README: Update general description of port to add avail features.
ba2d960
@nickzoic @dpgeorge
esp32/modutime.c: Add localtime and mktime functions.
f0628f5
@dpgeorge
esp32/machine_pwm: Always set the channel in the PWM object.
a5808e2
@dpgeorge
48613b6 
This update requires the xtensa-esp32-elf to be upgraded to the latest
version, 1.22.0-73-ge28a011-5.2.0.
@dpgeorge
esp32/modules: Symlink in ntptime.py from esp8266/modules.
934abc9
MrSurly and others added 7 commits December 13, 2017 14:48
@MrSurly @dpgeorge
esp32/modnetwork.c: Fix for setting DNS with network.WLAN.ifconfig().
b0853b5 
When configuring a static set of values with ifconfig() the DNS was not
being set.  This patch fixes that, and additionally uses the tcpip_adapter
API to ensure it is thread safe.

Further discussion is here:
micropython/micropython-esp32#210
@dpgeorge
esp32/mpconfigport.h: Enable ussl finaliser.
1c52d3e
@dpgeorge
extmod/modussl_mbedtls: Clean up mbedtls state when error during setup.
7df2ebb 
Without this patch, if the SSL handshake fails (eg the connection was lost)
then the mbedtls state (memory) will never be freed.
@MrSurly @dpgeorge
esp32: Implement wired Ethernet via network.LAN().
29dd6a7 
Updates to Makefile, modnetwork.c, and addition of network_lan.c to
implement `network.LAN()` object for wired PHY objects.
@dpgeorge
esp32/mpconfigport.h: Enable websocket module.
9acd590
@ak15199 @dpgeorge
esp32/modesp: Add osdebug() function to disable or change IDF logging.
78302f7 
Code lineage:
osdebug() is based loosely on the version in esp8266, but there didn't
seem to be an obvious way of choosing a particular UART. The basic
behavior is the same, though: provide None, and logging is disabled;
provide an integer and logging is restored to the default level.

To build on that, and because the IDF provides more functionality, a
second parameter has now been implemented which allows the active log
level to be set:

   esp.osdebug(uart[, level])

The module has a corresponding set of LOG_ values to set this accordingly.
@dpgeorge
esp32/Makefile: Support using IDF_PATH as the env var to the IDF source.
0593d6f
@dpgeorge dpgeorge force-pushed the esp32-rebased-cleaned branch from 8c2d04e to 0593d6f Compare December 13, 2017 03:57
@dpgeorge dpgeorge merged commit 0593d6f into micropython:master Dec 13, 2017
@dpgeorge
Copy link
Member Author

Ok, it's merged! Thanks everyone for the feedback.

@dpgeorge dpgeorge deleted the esp32-rebased-cleaned branch December 13, 2017 04:21
@dpgeorge
Copy link
Member Author

Perhaps if ESPIDF is unset it should default to the value of IDF_PATH?

Good idea @jeremyherbert . I implemented that in 0593d6f

Same with erase_flash --> erase. And finally, even add a monitor target, which I'm finding really handy when doing ESP-IDF projects

It's easy to add these locally to your own makefile/GNUmakefile, but if you think they useful to have (eg monitor would be a good addition) then please make a PR for it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@dpgeorge @hoihu @MrSurly @nickzoic @0x1abin @jeremyherbert @robert-hh @Timmenem @ak15199
0