Merge branch 'release/0.5.1'

Author: corneliusmunz

README.md

@@ -5,6 +5,10 @@ Arduino Library for controlling Powered UP and Boost controllers
 
 *Disclaimer*: LEGO® is a trademark of the LEGO Group of companies which does not sponsor, authorize or endorse this project.
 
+Remote control your boost model example (just click the image to see the video)
+
+[![Legoino Boost control example](http://img.youtube.com/vi/UtHMKe2Insw/mqdefault.jpg)](https://youtu.be/UtHMKe2Insw "Legoino boost control example")
+
 Simple Train example (just click the image to see the video)
 
 [![Legoino TrainHub color control example](http://img.youtube.com/vi/GZ0fqe3-Bhw/mqdefault.jpg)](https://youtu.be/GZ0fqe3-Bhw "Legoino TrainHub color control example")

examples/PoweredUpRemote/PoweredUpRemote.ino

@@ -4,7 +4,7 @@
  * ATTENTION: The connection order is relevant!
  * 1) Power up the ESP32
  * 2) Power up the Remote
- * 3) Power up the Train Hug
+ * 3) Power up the Train Hub
  * 
  * You can change the motor speed with the left (A) remote buttons
  * 
@@ -21,6 +21,7 @@ PoweredUpRemote myRemote;
 PoweredUpHub myHub;
 
 PoweredUpRemote::Port _portLeft = PoweredUpRemote::Port::LEFT;
+PoweredUpRemote::Port _portRight = PoweredUpRemote::Port::RIGHT;
 PoweredUpHub::Port _portA = PoweredUpHub::Port::A;
 
 int currentSpeed = 0;
