diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7137ec8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.cproject +.project +build/ +firmware/ + diff --git a/README.md b/README.md index a48320d..65b5d2d 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ void user_init(void) CFG_Load(); - MQTT_InitConnection(&mqttClient, sysCfg.mqtt_host, sysCfg.mqtt_port, SEC_NONSSL); + MQTT_InitConnection(&mqttClient, sysCfg.mqtt_host, sysCfg.mqtt_port, sysCfg.security); MQTT_InitClient(&mqttClient, sysCfg.device_id, sysCfg.mqtt_user, sysCfg.mqtt_pass, sysCfg.mqtt_keepalive); MQTT_OnConnected(&mqttClient, mqttConnectedCb); MQTT_OnPublished(&mqttClient, mqttPublishedCb); diff --git a/include/user_config.h b/include/user_config.h index 19b35ea..4acae8f 100644 --- a/include/user_config.h +++ b/include/user_config.h @@ -1,6 +1,5 @@ #ifndef _USER_CONFIG_H_ #define _USER_CONFIG_H_ -#include "user_interface.h" #define CFG_HOLDER 0x00FF55A4 #define CFG_LOCATION 0x3C /* Please don't change or if you know what you doing */ @@ -21,7 +20,8 @@ #define STA_TYPE AUTH_WPA2_PSK #define MQTT_RECONNECT_TIMEOUT 5 /*second*/ -#define MQTT_CONNTECT_TIMER 5 /**/ -#define CLIENT_SSL_ENABLE +#define MQTT_CLIENT_SSL_ENABLE +//#undef MQTT_CLIENT_SSL_ENABLE + #endif diff --git a/user/config.c b/user/config.c index 1e3ca97..4917cb4 100644 --- a/user/config.c +++ b/user/config.c @@ -34,6 +34,7 @@ #include "osapi.h" #include "user_interface.h" +#include "mqtt.h" #include "config.h" #include "user_config.h" #include "debug.h" @@ -93,7 +94,11 @@ void CFG_Load() sysCfg.mqtt_port = MQTT_PORT; os_sprintf(sysCfg.mqtt_user, "%s", MQTT_USER); os_sprintf(sysCfg.mqtt_pass, "%s", MQTT_PASS); - +#ifdef MQTT_CLIENT_SSL_ENABLE + sysCfg.security = SEC_SSL; +#else + sysCfg.security = SEC_NONSSL; +#endif sysCfg.mqtt_keepalive = MQTT_KEEPALIVE; INFO(" default configurations\r\n"); diff --git a/user/config.h b/user/config.h index 249e9e1..9cab229 100644 --- a/user/config.h +++ b/user/config.h @@ -45,6 +45,7 @@ typedef struct{ uint8_t mqtt_user[32]; uint8_t mqtt_pass[32]; uint32_t mqtt_keepalive; + uint8_t security; } SYSCFG; typedef struct { diff --git a/user/mqtt.h b/user/mqtt.h index 3ce26cf..51f549a 100644 --- a/user/mqtt.h +++ b/user/mqtt.h @@ -30,6 +30,7 @@ #ifndef USER_AT_MQTT_H_ #define USER_AT_MQTT_H_ #include "mqtt_msg.h" +#include "user_interface.h" #include "str_queue.h" typedef struct mqtt_event_data_t { diff --git a/user/user_main.c b/user/user_main.c index 42398e9..54dfee1 100644 --- a/user/user_main.c +++ b/user/user_main.c @@ -91,7 +91,7 @@ void user_init(void) CFG_Load(); - MQTT_InitConnection(&mqttClient, sysCfg.mqtt_host, sysCfg.mqtt_port, SEC_NONSSL); + MQTT_InitConnection(&mqttClient, sysCfg.mqtt_host, sysCfg.mqtt_port, sysCfg.security); MQTT_InitClient(&mqttClient, sysCfg.device_id, sysCfg.mqtt_user, sysCfg.mqtt_pass, sysCfg.mqtt_keepalive); MQTT_OnConnected(&mqttClient, mqttConnectedCb); MQTT_OnDisconnected(&mqttClient, mqttDisconnectedCb);