MirrorSave
/
ESPresense
mirror of https://github.com/ESPresense/ESPresense.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

successful compile and upload

This commit is contained in:
jptrsn 2018-10-12 22:25:00 -04:00
parent 5919cf79c5
commit c1ec26b9de
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ESP32-mqtt-room.ino
View File

@ -10,12 +10,17 @@
Ported to Arduino ESP32 by Evandro Copercini
*/
#include <WiFi.h>
#include <PubSubClient.h>
extern "C" {
#include "freertos/FreeRTOS.h"
#include "freertos/timers.h"
}
#include <AsyncTCP.h>
#include <BLEDevice.h>
#include <BLEUtils.h>
#include <BLEScan.h>
#include <BLEAdvertisedDevice.h>
#include <AsyncMqttClient.h>
#include <ArduinoJSON.h>
#include "BLEBeacon.h"
#include "BLEEddystoneTLM.h"
#include "BLEEddystoneURL.h"
@ -92,7 +97,6 @@ void connectToWifi() {
void connectToMqtt() {
Serial.println("Connecting to MQTT");
mqttClient.setClientId(uint64_to_string(ESP.getEfuseMac()));
mqttClient.setCredentials(mqttUser, mqttPassword);
mqttClient.connect();
}
@ -120,7 +124,7 @@ void onMqttConnect(bool sessionPresent) {
Serial.println(sessionPresent);
String publishTopic = String(channel) + "/" + room;
if (client.publish((char *)publishTopic.c_str(), "Hello from ESP32") == true) {
if (mqttClient.publish((char *)publishTopic.c_str(), 0, 0, "Hello from ESP32") == true) {
Serial.println("Success sending message to topic");
} else {
Serial.println("Error sending message");
@ -142,23 +146,6 @@ void onMqttPublish(uint16_t packetId) {
Serial.println(packetId);
}
void reconnect() {
while (!client.connected()) {
Serial.print("Attempting MQTT connection...");
if (client.connect(uint64_to_string(ESP.getEfuseMac()), mqttUser, mqttPassword )) {
Serial.print("connected with client id ");
Serial.println(uint64_to_string(ESP.getEfuseMac()));
} else {
Serial.print("failed, rc=");
Serial.print(client.state());
Serial.println(" try again in 5 seconds");
// Wait 5 seconds before retrying
delay(5000);
}
}
}
class MyAdvertisedDeviceCallbacks: public BLEAdvertisedDeviceCallbacks {
void onResult(BLEAdvertisedDevice advertisedDevice) {
@ -287,7 +274,7 @@ class MyAdvertisedDeviceCallbacks: public BLEAdvertisedDeviceCallbacks {
String publishTopic = String(channel) + "/" + room;
if (client.publish((char *)publishTopic.c_str(), JSONmessageBuffer) == true) {
if (mqttClient.publish((char *)publishTopic.c_str(), 0, 0, JSONmessageBuffer) == true) {
Serial.print("Success sending message to topic: "); Serial.println(publishTopic);
// Serial.print("Message: "); Serial.println(JSONmessageBuffer);
@ -343,11 +330,8 @@ void setup() {
unsigned long last = 0;
void loop() {
if (!client.connected()) {
reconnect();
}
// vTaskDelay(10); // watchdog timer
vTaskDelay(10); // watchdog timer
if (millis() - last > (waitTime * 1000) || last == 0) {
Serial.println("Scanning...");
@ -356,8 +340,6 @@ void loop() {
last = millis();
}
}
char *uint64_to_string(uint64_t input) {

2
platformio.ini
View File

@ -15,6 +15,6 @@ src_dir = .
platform = espressif32
framework = arduino
board = esp32dev
lib_deps = PubSubClient@2.6.0, ArduinoJSON@5.13.2, ESP32 BLE Arduino, AsyncMqttClient@0.8.2, AsyncTCP@1.0.1
lib_deps = ArduinoJSON@5.13.2, ESP32 BLE Arduino, AsyncMqttClient@0.8.2, AsyncTCP@1.0.1
board_build.partitions = partitions_singleapp.csv
upload_port = COM13