kopia lustrzana https://github.com/martin-ger/esp_mqtt
made SSL configuration part of the SYSCFG struct
rodzic
8f0fa38c7e
commit
e7f030a679
|
@ -22,5 +22,7 @@
|
|||
#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
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
|
|
Ładowanie…
Reference in New Issue