Merge pull request #11 from gelanchez/develop

BTprocess class creation and implementation of the receiver method

Author: gelanchez

src/BTprocess.cpp

@@ -0,0 +1,32 @@
+/**
+ * @file BTprocess.cpp
+ * @author José Ángel Sánchez (https://github.com/gelanchez)
+ * @brief Library for receiving and processing the data from the serial bluetooth.
+ * @version 1.0.0
+ * @date 2020-08-29
+ * @copyright GPL-3.0
+ */
+
+#include "BTprocess.h"
+
+BTprocess::BTprocess()
+{
+}
+
+BTprocess::~BTprocess()
+{
+}
+
+String BTprocess::getBTData()
+{
+    m_dataBT = "";
+    while ((Serial.available() > 0) && (m_dataBT.endsWith("}") == false))
+    {
+        m_dataBT += static_cast<char>(Serial.read());
+        delay(3);
+    }
+    if ((m_dataBT.length() > 0) && m_dataBT.endsWith("}"))
+        return m_dataBT;
+    else
+        return "";
+}

src/BTprocess.h

@@ -0,0 +1,24 @@
+/**
+ * @file BTprocess.h
+ * @author José Ángel Sánchez (https://github.com/gelanchez)
+ * @brief Library for receiving and processing the data from the serial bluetooth.
+ * @version 1.0.0
+ * @date 2020-08-29
+ * @copyright GPL-3.0
+ */
+
+#ifndef BTPROCESS
+#define BTPROCESS
+
+class BTprocess
+{
+    private:
+        String m_dataBT = "";
+    
+    public:
+        BTprocess();
+        ~BTprocess();
+        String getBTData();
+};
+
+#endif

src/main.ino

@@ -2,17 +2,18 @@
  * @file main.ino
  * @author José Ángel Sánchez (https://github.com/gelanchez)
  * @brief Main program.
- * @version 1.0.0
- * @date 2020-08-22
+ * @version 1.0.1
+ * @date 2020-08-29
  * @copyright GPL-3.0
  */
 
+#include "BTprocess.h"
 #include "constants.h"
 #include "robot.h"
 #include <ArduinoJson.h>
 
 RobotControl Robot = RobotControl();  // Initialization of the RobotControl object
-String dataBT = "";
+BTprocess BTproc = BTprocess();  // Initialization of the BT processor object
 
 /**
  * @brief Structure storing the JSON data received, which keeps the mode of the robot.
@@ -38,7 +39,7 @@ StaticJsonDocument<150> elegooDoc;
  * {"N":3,"D1":2} obstacle avoidance
  * {"N":2,"D1":1...5} joystick
  */
-void decodeElegooJSON()
+void decodeElegooJSON(const String &dataBT)
 {
     DeserializationError error = deserializeJson(elegooDoc, dataBT);
     if (!error)
@@ -123,9 +124,9 @@ void setup()
 
 void loop()
 {
-    dataBT = Robot.getBTData();
+    String dataBT = BTproc.getBTData();
     if (dataBT != "")
-        decodeElegooJSON();
+        decodeElegooJSON(dataBT);
 
     switch (data.mode)
     {

src/robot.cpp

@@ -2,8 +2,8 @@
  * @file robot.cpp
  * @author José Ángel Sánchez (https://github.com/gelanchez)
  * @brief Library for controling the robot.
- * @version 1.0.2
- * @date 2020-08-28
+ * @version 1.1.0
+ * @date 2020-08-29
  * @copyright GPL-3.0
  */
 
@@ -51,20 +51,6 @@ void RobotControl::begin()
     m_servo.begin();  // Servo initialization can not be done inside Robot constructor
 }
 
-String RobotControl::getBTData()
-{
-    String dataBT = "";
-    while ((Serial.available() > 0) && (dataBT.endsWith("}") == false))
-    {
-        dataBT += static_cast<char>(Serial.read());
-        delay(3);
-    }
-    if ((dataBT.length() > 0) && dataBT.endsWith("}"))
-        return dataBT;
-    else
-        return "";
-}
-
 void RobotControl::remoteControlMode(RemoteOrder order)
 {
     switch (order)

src/robot.h

@@ -2,8 +2,8 @@
  * @file robot.h
  * @author José Ángel Sánchez (https://github.com/gelanchez)
  * @brief Library for controling the robot.
- * @version 1.0.0
- * @date 2020-08-22
+ * @version 1.1.0
+ * @date 2020-08-29
  * @copyright GPL-3.0
  */
 #ifndef ROBOT_H
@@ -35,7 +35,6 @@ class RobotControl
         ~RobotControl();
         void restartState();
         void begin();
-        String getBTData();
 
         void remoteControlMode(RemoteOrder order);
         void IRControlMode();