You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/10/23 17:13:32 UTC
[incubator-nuttx-apps] branch master updated (9ba5c86bc -> 5862b9d15)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
from 9ba5c86bc README.md: remove inaccessible links
new 7c8f0e41f Revert "Revert "include/canutils/lely: fix file path in comment header""
new 513662732 Revert "Revert "system/libuv: minor style fixes in Makefile""
new 7bf9025f2 Revert "Revert "system/spi: improve alignment in array initialization""
new ec1c5f927 Revert "Revert "nshlib: fix possible out of bounds array access""
new 9368b659a Revert "Revert "examples/timer_gpio: fix initialization of timer notification""
new 0fe45a4c7 Revert "Revert "examples/foc: fix description in Kconfig""
new 5862b9d15 netutils/thttpd: remove MIN and MAX definitions from libhttpd.c
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
examples/ajoystick/ajoy_main.c | 1 +
examples/djoystick/djoy_main.c | 1 +
examples/foc/Kconfig | 2 +-
examples/nunchuck/nunchuck_main.c | 1 +
examples/timer_gpio/timer_gpio_main.c | 1 +
examples/zerocross/zerocross_main.c | 1 +
include/canutils/lely/config.h | 8 ++++----
netutils/thttpd/libhttpd.c | 8 --------
netutils/thttpd/libhttpd.h | 2 ++
nshlib/nsh_fsutils.c | 1 -
system/libuv/Makefile | 5 ++---
system/spi/spi_main.c | 2 +-
12 files changed, 15 insertions(+), 18 deletions(-)
[incubator-nuttx-apps] 06/07: Revert "Revert "examples/foc: fix description in Kconfig""
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 0fe45a4c7320207da0d578197ae139518e367149
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Oct 23 12:08:16 2022 +0200
Revert "Revert "examples/foc: fix description in Kconfig""
This reverts commit 1a18703a42784b38c9b8de170399536713eb9daa.
---
examples/foc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/foc/Kconfig b/examples/foc/Kconfig
index 2b193df9b..c3a1066c1 100644
--- a/examples/foc/Kconfig
+++ b/examples/foc/Kconfig
@@ -128,7 +128,7 @@ config EXAMPLES_FOC_QENCO_DEVPATH
default "/dev/qe"
---help---
The default path to the qenco device without the device minor number.
- Default: /dev/qenco
+ Default: /dev/qe
endif # EXAMPLES_FOC_HAVE_QENCO
[incubator-nuttx-apps] 02/07: Revert "Revert "system/libuv: minor style fixes in Makefile""
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 513662732d060b2094e67edb4190a5edcd7853e6
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Oct 23 12:07:06 2022 +0200
Revert "Revert "system/libuv: minor style fixes in Makefile""
This reverts commit f613d0549690156f0fa386ba32382218adae9afc.
---
system/libuv/Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/system/libuv/Makefile b/system/libuv/Makefile
index 515632f72..e20fb6c24 100644
--- a/system/libuv/Makefile
+++ b/system/libuv/Makefile
@@ -25,7 +25,7 @@ LIBUV_PATCHS ?= $(sort $(wildcard 000*.patch))
LIBUV_VERSION = 1.42.0
LIBUV_UNPACK = libuv
LIBUV_TARBALL = v$(LIBUV_VERSION).zip
-LIBUV_URL_BASE = https://github.com/libuv/libuv/archive/refs/tags/
+LIBUV_URL_BASE = https://github.com/libuv/libuv/archive/refs/tags
LIBUV_URL = $(LIBUV_URL_BASE)/$(LIBUV_TARBALL)
@@ -38,8 +38,7 @@ $(LIBUV_UNPACK): $(LIBUV_TARBALL)
$(call DELDIR, $(LIBUV_UNPACK))
$(Q) unzip $(LIBUV_TARBALL)
$(Q) mv libuv-$(LIBUV_VERSION) $(LIBUV_UNPACK)
- $(Q) cat $(LIBUV_PATCHS) | \
- patch -s -N -d $(LIBUV_UNPACK) -p1
+ $(Q) cat $(LIBUV_PATCHS) | patch -s -N -d $(LIBUV_UNPACK) -p1
$(LIBUV_UNPACK)/.patch: $(LIBUV_UNPACK)
$(Q) touch $(LIBUV_UNPACK)/.patch
[incubator-nuttx-apps] 05/07: Revert "Revert "examples/timer_gpio: fix initialization of timer notification""
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 9368b659a763faa4e45b657ea71922b651751aa5
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Oct 23 12:08:03 2022 +0200
Revert "Revert "examples/timer_gpio: fix initialization of timer notification""
This reverts commit 539b7363d08efcd37c0677ec62832d4e604e5050.
---
examples/timer_gpio/timer_gpio_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/examples/timer_gpio/timer_gpio_main.c b/examples/timer_gpio/timer_gpio_main.c
index a38e5acb1..315963aa2 100644
--- a/examples/timer_gpio/timer_gpio_main.c
+++ b/examples/timer_gpio/timer_gpio_main.c
@@ -182,6 +182,7 @@ static int timer_gpio_daemon(int argc, char *argv[])
notify.event.sigev_notify = SIGEV_SIGNAL;
notify.event.sigev_signo = CONFIG_EXAMPLES_TIMER_GPIO_SIGNO;
notify.event.sigev_value.sival_ptr = NULL;
+ notify.oneshot = false;
ret = ioctl(fd_timer, TCIOC_NOTIFICATION,
(unsigned long)((uintptr_t)¬ify));
[incubator-nuttx-apps] 03/07: Revert "Revert "system/spi: improve alignment in array initialization""
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 7bf9025f28c68d0cdab67a0429c24f718ef5ff59
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Oct 23 12:07:18 2022 +0200
Revert "Revert "system/spi: improve alignment in array initialization""
This reverts commit a7567ce7b63b3d3dc3c3c3cb30e7387e38d65266.
---
system/spi/spi_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/spi/spi_main.c b/system/spi/spi_main.c
index 63aa45d62..b9a698142 100644
--- a/system/spi/spi_main.c
+++ b/system/spi/spi_main.c
@@ -55,7 +55,7 @@ static const struct cmdmap_s g_spicmds[] =
{
{ "?", spicmd_help, "Show help ", NULL },
{ "bus", spicmd_bus, "List buses ", NULL },
- { "exch", spicmd_exch, "SPI Exchange ", "[OPTIONS] [<hex senddata>]" },
+ { "exch", spicmd_exch, "SPI Exchange ", "[OPTIONS] [<hex senddata>]" },
{ "help", spicmd_help, "Show help ", NULL },
{ NULL, NULL, NULL, NULL }
};
[incubator-nuttx-apps] 04/07: Revert "Revert "nshlib: fix possible out of bounds array access""
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit ec1c5f92739e8ec15751cfb04be11c057a96e594
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Oct 23 12:07:54 2022 +0200
Revert "Revert "nshlib: fix possible out of bounds array access""
This reverts commit fe4b44e3ff27220b4f1abf5d46cdc29dc1afa64d.
---
nshlib/nsh_fsutils.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/nshlib/nsh_fsutils.c b/nshlib/nsh_fsutils.c
index 2f88549c5..c9b50710c 100644
--- a/nshlib/nsh_fsutils.c
+++ b/nshlib/nsh_fsutils.c
@@ -513,7 +513,6 @@ FAR char *nsh_getdirpath(FAR struct nsh_vtbl_s *vtbl,
snprintf(vtbl->iobuffer, IOBUFFERSIZE, "%s/%s", dirpath, path);
}
- vtbl->iobuffer[PATH_MAX] = '\0';
return strdup(vtbl->iobuffer);
}
#endif
[incubator-nuttx-apps] 07/07: netutils/thttpd: remove MIN and MAX definitions from libhttpd.c
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 5862b9d15cbaf570a2e8166b440bb0044f45c443
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Oct 23 12:09:04 2022 +0200
netutils/thttpd: remove MIN and MAX definitions from libhttpd.c
This reverts commit e12d48f0d240edbd6934aac373242fe6b9b9aad2.
---
examples/ajoystick/ajoy_main.c | 1 +
examples/djoystick/djoy_main.c | 1 +
examples/nunchuck/nunchuck_main.c | 1 +
examples/zerocross/zerocross_main.c | 1 +
netutils/thttpd/libhttpd.c | 8 --------
netutils/thttpd/libhttpd.h | 2 ++
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c
index 398a787a9..c421328a4 100644
--- a/examples/ajoystick/ajoy_main.c
+++ b/examples/ajoystick/ajoy_main.c
@@ -59,6 +59,7 @@
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
+
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c
index 39f809782..54d72d9e1 100644
--- a/examples/djoystick/djoy_main.c
+++ b/examples/djoystick/djoy_main.c
@@ -56,6 +56,7 @@
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
+
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
diff --git a/examples/nunchuck/nunchuck_main.c b/examples/nunchuck/nunchuck_main.c
index 2e28ebbc7..c0e1a2059 100644
--- a/examples/nunchuck/nunchuck_main.c
+++ b/examples/nunchuck/nunchuck_main.c
@@ -55,6 +55,7 @@
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
+
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c
index a7dc72b56..c96f8b24b 100644
--- a/examples/zerocross/zerocross_main.c
+++ b/examples/zerocross/zerocross_main.c
@@ -56,6 +56,7 @@
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
+
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 30ea11411..7e31d2cbf 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -92,14 +92,6 @@
extern CODE char *crypt(const char *key, const char *setting);
-#ifndef MAX
-# define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-# define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
/* Conditional macro to allow two alternate forms for use in the built-in
* error pages. If EXPLICIT_ERROR_PAGES is defined, the second and more
* explicit error form is used; otherwise, the first and more generic
diff --git a/netutils/thttpd/libhttpd.h b/netutils/thttpd/libhttpd.h
index fd0e657e8..a4e7f38b6 100644
--- a/netutils/thttpd/libhttpd.h
+++ b/netutils/thttpd/libhttpd.h
@@ -55,6 +55,7 @@
#include <time.h>
#include "config.h"
+
#ifdef CONFIG_THTTPD
/****************************************************************************
@@ -66,6 +67,7 @@
#ifndef MAX
# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
+
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
[incubator-nuttx-apps] 01/07: Revert "Revert "include/canutils/lely: fix file path in comment header""
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 7c8f0e41fc2ade4a57ef3e0788e9002d0c3e4f62
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Sun Oct 23 12:06:52 2022 +0200
Revert "Revert "include/canutils/lely: fix file path in comment header""
This reverts commit 8e1ee24f9e345874702229e39f1b0aae657dba9a.
---
include/canutils/lely/config.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/canutils/lely/config.h b/include/canutils/lely/config.h
index b6cfee4cc..339a953ee 100644
--- a/include/canutils/lely/config.h
+++ b/include/canutils/lely/config.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/canutils/lely/config.h
+ * apps/include/canutils/lely/config.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __CANUTILS_LELY_CONFIG_H
-#define __CANUTILS_LELY_CONFIG_H
+#ifndef __APPS_INCLUDE_CANUTILS_LELY_CONFIG_H
+#define __APPS_INCLUDE_CANUTILS_LELY_CONFIG_H
/****************************************************************************
* Included Files
@@ -275,4 +275,4 @@
# define LELY_NO_CO_COAPP_SLAVE 1
#endif
-#endif /* __CANUTILS_LELY_CONFIG_H */
+#endif /* __APPS_INCLUDE_CANUTILS_LELY_CONFIG_H */