You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by da...@apache.org on 2020/11/24 12:07:44 UTC
[incubator-nuttx-apps] branch master updated (99633ab -> 736a21f)
This is an automated email from the ASF dual-hosted git repository.
davids5 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 99633ab graphics/nxwm/src/ccalibration.cxx: Fix syslog formats
new 54d5def examples/chrono: Fix error: 'CONFIG_EXAMPLES_SLCD_DEVNAME' undeclared
new 736a21f examples/chrono: Rename button_daemon to chrono_daemon
The 2 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/chrono/chrono_main.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
[incubator-nuttx-apps] 01/02: examples/chrono: Fix error:
'CONFIG_EXAMPLES_SLCD_DEVNAME' undeclared
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davids5 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 54d5def4d589b1c698a644b18f153d74276f02f3
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Nov 24 16:21:59 2020 +0800
examples/chrono: Fix error: 'CONFIG_EXAMPLES_SLCD_DEVNAME' undeclared
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I04c09878ec55cbf910159ab84e0b402cc94dad9b
---
examples/chrono/chrono_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/chrono/chrono_main.c b/examples/chrono/chrono_main.c
index 557f45f..bfa0e17 100644
--- a/examples/chrono/chrono_main.c
+++ b/examples/chrono/chrono_main.c
@@ -334,7 +334,7 @@ int main(int argc, FAR char *argv[])
fd = open(SLCD_DEVNAME, O_RDWR);
if (fd < 0)
{
- printf("Failed to open %s: %d\n", CONFIG_EXAMPLES_SLCD_DEVNAME, errno);
+ printf("Failed to open %s: %d\n", SLCD_DEVNAME, errno);
goto errout;
}
[incubator-nuttx-apps] 02/02: examples/chrono: Rename button_daemon
to chrono_daemon
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davids5 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 736a21f0d5fa4250fb71380f859d0797d325fe6f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Nov 24 16:24:50 2020 +0800
examples/chrono: Rename button_daemon to chrono_daemon
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I1aaf0a6ec8466c35c96a35b30896def7917c8c03
---
examples/chrono/chrono_main.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/examples/chrono/chrono_main.c b/examples/chrono/chrono_main.c
index bfa0e17..f7b17b6 100644
--- a/examples/chrono/chrono_main.c
+++ b/examples/chrono/chrono_main.c
@@ -113,10 +113,10 @@ static struct slcd_chrono_s g_slcd;
****************************************************************************/
/****************************************************************************
- * Name: button_daemon
+ * Name: chrono_daemon
****************************************************************************/
-static int button_daemon(int argc, char *argv[])
+static int chrono_daemon(int argc, char *argv[])
{
FAR struct slcd_chrono_s *priv = &g_slcd;
struct btn_notify_s btnevents;
@@ -128,16 +128,16 @@ static int button_daemon(int argc, char *argv[])
UNUSED(i);
- printf("button_daemon: Running\n");
+ printf("chrono_daemon: Running\n");
/* Open the BUTTON driver */
- printf("button_daemon: Opening %s\n", BUTTON_DEVPATH);
+ printf("chrono_daemon: Opening %s\n", BUTTON_DEVPATH);
fd = open(BUTTON_DEVPATH, O_RDONLY | O_NONBLOCK);
if (fd < 0)
{
int errcode = errno;
- printf("button_daemon: ERROR: Failed to open %s: %d\n",
+ printf("chrono_daemon: ERROR: Failed to open %s: %d\n",
BUTTON_DEVPATH, errcode);
goto errout;
}
@@ -149,12 +149,12 @@ static int button_daemon(int argc, char *argv[])
if (ret < 0)
{
int errcode = errno;
- printf("button_daemon: ERROR: ioctl(BTNIOC_SUPPORTED) failed: %d\n",
+ printf("chrono_daemon: ERROR: ioctl(BTNIOC_SUPPORTED) failed: %d\n",
errcode);
goto errout_with_fd;
}
- printf("button_daemon: Supported BUTTONs 0x%02x\n",
+ printf("chrono_daemon: Supported BUTTONs 0x%02x\n",
(unsigned int)supported);
/* Define the notifications events */
@@ -172,7 +172,7 @@ static int button_daemon(int argc, char *argv[])
if (ret < 0)
{
int errcode = errno;
- printf("button_daemon: ERROR: ioctl(BTNIOC_SUPPORTED) failed: %d\n",
+ printf("chrono_daemon: ERROR: ioctl(BTNIOC_SUPPORTED) failed: %d\n",
errcode);
goto errout_with_fd;
}
@@ -192,7 +192,7 @@ static int button_daemon(int argc, char *argv[])
if (ret < 0)
{
int errcode = errno;
- printf("button_daemon: ERROR: sigwaitinfo() failed: %d\n",
+ printf("chrono_daemon: ERROR: sigwaitinfo() failed: %d\n",
errcode);
goto errout_with_fd;
}
@@ -219,7 +219,7 @@ errout_with_fd:
errout:
- printf("button_daemon: Terminating\n");
+ printf("chrono_daemon: Terminating\n");
return EXIT_FAILURE;
}
@@ -317,12 +317,12 @@ int main(int argc, FAR char *argv[])
/* Create a thread to wait for the button events */
- ret = task_create("button_daemon", BUTTON_PRIORITY,
- BUTTON_STACKSIZE, button_daemon, NULL);
+ ret = task_create("chrono_daemon", BUTTON_PRIORITY,
+ BUTTON_STACKSIZE, chrono_daemon, NULL);
if (ret < 0)
{
int errcode = errno;
- printf("buttons_main: ERROR: Failed to start button_daemon: %d\n",
+ printf("buttons_main: ERROR: Failed to start chrono_daemon: %d\n",
errcode);
return EXIT_FAILURE;
}