From d5ad51c46446e261d964515ca3a6bddb8559e014 Mon Sep 17 00:00:00 2001
From: Guo Wenxue <guowenxue@gmail.com>
Date: Wed, 26 Jun 2019 01:37:52 +0800
Subject: [PATCH] update mqttd, modify default Qos to 0
---
mqttd/main.c | 110 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 24 deletions(-)
diff --git a/mqttd/main.c b/mqttd/main.c
index 982b34a..8808585 100644
--- a/mqttd/main.c
+++ b/mqttd/main.c
@@ -13,6 +13,9 @@
#include <stdio.h>
#include <time.h>
#include <unistd.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <string.h>
#include <mosquitto.h>
@@ -23,43 +26,102 @@
#include "conf.h"
+#define PROG_VERSION "v1.0.0"
#define DAEMON_PIDFILE "/tmp/.mqtt.pid"
-
int check_set_program_running(int daemon);
void *mqtt_sub_worker(void *args);
void *mqtt_pub_worker(void *args);
+
+static void program_usage(char *progname)
+{
+
+ printf("Usage: %s [OPTION]...\n", progname);
+ printf(" %s is LingYun studio MQTT daemon program running on RaspberryPi\n", progname);
+
+ printf("\nMandatory arguments to long options are mandatory for short options too:\n");
+ printf(" -d[debug ] Running in debug mode\n");
+ printf(" -c[conf ] Specify configure file\n");
+ printf(" -h[help ] Display this help information\n");
+ printf(" -v[version ] Display the program version\n");
+
+ printf("\n%s version %s\n", progname, PROG_VERSION);
+ return;
+}
int main (int argc, char **argv)
{
float temp;
float rh;
- int daemon = 0;
+ int daemon = 1;
pthread_t tid;
mqtt_ctx_t ctx;
- char *conf="./etc/mqttd.conf";
- int debug = 1;
+ char *conf_file=NULL;
+ int debug = 0;
+ int opt;
+ char *progname=NULL;
- if( mqttd_parser_conf(conf, &ctx, debug)<0 )
+ struct option long_options[] = {
+ {"conf", required_argument, NULL, 'c'},
+ {"debug", no_argument, NULL, 'd'},
+ {"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {NULL, 0, NULL, 0}
+ };
+
+ progname = (char *)basename(argv[0]);
+
+ /* Parser the command line parameters */
+ while ((opt = getopt_long(argc, argv, "c:dvh", long_options, NULL)) != -1)
+ {
+ switch (opt)
+ {
+ case 'c': /* Set configure file */
+ conf_file = optarg;
+ break;
+
+ case 'd': /* Set debug running */
+ daemon = 0;
+ debug = 1;
+ break;
+
+ case 'v': /* Get software version */
+ printf("%s version %s\n", progname, PROG_VERSION);
+ return 0;
+
+ case 'h': /* Get help information */
+ program_usage(progname);
+ return 0;
+
+ default:
+ break;
+ }
+
+ }
+
+ if( !conf_file )
+ debug = 1;
+
+ if( mqttd_parser_conf(conf_file, &ctx, debug)<0 )
{
fprintf(stderr, "Parser mqtted configure file failure\n");
return -2;
}
-#if 0
if( hal_init() < 0 )
{
log_err("Initialise hardware failure\n");
return -1;
}
log_nrml("HAL initialise ok\n");
-#endif
install_proc_signal();
if( check_set_program_running(daemon) < 0 )
goto OUT;
+
+ if( !debug )
mosquitto_lib_init();
@@ -127,9 +189,7 @@
mqtt_ctx_t *ctx = (mqtt_ctx_t *)userdata;
int rv = 0;
char msg[128];
- float temp = 25.64;
- float rh = 65.35;
- char light[] = "on";
+ float temp = 0.0;
int retain = 0;
if( result )
@@ -141,25 +201,15 @@
log_nrml("Publisher connect to broker server[%s:%d] successfully\n", ctx->host, ctx->port);
memset(msg, 0, sizeof(msg));
- snprintf(msg, sizeof(msg), "{ \"temp\":\"%.2f\", \"R&H\":\"%.2f%%\" }", temp, rh);
+ if( ds18b20_get_temperature(&temp) < 0 )
+ strncpy(msg, "{ \"temp\":\"error\" }", sizeof(msg));
+ else
+ snprintf(msg, sizeof(msg), "{ \"temp\":\"%.2f\" }", temp);
rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg)+1, msg, ctx->pubQos, retain);
if( rv )
{
log_err("Publisher broadcast message '%s' failure: %d\n", msg, rv);
- }
- else
- {
- log_nrml("Publisher broadcast message '%s' ok\n", msg);
- }
-
- memset(msg, 0, sizeof(msg));
- snprintf(msg, sizeof(msg), "{ \"light\":\"%s\" }", light);
-
- rv = mosquitto_publish(mosq, NULL, ctx->pubTopic, strlen(msg)+1, msg, ctx->pubQos, retain);
- if( rv )
- {
- log_err("Publisher broadcast message failure: %d\n", rv);
}
else
{
@@ -236,6 +286,13 @@
log_warn("Subscriber disconnect to broker server[%s:%d], reason=%d\n", ctx->host, ctx->port, result);
}
+static inline void mqtt_turn_led(int which, char *cmd)
+{
+ if( strcasestr(cmd, "on") )
+ turn_led(which, ON);
+ else if( strcasestr(cmd, "off") )
+ turn_led(which, OFF);
+}
void proc_json_items(cJSON *root)
{
@@ -274,16 +331,19 @@
if( NULL != (led_item=cJSON_GetObjectItem(array , "red")) )
{
log_nrml("turn red led '%s'\n", led_item->valuestring);
+ mqtt_turn_led(LED_R, led_item->valuestring);
}
if( NULL != (led_item=cJSON_GetObjectItem(array , "green")) )
{
log_nrml("turn green led '%s'\n", led_item->valuestring);
+ mqtt_turn_led(LED_G, led_item->valuestring);
}
if( NULL != (led_item=cJSON_GetObjectItem(array , "blue")) )
{
log_nrml("turn blue led '%s'\n", led_item->valuestring);
+ mqtt_turn_led(LED_B, led_item->valuestring);
}
}
}
@@ -298,10 +358,12 @@
if( strcasestr(value, "on") )
{
log_nrml("Turn light on\n");
+ turn_relay(ON);
}
else if( strcasestr(value, "off") )
{
log_nrml("Turn light off\n");
+ turn_relay(OFF);
}
}
--
Gitblit v1.9.1