From 9012bad55e423646f11e7c5a296edc1780a9aebf Mon Sep 17 00:00:00 2001
From: Guo Wenxue <guowenxue@gmail.com>
Date: Thu, 27 Jun 2019 15:21:48 +0800
Subject: [PATCH] update main.c fix hal_init bug
---
mqttd/etc/conf.h | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/mqttd/etc/conf.h b/mqttd/etc/conf.h
index 8c6fac2..49abfbc 100644
--- a/mqttd/etc/conf.h
+++ b/mqttd/etc/conf.h
@@ -19,8 +19,8 @@
#define DEF_BROKER_USERNAME "lingyun"
#define DEF_BROKER_PASSWD "lingyun-emb"
-#define DEF_PUBQOS 2
-#define DEF_PUBINTERVAL 600 /* 10 minitues */
+#define DEF_PUBQOS 0
+#define DEF_PUBINTERVAL 3 /* 3 seconds */
#define DEF_SUBQOS 0
@@ -35,8 +35,33 @@
Qos2, /* Qos2使用两阶段确认来保证消息的不丢失和不重复。在Qos2情况下，Broker肯定会收到消息，且只收到一次 */
};
+
+typedef struct hwconf_s
+{
+ unsigned char enable; /* Hardware enable or not, help to running on X86 */
+
+ int relay; /* relay connected wPI #pin number, if set to 0 means disable */
+ int beep; /* beep connected wPI #pin number, if set to 0 means disable */
+
+ unsigned char leds;
+ int redled; /* redled connect wPI #pin number, if set to 0 means disable */
+ int greenled; /*greenled connect wPI #pin number, if set to 0 means disable */
+ int blueled; /* blueled connect wPI #pin number, if set to 0 means disable */
+
+ unsigned char ds18b20; /* enable or disable temperature sensor ds18b20 */
+ unsigned char sht2x; /* enable or disable temperature and hummidity sensor sht2x */
+ unsigned char lux; /* enable or disable light intensity sensor TSL2561 */
+} hwconf_t;
+
+
+
typedef struct mqtt_ctx_s
{
+ char id[32]; /* production ID */
+
+ /* hardware configuration */
+ hwconf_t hwconf;
+
/* logger settings */
char logfile[128]; /* logger record file */
int loglevel; /* logger level */
--
Gitblit v1.9.1