@@ -58,27 +59,29 @@ void loop() {
   }
 
   if (myRemote.isConnected() && myHub.isConnected() && !isInitialized) {
+     Serial.println("System is initialized");
       isInitialized = true;
       // both activations are needed to get status updates
       myRemote.activateButtonReports(); 
       myRemote.activatePortDevice(_portLeft, 55);
+      myRemote.activatePortDevice(_portRight, 55);
       myRemote.setLedColor(WHITE);
       myHub.setLedColor(WHITE);
   }
 
   // if connected we can control the train motor on Port A with the remote
   if (isInitialized) {
 
-    if (myRemote.isLeftRemoteUpButtonPressed()) {
+    if (myRemote.isLeftRemoteUpButtonPressed() || myRemote.isRightRemoteUpButtonPressed()) {
       myRemote.setLedColor(GREEN);
       updatedSpeed = min(100, currentSpeed+10);
-    } else if (myRemote.isLeftRemoteDownButtonPressed()) {
+    } else if (myRemote.isLeftRemoteDownButtonPressed() || myRemote.isRightRemoteDownButtonPressed()) {
       myRemote.setLedColor(BLUE);
       updatedSpeed = min(100, currentSpeed-10);
-    } else if (myRemote.isLeftRemoteStopButtonPressed()) {
+    } else if (myRemote.isLeftRemoteStopButtonPressed() || myRemote.isRightRemoteStopButtonPressed()) {
       myRemote.setLedColor(RED);
       updatedSpeed = 0;
-    } else if (myRemote.isLeftRemoteButtonReleased()) {
+    } else if (myRemote.isLeftRemoteButtonReleased() || myRemote.isRightRemoteButtonReleased()) {
       myRemote.setLedColor(WHITE);      
     }
 

examples/PoweredUpRemoteBoost/PoweredUpRemoteBoost.ino

@@ -0,0 +1,105 @@
+/**
+ * A Legoino example to connect to a Powered Up remote and a boost hub to control the Vernie model
+ * 
+ * ATTENTION: The connection order is relevant!
+ * 1) Power up the Boost Hub
+ * 2) Power up the ESP32
+ * 3) Power up the PoweredUp remote control
+ * 
+ * Just rotate the right remote stick that the buttons are aligned horizontally (+ button to the right)
+ * 
+ * Left Button UP     -> Vernie will move one step forward
+ * Left Button DOWN   -> Vernie will move one step back
+ * Right Button UP    -> Vernie will rotate to the right
+ * Right Button DOWN  -> Vernie will rotate to the left
+ * Right Stop Button  -> Vernie will fire the arrow
+ * 
+ * (c) Copyright 2019 - Cornelius Munz
+ * Released under MIT License
+ * 
+ */
+
+#include "PoweredUpRemote.h"
+#include "BoostHub.h"
+
+// create a hub instance
+PoweredUpRemote myRemote;
+BoostHub myHub;
+
+PoweredUpRemote::Port _portLeft = PoweredUpRemote::Port::LEFT;
+PoweredUpRemote::Port _portRight = PoweredUpRemote::Port::RIGHT;
+BoostHub::Port _portD = BoostHub::Port::D;
+
+bool isInitialized = false;
+
+void setup() {
+    Serial.begin(115200);
+    myHub.init(); // initalize the remote instance and try to connect
+} 
+
+
+// main loop
+void loop() {
+
+  // connect flow
+  if (myHub.isConnecting()) {
+    myHub.connectHub();
+    if (myHub.isConnected()) {
+      Serial.println("Connected to HUB");
+      myHub.setLedColor(GREEN);
+      myRemote.init(); // after connecting the remote, try to connect the hub
+    } else {
+      Serial.println("Failed to connect to Remote");
+    }
+  }
+
+  if (myRemote.isConnecting()) {
+    myRemote.connectHub();
+    if (myRemote.isConnected()) {
+      Serial.println("Connected to Remote");
+    } else {
+      Serial.println("Failed to connect to Hub");
+    }
+  }
+
+  if (myRemote.isConnected() && myHub.isConnected() && !isInitialized) {
+      Serial.println("Is initialized");
+      isInitialized = true;
+      // both activations are needed to get status updates
+      myRemote.activateButtonReports(); 
+      myRemote.activatePortDevice(_portLeft, 55);
+      myRemote.activatePortDevice(_portRight, 55);
+      myRemote.setLedColor(WHITE);
+      myHub.setLedColor(WHITE);
+  }
+
+  // if connected we can control vernie with the remote
+  if (isInitialized) {
+
+    if (myRemote.isLeftRemoteUpButtonPressed()) {
+      myHub.moveForward(1);
+      Serial.println("MoveForward");
+    } else if (myRemote.isLeftRemoteDownButtonPressed()) {
+      myHub.moveBack(1);
+      Serial.println("MoveBack");
+    } else if (myRemote.isRightRemoteUpButtonPressed()) {
+      myHub.rotateRight(30);
+      Serial.println("RotateRight");
+    } else if (myRemote.isRightRemoteDownButtonPressed()) {
+      myHub.rotateLeft(30);
+      Serial.println("RotateLeft");
+    } else if (myRemote.isRightRemoteStopButtonPressed()) {
+      Serial.println("Fire...");
+      myHub.setMotorSpeedForDegrees(_portD, -80, 20);
+      delay(500);
+      myHub.setMotorSpeedForDegrees(_portD, 100, 180);
+      delay(800);
+      myHub.setMotorSpeedForDegrees(_portD, -80, 120);
+    }
+
+
+    delay(100);
+
+  }
+  
+} // End of loop

library.properties

@@ -1,5 +1,5 @@
 name=Legoino
-version=0.5.0
+version=0.5.1
 author=Cornelius Munz <[email protected]>
 maintainer=Cornelius Munz <[email protected]>
 sentence=Library for controlling Powered UP and Boost controllers

src/Lpf2Hub.cpp

@@ -177,6 +177,10 @@ void Lpf2Hub::activatePortDevice(byte portNumber, byte deviceType)
     LOGLINE(mode, HEX);
     byte activatePortDeviceMessage[8] = {0x41, portNumber, mode, 0x01, 0x00, 0x00, 0x00, 0x01};
     WriteValue(activatePortDeviceMessage, 8);
+    //register device
+    Device newDevice = {portNumber, deviceType};
+    connectedDevices[numberOfConnectedDevices] = newDevice;
+    numberOfConnectedDevices++;
 }
 
 void Lpf2Hub::deactivatePortDevice(byte portNumber)
@@ -190,6 +194,20 @@ void Lpf2Hub::deactivatePortDevice(byte portNumber, byte deviceType)
     byte mode = getModeForDeviceType(deviceType);
     byte deactivatePortDeviceMessage[8] = {0x41, portNumber, mode, 0x01, 0x00, 0x00, 0x00, 0x00};
     WriteValue(deactivatePortDeviceMessage, 8);
+    //unregister device
+    bool hasReachedRemovedIndex = false;
+    for (int i = 0; i < numberOfConnectedDevices; i++)
+    {
+        if (hasReachedRemovedIndex)
+        {
+            connectedDevices[i - 1] = connectedDevices[i];
+        }
+        if (!hasReachedRemovedIndex && connectedDevices[i].PortNumber == portNumber)
+        {
+            hasReachedRemovedIndex = true;
+        }
+    }
+    numberOfConnectedDevices--;
 }
 
 void Lpf2Hub::activateButtonReports()
@@ -323,27 +341,10 @@ void Lpf2Hub::parsePortMessage(uint8_t *pData)
     {
         LOG(" is connected with device ");
         LOGLINE(pData[5], DEC);
-        Device newDevice = {port, pData[5]};
-        connectedDevices[numberOfConnectedDevices] = newDevice;
-        numberOfConnectedDevices++;
     }
     else
     {
         LOGLINE(" is disconnected");
-        bool hasReachedRemovedIndex = false;
-        for (int i = 0; i < numberOfConnectedDevices; i++)
-        {
-            if (hasReachedRemovedIndex)
-            {
-                connectedDevices[i - 1] = connectedDevices[i];
-            }
-            if (!hasReachedRemovedIndex && connectedDevices[i].PortNumber == port)
-            {
-                hasReachedRemovedIndex = true;
-            }
-        }
-
-        numberOfConnectedDevices--;
     }
 }