Sending data every 15ms for test purpose

Author: JandroMejia97

lib/uart/uart.cpp

@@ -0,0 +1,61 @@
+#include "ubidots.h"
+#include "uart.h"
+
+#ifndef UART_NUMBER
+  #warning "UART_NUMBER not defined, using default UART 2"
+  #define UART_NUMBER 2
+#endif
+// Serial port pins
+#ifndef SERIAL_RX
+  #warning "SERIAL_RX not defined, using default pin 16"
+  #define SERIAL_RX 16
+#endif
+
+#ifndef SERIAL_TX
+  #warning "SERIAL_TX not defined, using default pin 17"
+  #define SERIAL_TX 17
+#endif
+
+// Message received from the UART
+String message;
+
+// Hardware serial port to communicate with the EDU-CIAA
+HardwareSerial SerialPort(UART_NUMBER);
+
+void uartInit() {
+  Serial.begin(115200);
+  // Initialize the serial port
+  SerialPort.begin(115200, SERIAL_8N1, SERIAL_RX, SERIAL_TX);
+  // Set the callback function to be called when a message is received
+  SerialPort.onReceive(uartHandler);
+  // Enable the serial port to receive data
+  // SerialPort.listen();
+}
+
+void uartHandler() {
+  setStatus(ESP_READING_DATA);
+   // Read the message from the UART
+  int i = 0;
+  Serial.println("Reading data from UART");
+  while (SerialPort.available() && SerialPort.peek() != '\n') {
+    message += (char) SerialPort.read();
+    i++;
+  }
+  SerialPort.read();
+  // Get the type of the variable, and convert it to an integer
+  const int index = message[0] - '0';
+  const int value = message.substring(1).toInt();
+  // Publish the data to the Ubidots MQTT broker
+  Serial.printf("Publishing data:\r\nIndex: %d, Value: %d\r\n", index, value);
+  publishData(index, value);
+  // Clear the message
+  message = "";
+}
+
+void sendToUart(String message) {
+  SerialPort.println(message);
+}
+
+void sendToUart(char *message) {
+  SerialPort.println(message);
+}

src/main.cpp

@@ -9,26 +9,29 @@
 
 typedef enum {
   ESP_INIT,
-  ESP_NO_CONNECTED,
   ESP_CONNECTED,
+  ESP_DISCONNECTED,
+  ESP_READING_DATA,
   ESP_SENDING_DATA,
-  ESP_UART_ERROR,
+  ESP_DATA_ERROR,
 } ESP_Status_t;
 
 ESP_Status_t ESP_STATUS = ESP_INIT;
 
-String ESP_GetErrorAsString(ESP_Status_t status) {
+static String ESP_GetErrorAsString(ESP_Status_t status) {
   switch (status) {
     case ESP_INIT:
       return "ESP_INIT";
-    case ESP_NO_CONNECTED:
-      return "ESP_NO_CONNECTED";
     case ESP_CONNECTED:
       return "ESP_CONNECTED";
+    case ESP_DISCONNECTED:
+      return "ESP_DISCONNECTED";
+    case ESP_READING_DATA:
+      return "ESP_READING_DATA";
     case ESP_SENDING_DATA:
       return "ESP_SENDING_DATA";
-    case ESP_UART_ERROR:
-      return "ESP_UART_ERROR";
+    case ESP_DATA_ERROR:
+      return "ESP_DATA_ERROR";
     default:
       return "ESP_UNKNOWN_ERROR";
   }
@@ -43,14 +46,17 @@ const char *UBIDOTS_TOKEN = "BBFF-Pc8IvgnCXtKOaQ1lwUfq5oypeSU5AW";
 // Device label
 const char *DEVICE_LABEL = "esp32-edu-ciaa";
 // Variable labels
-const char *VARIABLE_LABELS[4] = {"temperature", "air-humidity", "light", "soil-humidity"};
+const char *VARIABLE_LABELS[4] = {"temperature", "air_humidity", "light", "soil_humidity"};
 
 // Message received from the UART
 String message;
 
 // Ubidots client
 Ubidots client(UBIDOTS_TOKEN);
 
+unsigned long timer;
+const int PUBLISH_FREQUENCY = 15000;
+
 // Hardware serial port to communicate with the EDU-CIAA
 HardwareSerial SerialPort(UART);
 
@@ -76,9 +82,11 @@ void setup() {
   // Connecting to a WiFi network
   client.connectToWifi(WIFI_SSID, WIFI_PASSWORD);
   // Connecting to a mqtt broker
+  client.setDebug(true);
   client.setCallback(callback);
   client.setup();
   client.reconnect();
+  timer = millis();
 }
 
 void callback(char *topic, byte *payload, unsigned int length) {
@@ -96,7 +104,7 @@ void callback(char *topic, byte *payload, unsigned int length) {
 
 void loop() {
   if (!client.connected()) {
-    ESP_STATUS = ESP_NO_CONNECTED;
+    ESP_STATUS = ESP_DISCONNECTED;
     client.reconnect();
   }
 
@@ -120,15 +128,22 @@ void uartHandler() {
   const int index = message[0] - '0';
   // Check if the type is valid, and if the index is in range
   if (index >= 0 && index < 4) {
+    ESP_STATUS = ESP_SENDING_DATA;
+    const char* variableLabel = VARIABLE_LABELS[index];
     const int value = message.substring(1).toInt();
-    Serial.printf("Variable: %s, Value: %d\n", VARIABLE_LABELS[index], value);
     // Add the value to the Ubidots client
-    client.add(VARIABLE_LABELS[index], value);
-    // Publish the data to the Ubidots MQTT broker
-    client.publish(DEVICE_LABEL);
+    client.add(variableLabel, value);
+    long diff = millis() - timer;
+    diff = diff < 0 ? -diff : diff;
+    if (diff > PUBLISH_FREQUENCY) {
+      // Publish the data to the Ubidots MQTT broker
+      client.publish(DEVICE_LABEL);
+      timer = millis();
+    }
+    ESP_STATUS = ESP_CONNECTED;
   } else {
-    Serial.println("Error: Invalid type, index out of range");
-    ESP_STATUS = ESP_UART_ERROR;
+    Serial.println("Error: Invalid type, index out of range\r\n");
+    ESP_STATUS = ESP_DATA_ERROR;
   }
   message = "";
 }