irext/iris-kit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented dual channel connection for iris-kit

Browse Source
This commit is contained in:
strawmanbobi
2024-02-19 15:20:42 +08:00
parent 47b4c31146
commit ec9e478b69
9 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/AliyunIoTSDK/src/AliyunIoTSDK.cpp
View File

@@ -34,7 +34,6 @@ DeviceProperty PropertyMessageBuffer[MESSAGE_BUFFER_SIZE];
#define SHA256HMAC_SIZE 32
#define DATA_CALLBACK_SIZE 20
#define SIGN_DEBUG_VERBOSE 1
#define MQTT_WAIT_GENERIC (10000)
@@ -162,12 +161,15 @@ int AliyunIoTSDK::mqttCheckConnect() {
return mqttStatus;
}
int AliyunIoTSDK::begin(Client &espClient,
int AliyunIoTSDK::begin(PubSubClient &mqtt_client,
const char *_productKey,
const char *_deviceName,
const char *_deviceSecret,
const char *_region) {
client = new PubSubClient(espClient);
if (NULL == client) {
client = &mqtt_client;
}
productKey = _productKey;
deviceName = _deviceName;
deviceSecret = _deviceSecret;
@@ -200,7 +202,7 @@ int AliyunIoTSDK::begin(Client &espClient,
client->setServer(domain, MQTT_PORT);
#if defined USE_STANDARD_THING_MODEL_TOPIC
client->setCallback(callback);
client.setCallback(callback);
#endif
Serial.print("INFO\tconnection check in begin\n");
return mqttCheckConnect();
@@ -237,18 +239,6 @@ void AliyunIoTSDK::sendEvent(const char *eventId) {
sendEvent(eventId, "{}");
}
void AliyunIoTSDK::sendCustom(const char *topic, const char *eventBody) {
boolean d = client->publish(topic, eventBody);
Serial.print("INFO\tpublish:0 sucessfully:");
Serial.println(d);
}
void AliyunIoTSDK::sendCustomData(const char *topic, const uint8_t *data, int length) {
boolean d = client->publish(topic, data, length);
Serial.print("INFO\tpublish:0 sucessfully:");
Serial.println(d);
}
boolean AliyunIoTSDK::subscribe(const char* topic, int qos) {
return client->subscribe(topic, qos);
}

19
lib/AliyunIoTSDK/src/AliyunIoTSDK.h
View File

@@ -64,7 +64,7 @@ public:
* @param _deviceSecret : AliyunIoT device secret
* @param _region : AliyunIoT region
*/
static int begin(Client &espClient,
static int begin(PubSubClient &mqtt_client,
const char *_productKey,
const char *_deviceName,
const char *_deviceSecret,
@@ -117,23 +117,6 @@ public:
*/
static void sendEvent(const char *eventId);
/**
* Send customized topic data
*
* @param topic : topic in string
* @param eventBody : event body in string
*/
static void sendCustom(const char *topic, const char *eventBody);
/**
* Send customized topic payload data
*
* @param topic : topic in string
* @param data : data payload
* @param length : payload length
*/
static void sendCustomData(const char *topic, const uint8_t *data, int length);
/**
* Subscribe MQTT topic for Aliot
*