Merge branch 'develop'

Author: corneliusmunz

README.md

@@ -1,4 +1,5 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/legoinochat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![Release Version](https://img.shields.io/github/release/corneliusmunz/legoino.svg?style=plastic)
 # Legoino
 
 Arduino Library for controlling Powered UP and Boost controllers
@@ -32,7 +33,7 @@ You can find different Examples in the "examples" folder. You can select the exa
 * **TrainHub.ino:** Example for a PowererdUp Hub to set the speed of a train model. http://www.youtube.com/watch?v=o1hgZQz3go4 
 * **TrainColor.ino:** Example of PoweredUp Hub combined with color sensor to control the speed of the train dependent on the detected color. https://youtu.be/GZ0fqe3-Bhw
 * **PoweredUpRemoteAutoDetection.ino:** Example of connection of PoweredUp and PoweredUpRemote where the device type is fetched automatically and the order in which you switched on the hubs is no longer relevant. 
-
+* **ControlPlusHub.ino:** Example of connection of ControlPlusHub (TechnicHub) where a Tacho Motor on Port D is controlled.
 
 # Setup and Usage
 Just install the Library via the Arduino Library Manager.
@@ -61,6 +62,16 @@ represented by a hex string of the format: ```00:00:00:00:00:00```
 myBoostHub.init("90:84:2b:03:19:7f");
 ```
 
+If you want to change the BLE scan duration to detect a new Hub you can use the init function with a time parameter in seconds. The default value is 1 second. In former versions of the library it was 30 seconds which sometimes led to errors during the connection process.
+```c
+myBoostHub.init(2); // 2 seconds scan duration
+```
+
+Alternatively you can set the scan duration and the specific address of a hub in the init function with two parameters.
+```c
+myBoostHub.init("90:84:2b:03:19:7f", 2); // connect to hub with address and a scan duration of 2 seconds
+```
+
 In the main ```loop``` just add the following connection flow
 ```c
   if (myBoostHub.isConnecting()) {

examples/ControlPlusHub/ControlPlusHub.ino

@@ -0,0 +1,62 @@
+/**
+ * A Legoino example to control a control plus hub
+ * with a Motor connected on Port D
+ * 
+ * (c) Copyright 2020 - Cornelius Munz
+ * Released under MIT License
+ * 
+ */
+
+#include "ControlPlusHub.h"
+
+// create a hub instance
+ControlPlusHub myHub;
+ControlPlusHub::Port _port = ControlPlusHub::Port::D;
+
+void setup() {
+    Serial.begin(115200);
+} 
+
+
+// main loop
+void loop() {
+
+  if (!myHub.isConnected() && !myHub.isConnecting()) 
+  {
+    myHub.init(); 
+  }
+
+  // connect flow. Search for BLE services and try to connect if the uuid of the hub is found
+  if (myHub.isConnecting()) {
+    myHub.connectHub();
+    if (myHub.isConnected()) {
+      Serial.println("Connected to HUB");
+    } else {
+      Serial.println("Failed to connect to HUB");
+    }
+  }
+
+  // if connected, you can set the name of the hub, the led color and shut it down
+  if (myHub.isConnected()) {
+
+    char hubName[] = "myControlPlusHub";
+    myHub.setHubName(hubName);
+  
+    myHub.setLedColor(GREEN);
+    delay(1000);
+    myHub.setLedColor(RED);
+    delay(1000);
+    myHub.setMotorSpeed(_port, 35);
+    delay(1000);
+    myHub.stopMotor(_port);
+    delay(1000);
+    myHub.setMotorSpeed(_port, -35);
+    delay(1000);
+    myHub.stopMotor(_port);
+    delay(1000);
+
+  } else {
+    Serial.println("ControlPlus hub is disconnected");
+  }
+  
+} // End of loop

library.properties

@@ -1,5 +1,5 @@
 name=Legoino
-version=0.7.1
+version=0.8.0
 author=Cornelius Munz <cornelius.munz@gmx.de>
 maintainer=Cornelius Munz <cornelius.munz@gmx.de>
 sentence=Library for controlling PoweredUp, Boost, Corntrol+ controllers/hubs

src/ControlPlusHub.cpp

@@ -10,6 +10,15 @@
 
 ControlPlusHub::ControlPlusHub(){};
 
+/**
+ * @brief Stop the motor on a defined port.
+ * @param [in] port Port of the Hub on which the motor will be stopped (A, B, AB, C, D)
+ */
+void ControlPlusHub::stopMotor(Port port)
+{
+    setMotorSpeed(port, 0);
+}
+
 /**
  * @brief Set the motor speed on a defined port. 
  * @param [in] port Port of the Hub on which the speed of the motor will set (A, B, AB)

src/ControlPlusHub.h

@@ -37,6 +37,7 @@ class ControlPlusHub : public Lpf2Hub
   //Basic Motor methods
   void setAccelerationProfile(Port port, int16_t time, int8_t profileNumber);
   void setDecelerationProfile(Port port, int16_t time, int8_t profileNumber);
+  void stopMotor(Port port);
   void setMotorSpeed(Port port, int speed);
   void setMotorSpeedForTime(Port port, int speed, int16_t time);
   void setMotorSpeedForDegrees(Port port, int speed, int32_t degrees);

src/Lpf2Hub.cpp

@@ -698,7 +698,7 @@ void Lpf2Hub::init()
     pBLEScan->setAdvertisedDeviceCallbacks(new Lpf2HubAdvertisedDeviceCallbacks(this));
 
     pBLEScan->setActiveScan(true);
-    pBLEScan->start(30);
+    pBLEScan->start(_scanDuration);
 }
 
 /**
@@ -711,6 +711,19 @@ void Lpf2Hub::init(std::string deviceAddress)
     init();
 }
 
+void Lpf2Hub::init(uint32_t scanDuration)
+{
+    _scanDuration = scanDuration;
+    init();
+}
+
+void Lpf2Hub::init(std::string deviceAddress, uint32_t scanDuration)
+{
+    _requestedDeviceAddress = new BLEAddress(deviceAddress);
+    _scanDuration = scanDuration;
+    init();
+}
+
 /**
  * @brief Register the connected devices to map the ports to the device types
  * @param [in] connectedDevices[] Array to a device struct of all connected devices

src/Lpf2Hub.h

@@ -41,7 +41,9 @@ class Lpf2Hub
 public:
   Lpf2Hub();
   void init();
+  void init(uint32_t scanDuration);
   void init(std::string deviceAddress);
+  void init(std::string deviceAddress, uint32_t scanDuration);
   void initConnectedDevices(Device devices[], byte deviceNumbers);
   bool connectHub();
   bool isConnected();
@@ -128,6 +130,8 @@ class Lpf2Hub
   Device connectedDevices[13];
   int numberOfConnectedDevices = 0;
 
+  //BLE settings
+  uint32_t _scanDuration = 1;
   // Hub information values
   int _lpf2HubRssi;
   uint8_t _lpf2HubBatteryLevel;