Merge remote-tracking branch 'origin/dev-esp32' into matrix-keyboard

nodemcu · Apr 17, 2024 · ba990c8 · ba990c8
2 parents c3300a8 + bc3b31f
commit ba990c8
Show file tree

Hide file tree

Showing 15 changed files with 955 additions and 90 deletions.
diff --git a/components/lua/lua-5.3/ldebug.c b/components/lua/lua-5.3/ldebug.c
@@ -132,10 +132,11 @@ static const char *upvalname (Proto *p, int uv) {
 
 static const char *findvararg (CallInfo *ci, int n, StkId *pos) {
   int nparams = getnumparams(clLvalue(ci->func)->p);
-  if (n >= cast_int(ci->u.l.base - ci->func) - nparams)
+  int nvararg = cast_int(ci->u.l.base - ci->func) - nparams;
+  if (n <= -nvararg)
     return NULL;  /* no such vararg */
   else {
-    *pos = ci->func + nparams + n;
+    *pos = ci->func + nparams - n;
     return "(*vararg)";  /* generic name for any vararg */
   }
 }
@@ -147,7 +148,7 @@ static const char *findlocal (lua_State *L, CallInfo *ci, int n,
   StkId base;
   if (isLua(ci)) {
     if (n < 0)  /* access to vararg values? */
-      return findvararg(ci, -n, pos);
+      return findvararg(ci, n, pos);
     else {
       base = ci->u.l.base;
       name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci));

diff --git a/components/modules/CMakeLists.txt b/components/modules/CMakeLists.txt
@@ -8,6 +8,7 @@ set(module_srcs
   "dht.c"
   "encoder.c"
   "eromfs.c"
+  "espnow.c"
   "file.c"
   "gpio.c"
   "heaptrace.c"

diff --git a/components/modules/Kconfig b/components/modules/Kconfig
@@ -82,6 +82,12 @@ menu "NodeMCU modules"
             store the directory path as part of the filename just as SPIFFS
             does.
 
+    config NODEMCU_CMODULE_ESPNOW
+        bool "ESP-NOW module"
+        default "n"
+        help
+            Includes the espnow module.
+
     config NODEMCU_CMODULE_ETH
         depends on IDF_TARGET_ESP32
         select ETH_USE_ESP32_EMAC