Commit Graph

304 Commits

Author SHA1 Message Date
Philip Gladstone 4d24232105 Notify seems to work now. 2022-01-07 20:59:38 -05:00
Philip Gladstone adc188b4b1 Merge remote-tracking branch 'origin/dev-esp32-idf4' into ble 2022-01-07 21:12:10 +00:00
Christoph Thelen 8b1ef35b66
Consider RMT channel limitations at allocation time. (#3481)
* Consider RMT channel limitations at allocation time.

The ESP32-C3 is limited to TX on channel 0-1 and RX on channel 2-3.
2022-01-07 14:50:28 +11:00
Philip Gladstone 7aa22335ac Add support for notify (untested) 2022-01-06 02:10:53 +00:00
Johny Mattsson 6e63264963
Support interface-specific hostname on ethernet interface. (#3487) 2022-01-02 13:31:58 +11:00
Johny Mattsson 4b4ce47ed1 Fix file listing on submounts. 2021-11-13 12:26:49 +11:00
Philip Gladstone 7e123b215e
Apply suggestions from code review
Fix capitalization of Bluetooth

Co-authored-by: Marcel Stör <marcelstoer@users.noreply.github.com>
2021-11-08 20:07:12 -05:00
Philip Gladstone 4109e3053f Prevent ble.shutdown() as it corrupts something... 2021-11-05 23:50:48 +00:00
Johny Mattsson a0c9085cca Make node.output() RTOS thread safe.
Also removed old, very unsafe node.osoutput(). We're now integrating cleanly
with the IDF/newlib way of redirecting stdout.

Added necessary depends in Kconfig to ensure VFS support is enabled, as
otherwise you'd only get a mysterious crash when attempting to enable
output redirection.
2021-11-04 22:24:01 +11:00
Johny Mattsson 9a2fb84512 Fix broken sjson module init. 2021-11-04 20:55:08 +11:00
Bernd Meyer 6db8c43480 Prevent memory leak in UART driver when message handling is slow 2021-11-04 20:54:56 +11:00
Philip Gladstone b5c4082988 Allow dynamic update of advertisements 2021-10-26 00:41:47 +00:00
Philip Gladstone 3f330273f3 See if this fixes the cross compiles 2021-10-24 19:15:29 +00:00
Philip Gladstone 7b6a85b931 Remove trailing spaces 2021-10-24 18:06:04 +00:00
Philip Gladstone 52562a6412 Got rid of the random printfs 2021-10-24 18:04:04 +00:00
Johny Mattsson 5c59c57a16 Implement tmr.wdclr() 2021-10-22 12:38:07 +11:00
Philip Gladstone 6b55c396b7 Merge remote-tracking branch 'origin/dev-esp32-idf4' into ble 2021-10-21 01:35:10 +00:00
Philip Gladstone d204d33d3d Use the hardware random number generator 2021-10-21 01:32:46 +00:00
Philip Gladstone 96993eff16 FIx the advertising start 2021-10-21 00:51:16 +00:00
Johny Mattsson a2ba49e36b Switch to IDF-provided VFS and standard `io` module.
The IDF-provided VFS resolves several issues:

 - The IDF components having a different view of the (virtual) file system
   compared to the Lua environment.

 - RTOS task/thread safety. Our legacy VFS was only ever safe to use
   from the LVM thread, which limited its usability. Upgrading it
   would have effectively required a reimplementation of the IDF VFS,
   which would have been a bigger task with larger on-going maintenance
   issues.

 - We're no longer needing to maintain our own SPIFFS component.

 - We're no longer needing to maintain our own FATFS component.

 - The legacy of the 8266's lack of standard C interface to the file system
   is no longer holding us back, meaning that we can use the standard
   Lua `io` module rather than the cobbled-together swiss army knife
   also known as the file module.

Of course, the downside is that we'll either have to declare a backwards
breakage in regard to the file module, or provide a Lua shim for the old
functions, where applicable.

Also included is some necessary integer type fixups in unrelated code,
which apparently had depended on some non-standard types in either the
SPIFFS or FATFS headers.

A memory leak issue in the sdmmc module was also found and fixed while
said module got switched over to the Espressif VFS.

Module documentation has been updated to match the new reality (and I
discovered in some places it wasn't even matching the old reality).
2021-10-20 21:49:11 +11:00
Philip Gladstone 28cb8981b2 Making progress on ble 2021-10-19 22:14:32 +00:00
Philip Gladstone e80361061c Now actually gets started 2021-10-19 00:54:01 +00:00
Philip Gladstone 69405ce183 Paritally working 2021-10-18 23:58:41 +00:00
Philip Gladstone 06becd1e8a Try and get shutdown to work 2021-10-18 02:22:10 +00:00
Philip Gladstone 0a4253aa91 Ensure that BT and STRUCT are enabled. Can't figure out how to enforce NIMBLE 2021-10-17 16:59:18 +00:00
Philip Gladstone f8709b9644 Fixed the docs and add support for advertising data 2021-10-17 16:05:21 +00:00
Philip Gladstone 4a55397778 Seems to sort of work. 2021-10-16 22:38:07 +00:00
Philip Gladstone 2cf72b4f8b It compiles!! 2021-10-16 20:05:33 +00:00
Marcel Stör 389c119a8b
Add http.put (#3462)
Replaces setpostdata() with setbody().
2021-10-05 13:33:27 +11:00
Johny Mattsson ea968de6f8 Fixup LROT_MASKs for all modules.
Search-and-replace considered harmful. I completely missed the need to
explicitly declare "fast" tag functions (__xyz) in the mask field to
LROT_BEGIN()/LROT_END() when I brought over the 5.1+5.3 support.
Without those flags set properly, the LVM doesn't even bother going
looking for those methods, which in this case led to garbage collection
not calling the __gc functions, among other horrible things.

Mea culpa.
2021-09-16 17:53:35 +10:00
Johny Mattsson 5e52a9e200 Added heaptrace module. 2021-09-16 13:54:55 +10:00
Johny Mattsson b84138595d Add eth.set_ip() functionality.
Effectively the esp_netif version of the recent tcpip_adapter based
support added on dev-esp32 in fa6fd1a41b.
2021-09-09 19:07:51 +10:00
Johny Mattsson 37f682dd70 More ethernet module fixes. 2021-09-09 19:05:48 +10:00
Johny Mattsson 6f31db5a8a Fix compile issue if ethernet support disabled. 2021-09-01 14:19:04 +10:00
Johny Mattsson 8f83693262 Announce Lua config options with version.
To make it possible to find the right build cross compiler to use with
any given firmware.
2021-08-30 17:55:45 +10:00
Johny Mattsson 4c21bd6b9a Fixed surplus newlines on output with Lua 5.1. 2021-08-30 17:54:23 +10:00
Johny Mattsson ba36857c50 Backwards compatibility for embedded LFS startup on 5.3 2021-08-30 17:37:35 +10:00
Johny Mattsson c6a2e99650 Make LFS flash sig config specific.
Loading an LFS from a different int/float combo build is bad, so let's not
allow it in the first place.
2021-08-30 16:51:48 +10:00
Johny Mattsson d66473aeeb Fix broken LFS loading in Lua 5.3.
Do not [lua_]assert() on things which have a side effect...
2021-08-30 16:49:23 +10:00
Johny Mattsson 185855b69a Brought over node.setonerror() functionality.
Now properly triggering restart on non-interactive errors.
2021-08-26 11:33:42 +10:00
Johny Mattsson dee19e2777 Fix broken embedded LFS image with 64bit values.
The marshalling code wasn't taking into account the changing size of
the TValue struct.
2021-08-25 18:59:15 +10:00
Johny Mattsson 0690a7d181 Make bit module handle 32/64bit integer configs. 2021-08-25 18:58:53 +10:00
Johny Mattsson cd585ae91c Support stripping debug info in Lua 5.1 luac_cross 2021-08-25 13:48:04 +10:00
Johny Mattsson 8e5ce49d19 Update to latest IDF master. 2021-08-24 10:24:49 +10:00
Johny Mattsson dc27e9f7cf Updated modules to comply with __ ordering in rom tables. 2021-08-24 09:56:20 +10:00
Johny Mattsson 93140a89a5 Swap to luaL_pcallx for C module callbacks.
Bring on that stacktracey goodness!
2021-08-24 00:11:31 +10:00
Johny Mattsson 46f5079a63 Fixed panic handling on REPL input.
The Lua debug module is mandatory now.
2021-08-23 23:32:13 +10:00
Johny Mattsson fbef7feae1 Discard old console driver.
The IDF provides all we need these days, and the old driver was just
needlessly conflicting with the IDF settings and setup.

This also simplifies our uart input path as we no longer need to
duplicate the raw byte handling for when "run_input" is false.
2021-08-23 23:00:54 +10:00
Johny Mattsson 3af14a367b Rework modules handling to support ESP32-S2/S3 too. 2021-08-22 21:25:24 +10:00
Johny Mattsson 17df207a5f Port Terry's Lua 5.1 + 5.3 work from the esp8266 branch.
Changes have been kept to a minimum, but a serious chunk of work was
needed to move from 8266isms to IDFisms.

Some things got refactored into components/lua/common, in particular
the LFS location awareness.

As part of this work I also evicted our partition table manipulation
code, as with the current IDF it kept breaking checksums and rendering
things unbootable, which is the opposite of helpful (which was the
original intent behind it).

The uart module got relocated from base_nodemcu to the modules component
properly, after I worked out how to force its inclusion using Kconfig alone.
2021-08-22 02:03:05 +10:00
Johny Mattsson f123d46209 Add ESP32C3 support/coexistence.
The uzlib and parts of Lua had to be switched over to use the
C standard int types, as their custom typedefs conflicted with
RISC-V toolchain provided typedefs.

UART console driver updated to do less direct register meddling
and use the IDF uart driver interface for setup. Still using our
own ISR rather than the default driver ISR. Down the line we
might want to investigate whether the IDF ISR would be a better
fit.

Lua C modules have been split into common and ESP32/ESP32-S
specific ones. In the future there might also be ESP32-C3
specific modules, which would go into components/modules-esp32c3
at that point.

Our old automatic fixup of flash size has been discarded as it
interferes with the checksumming done by the ROM loader and
results in unbootable systems. The IDF has already taken on
this work via the ESPTOOL_FLASHSIZE_DETECT option, which handles
this situation properly.
2021-08-11 17:32:47 +10:00
Johny Mattsson 7b028d5c5d Cleanup warnings for luac_cross. 2021-08-04 12:42:43 +10:00
Johny Mattsson bc7b923646 Code cleanup to sort out warnings.
I2S constants have changed; docs updated.
2021-07-29 13:47:45 +10:00
Johny Mattsson dff32e8902 WiFi module updates.
- Added support for WPA3
- Evicted left-over broken WiFi auto-reconnect
- Updated docs
2021-07-28 19:09:19 +10:00
Johny Mattsson bce134b510 Fixed incorrect event data in wifi.sta.on('got_ip') 2021-07-28 16:21:24 +10:00
Johny Mattsson 758291693c Support building without IPv6 enabled. 2021-07-28 16:21:16 +10:00
Johny Mattsson c8e1c44c0e Sort out task posting behaviour. 2021-07-26 15:36:57 +10:00
Johny Mattsson 06a0e3dc23 idf4: part 3.2 - fix bug in updated eth module
Updated docs to reflect new WiFi station connect behaviour.
2021-07-22 16:46:57 +10:00
Johny Mattsson 54a41149ea idf4: part 3.1 - sorting out the linker specifics
Now boots to the Lua prompt, and modules are included and findable.
2021-07-21 20:46:42 +10:00
Johny Mattsson bcaf98f8f0 idf4: part 2.2 - obligatory missed API call
Plus addressing some warnings.
2021-07-21 12:30:51 +10:00
Johny Mattsson d2f8121e22 idf4: part 2.2 - update wifi & eth modules to new APIs
Only compile-tested so far.

Of note is that the WiFi auto-connect (flag) functionality has been removed
from the IDF, and as a follow-on so has the "auto" field in the wifi config.

On the Ethernet side, support for the TLK110 PHY seems to have been removed,
but on the other hand there is now new support for several others.
2021-07-20 18:18:21 +10:00
Johny Mattsson 62b3d06020 idf4: part 2.1 - uplift to new esp_event system events
Some parts dry-coded in the disabled modules; to be fixed when sorting out
the deprecated/removed APIs used in said modules.

Still untested beyond compile/linking.
2021-07-19 17:23:38 +10:00
Johny Mattsson 6d243a0995 idf4: temporarily commenting out broken parts 2021-07-15 16:32:09 +10:00
Johny Mattsson 16ef39e255 idf4: overhaul to new build system, part 1 of 3
Yet to come:
  - part 2: dealing with deprecated and removed APIs
  - part 3: making it actually work again
2021-07-15 16:27:03 +10:00
Marcel Stör 3acb6b7c79
Add node.bootreason (#3413) 2021-04-02 08:03:17 +02:00
tomsci 6ba98f348d
Add uart.txflush() (#3390) 2021-02-14 08:43:20 +01:00
jmdasnoy fb12af06e7
Fix I2C timeout (#3377) 2021-01-22 13:01:21 +01:00
tomsci d5f0094576
Add node.sleep()(#3370)
Supporting wakeup from (non-EXT1) GPIO, UART, ULP, timer and touch
2021-01-17 09:00:12 +01:00
Kit Klein 830366188d
Add node.osoutput() method for ESP32 (#3363) 2021-01-05 12:34:35 +01:00
Kit Klein 1b77d5d3b5 ensure tmr ref is valid before cb occurs 2021-01-05 11:08:26 +00:00
Marcel Stör 7c07f91483 Reset user version values
Undos changes from #3135
2020-09-17 18:17:24 +02:00
Nathaniel Wesley Filardo dd3b217df2
Kconfig: rename LUA_MODULE_* to NODEMCU_CMODULE_* (#3135)
Using the NODEMCU_ namespace prefix makes it obvious that these are not
part of Lua proper (contrast, e.g., LUA_BUILTIN_STRING).  Using
"CMODULE" gives us room to differentiate between modules whose
implementation is in C and whose implemenation is in Lua ("LMODULE").

The ESP8266 branch can adopt the same convention when it moves to
Kconfig; see https://github.com/nodemcu/nodemcu-firmware/issues/3130
2020-08-23 22:49:18 +02:00
tomsci fa2348f36b
Support for GPIO wakeup in node.dsleep() (#3115) 2020-08-22 10:32:45 +02:00
David Thornley 7774b5fa30
Fix bthci compilation issue (#3201)
Manifests as multiple definition of esp_event_send during compilation, as bthci triggers inclusion of `event_loop.c`. Also improved lbth_init() to support BTDM or BLE_ONLY controller modes.
2020-08-03 13:39:42 +02:00
Javier Peletier 084d6cabc5
Add support for external modules (#3100) 2020-07-27 19:08:19 +02:00
Marcel Stör cd53865c78
Bump ESP-IDF to 3.3.2 LTS (#3196) 2020-07-08 08:46:16 +02:00
tomsci b8e8ffa53a
Expose gpio_set_drive_capability API to Lua (#3099) 2020-05-18 19:56:43 +02:00
Tom Sutcliffe b4c94fa8ae Correct level value in gpio.trig() callback (#2883) 2020-05-01 15:21:15 +01:00
tomsci f7b8cf018e
Unref gpio.trig callbacks when type=INTR_DISABLE (#3072)
Fixes #2880
2020-04-27 14:29:08 +02:00
f4grx bfd2259165 Avoid the use of invalid GPIOS when setting up a one-wire bus. (#2934)
Fixes #2933
2019-10-29 22:34:15 +01:00
John Lauer 9a5327cab1 Add touch sensor module (#2863)
* Touch module 1st checkin
* ESP32. Check-in 2 for Touch sensor module
* ESP32: Touch module. Sample Lua code.
* ESP32: Latest YouTube vid
* ESP32: Touch docs update
* Added opt_* methods for value retrieval
2019-10-27 19:49:56 +01:00
Johny Mattsson b0558d5bbe
Fix uart regressions & bugs (#2817)
* Fix uart regressions & bugs.

Using `uart.on()` with a search character was broken in that it did
not invoke the callback on a full UART buffer as documented. Logic reworked
to match docs again.

Fixed memory leak on `task_post()` failure (eep!).

Improved logic to attempt to coalesce input bytes to reduce the number of
`task_post()` slots used up by the platform uart.

Finally, added a semaphore to prevent the platform uart from overrunning
the `task_post()` slots all the time on high baud rates (e.g. 1mbit).
With the semaphore in there, the LVM RTOS task gets a chance to actually
process the received data and free up a `task_post()` slot or two.
The above mentioned read coalescing then allows the platform uart to
immediately catch up.

Also added an error log message if the `task_post()` actually does fail.

* Don't cache the uart delims.

Doing so makes reconfiguring those settings from within the callback not
take effect until the currently buffered bytes have been processed.
2019-10-13 09:49:44 +11:00
f4grx a4fa6c5cd3 Fix the ug8 and ucg modules broken by eaac369. (#2927) 2019-09-27 12:29:43 +10:00
Arnim Läuger d20778ed09
Support eth boards without power pin, extend docs (#2855)
* fix handling of optional power pin

* add init example for wESP32

* add example for eth.on()
2019-08-12 22:31:19 +02:00
Johny Mattsson eaac369dec
LFS support for ESP32 NodeMCU (#2801)
* Port LFS from ESP8266 to ESP32
2019-07-22 19:13:43 +10:00
Arnim Läuger 7cb61a27d2 Esp32 eth (#2820)
Ethernet module added.
2019-07-20 12:47:43 +10:00
Johny Mattsson d8131bc407 Minor esp32 fixes (#2837)
* Move task_post() into IRAM so it can be used by IRAM'd ISRs.

* Don't leave crud on stack on pcall error.
2019-07-19 21:16:46 +02:00
Johny Mattsson f44e6e9639 Fix net module data loss & RTOS task unsafety (#2829)
To avoid races between the lwIP callbacks (lwIP RTOS task) and the Lua
handlers (LVM RTOS task), the data flow and ownership has been simplified
and cleaned up.

lwIP callbacks now have no visibility of the userdata struct. They are
limited to creating small event objects and task_post()ing them over
to the LVM "thread", passing ownership in doing so. The shared identifier
then becomes the struct netconn*.

On the LVM side, we keep a linked list of active userdata objects. This
allows us to retrieve the correct userdata when we get an event with
a netconn pointer. Because this list is only ever used within the LVM
task, no locking is necessary.

The old approach of stashing a userdata pointer into the 'socket' field
on the netconn has been removed entirely, as this was both not
thread/RTOS-task safe, and also interfered with the IDFs internal use
of the socket field (even when using only the netconn layer). As an
added benefit, this removed the need for all the SYS_ARCH_PROTECT()
locking stuff.

The need to track receive events before the corresponding userdata object
has been established has been removed by virtue of not reordering the
"accept" and the "recv" events any more (previously accepts were posted
with medium priority, while the receives where high priority, leading
to the observed reordering and associated headaches).

The workaround for IDF issue 784 has been removed as it is now not needed
and is in fact directly harmful as it results in a double-free. Yay for
getting rid of old workarounds!

DNS resolution code paths were merged for the two instances of "socket"
initiated resolves (connect/dns functions).

Also fixed an instance of using a stack variable for receiving the resolved
IP address, with said variable going out of scope before the DNS resolution
necessarily completed (hello, memory corruption!).

Where possible, moved to use the Lua allocator rather than plain malloc.

Finally, the NodeMCU task posting mechanism got a polish and an adjustment.
Given all the Bad(tm) that tends to happen if something fails task posting,
I went through a couple of iterations on how to avoid that. Alas, the
preferred solution of blocking non-LVM RTOS tasks until a slot is free
turned out to not be viable, as this easily resulted in deadlocks with the
lwIP stack. After much deliberation I settled on increasing the number of
available queue slots for the task_post() mechanism, but in the interest
of user control also now made it user configurable via Kconfig.
2019-07-14 23:20:20 +02:00
Johny Mattsson c0145e03f9 Fix net module losing TCP data. (#2825)
The netbuf_data() function only returns data from the first pbuf in the
chain. We need to use netbuf_first() and netbuf_next() to walk the
pbuf chain and act on each in turn.
2019-07-11 09:43:25 +02:00
Johny Mattsson ca89bff073 OTA support for ESP32 (#2812)
* Implemented otaupgrade module.

* Added partition table example for otaupgrade.

* Copy-paste omission. Whoops.

* Updated otaupgrade docs after review.
2019-07-06 14:21:08 +02:00
Johny Mattsson e11087bfdf Improved crypto module for ESP32, now with HMAC (#2815)
* Leaner, meaner crypto module; now with HMAC

Based on my testing, mbedtls pulls in all its algorithm regardless of
whether the NodeMCU crypto module was using them or not. As such, the
space savings from omitting algorithms were only in the tens of bytes.

By switching to using the mbedtls generic message digest interface, the
crypto module itself could be shrunk in size and complexity. Despite
adding support for HMAC on all algorithms (plus including RIPEMD160),
this version is 330 bytes smaller.

* Updated crypto module docs.

* Removed superfluous brackets in crypto docs.

Copy-paste considered harmful... >.>
2019-07-04 23:24:59 +02:00
devsaurus 1f1eeaf358 fix unref default file descriptor while still in use 2019-07-03 23:54:08 +02:00
Johny Mattsson 51912d5505
Reworked linker magic to work with IDF 3.3 (#2805)
With the IDF asserting full control over the linker scripts and insisting on
the application description being the first entry in the .flash.rodata
section, or previous method of doing link-time arrays stopped working.
Why? Because the build patched in a SHA256 digest straight into our arrays.

With the limited language of the gcc linker scripts I could find no other
way of getting it in cleanly.

The IDF "linker fragments" support can not be made to work for our needs:
  - no support for setting alignment before including objects
  - no support for declaring symbols
  - no support for adding our terminating zeros
  - insists on grouping objects by lib rather than by declared grouping,
    which means we could at most have a single link-time-array using
    the IDF mechanism
  - also does not like underscores in section names, but that's just an
    annoyance

So, the least bad option that I could come up with was to use a project-wide
makefile snippet to add a target in-between the IDF's generation of the
esp32.project.ld file, and the linking of our NodeMCU.elf. In this target
we read in the esp32.project.ld linker script, check whether we have our
arrays in there, and if not rewrites the linker script.

Oh, and the esp32.project.ld file only came into existence on the IDF 3.3
branch, so I had to change up the IDF to the latest release/3.3 as well.
I would've preferred a stable tag, but the v3.3-beta3 had a really nasty
regression for us (can't add partition entry), so that was a no-go.
2019-06-22 12:05:34 +10:00
devsaurus 4c1d46c742 fix compile warnings for ipaddr_aton 2019-06-21 18:01:20 +02:00
John Lauer 8b9794b99d ESP32: Pulse counter module released (#2739)
* ESP32: Added pulsecnt module

The pulsecnt module let's you use the ESP32's pulse counter capabilities from Lua.

* ESP32: Pulsecnt module. Better/faster callback.

Reduced the amount of callback variables to speed things up and shift more logic to Lua than in the C code.

* ESP32: Completed docs for pulsecnt

* ESP32: Final release of pulsecnt

* ESP32: Production release of pulsecnt

* ESP32: Release (tweaked docs)

* ESP32: Pulse Counter Release. Cleaned up .gitignore

* ESP32: Pulse counter release (changed ch1 gpio to int to match ch0)
2019-06-12 22:34:24 +02:00
Skirmantas Lauzikas 6d0e45793f ESP32: Add option to set IP/dns config (#2560)
* ESP32: Add option to set IP/dns config

This commit adds support for setting:
* Hostname
* Static IP / Dns server (Sta mode)
* Changing AP network ip config
* Setting DNS server IP for DHCP

* ESP32: Documentation for setting IP/dns/hostname config

* Documented new functions
* sethostname() now returns true if success
2019-06-10 16:33:29 +02:00
devsaurus e30904b607 force common intr alloc flags for all platform components that use rmt
remove ESP_INTR_FLAG_IRAM to fix #2564
2019-05-31 23:34:15 +02:00
devsaurus 5faf76b762 update to u8g2 2.25.10
- new displays
- binding for updateDisplay() and updateDisplayArea()
- use user_ptr instead of hal workaround
2019-04-28 22:26:37 +02:00
devsaurus 8251d0ae6f fix ucg compile for u8g2 & !ucg 2019-04-28 16:18:43 +02:00
Javier Peletier d1eab2396c ESP32: remove use of luaM_free in file module (#2631)
* file: remove use of luaM_free

* added safe pushlstring function
2019-02-20 23:26:39 +01:00