Merge branch 'develop'

Author: corneliusmunz

.github/workflows/buildExampleSketches.yml

@@ -36,6 +36,7 @@ jobs:
     - name: Compile all examples
       uses: ArminJo/arduino-test-compile@v3
       with:
+        sketches-exclude: PowerFunctions
         arduino-board-fqbn: ${{ matrix.arduino-boards-fqbn }}
         platform-url: https://dl.espressif.com/dl/package_esp32_index.json
         required-libraries: NimBLE-Arduino # use latest version

.github/workflows/buildPfExampleSketch.yml

@@ -0,0 +1,47 @@
+name: BuildPfExampleSketch
+on: 
+  push:
+    paths: 
+    - '**.ino'
+    - '**.cpp'
+    - '**.h'
+    - '.github/workflows/*.yml'
+  pull_request:
+    paths: 
+    - '**.ino'
+    - '**.cpp'
+    - '**.h'
+    - '.github/workflows/*.yml'
+
+jobs:
+  build:
+    name: ${{ matrix.arduino-boards-fqbn }}
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        # The matrix will produce one job for each configuration parameter of type `arduino-boards-fqbn`
+        arduino-boards-fqbn:
+          - esp32:esp32:pico32:PartitionScheme=default,UploadSpeed=115200,DebugLevel=none # e.g. M5 Atom
+          - esp32:esp32:heltec_wifi_kit_32:PSRAM=disabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=40,FlashSize=4M,UploadSpeed=921600,DebugLevel=none
+          - esp32:esp32:esp32wrover:PartitionScheme=default,FlashMode=qio,FlashFreq=80,UploadSpeed=921600,DebugLevel=none
+          - esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=legacy,ssl=all,eesz=4M2M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200 
+          - esp8266:esp8266:d1:xtal=80,vt=flash,exception=legacy,ssl=all,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 
+          - esp8266:esp8266:huzzah:xtal=80,vt=flash,exception=legacy,ssl=all,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200
+          - arduino:avr:uno
+          - arduino:avr:nano:cpu=atmega328      
+
+      # Do not cancel all jobs / architectures if one job fails
+      fail-fast: false
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Compile only power function example for different platforms
+      uses: ArminJo/arduino-test-compile@v3
+      with:
+        arduino-board-fqbn: ${{ matrix.arduino-boards-fqbn }}
+        sketch-names: "PowerFunctions.ino"
+        platform-url: https://dl.espressif.com/dl/package_esp32_index.json,https://arduino.esp8266.com/stable/package_esp8266com_index.json
+        required-libraries: NimBLE-Arduino # use latest version

README.md

@@ -49,10 +49,10 @@ All the included examples are a great source to find a solution or pattern for y
 
 You can find different Examples in the "examples" folder. You can select the examples in your Arduino IDE via the Menu "File->Examples". Just have a look on the videos to see the examples running :smiley: 
 * **Boost.ino:** Example who uses the basic boost moovements (feasable for M.T.R.4 or Vernie model). http://www.youtube.com/watch?v=VgWObhyUmi0 
-* **MoveHubColorSensor.ino:** Example which reads in the color Sensor value on port C and uses the detected color to set the Hub LED accordingly. https://youtu.be/_xCd9Owy1nk
+* **ColorSensor.ino:** Example which reads in the color Sensor value (attached to an abritary port) and uses the detected color to set the Hub LED accordingly. https://youtu.be/_xCd9Owy1nk
 * **MoveHubDeviceInfo.ino:** Example which displays the various device infos (firmware version, battery level, rssi, hardwar version, tilt) in the serial monitor
-* **MoveHubDistanceSensor.ino:** Example which reads in the input of the distance sencor and set the Hub LED color dependent on the distance. https://youtu.be/TOAQtGGjZ6c 
-* **MoveHubRotationSensor.ino:** Example which reads in the input of the Tacho motor angle to set the Hub LED dependent on the angle to the scale of rainbow colors. https://youtu.be/c3DHpX55uN0
+* **DistanceSensor.ino:** Example which reads in the input of the distance sencor and set the Hub LED color dependent on the distance. https://youtu.be/TOAQtGGjZ6c 
+* **RotationSensor.ino:** Example which reads in the input of the Tacho motor angle to set the Hub LED dependent on the angle to the scale of rainbow colors. https://youtu.be/c3DHpX55uN0
 * **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
 * **HubEmulation.ino:** Example of an emulated PoweredUp Hub two port hub (train hub) which could receive signals from the PoweredUp app and will send out the signals as IR commands to a Powerfunction remote receiver. https://www.youtube.com/watch?v=RTNexxT4-yQ
@@ -327,7 +327,7 @@ To signalize the app which devices are connected you have to send some commands
 
 ## PowerFunction IR
 
-To use the PowerFunction Infrared library you have to connect a IR-LED to your ESP32 controller. To instanciate a new object, you have to define on which pin the IR Led is connected. Additionally you can define the Power function channel which should be used. 
+To use the PowerFunction Infrared library you have to connect a IR-LED to your controller. The PowerFunction part of the legoino library will work on different hardware architectures (AVR, ESP8266, ESP32). To instanciate a new object, you have to define on which pin the IR Led is connected. Additionally you can define the Power function channel which should be used. Pay attention, that the channel in the library starts with 0 and on the physical IR Lego controller it starts with 1. So if you want to control channel 1 of your physical device, you have to use channel 0 in the PowerFunction part of the library. 
 
 ```c++
 #include "PowerFunctions.h"
@@ -426,6 +426,8 @@ Thanks to [@fvanroie](https://github.com/fvanroie) for his contribution about ca
 
 Thanks for the original [PowerFunctions](https://github.com/jurriaan/Arduino-PowerFunctions) Library by [@jurriaan](https://github.com/jurriaan)
 
+Thanks to [@wmarkow](https://github.com/wmarkow) for his detailed input about hub emulation issues on Android devices and his proposals.
+
 # Remarks
 Prerequisite of that library is the NimBLE-Arduino library (https://github.com/h2zero/NimBLE-Arduino) with at least version 1.0.1 Otherwise the notifcations of changed charachteristic values will not work. So just install as a prerequesite the version 1.0.1 of that library via the Arduino Library manager or the platform.io library manager (https://www.arduinolibraries.info/libraries/nim-ble-arduino)
 

…oveHubColorSensor/MoveHubColorSensor.ino examples/ColorSensor/ColorSensor.inoexamples/MoveHubColorSensor/MoveHubColorSensor.ino renamed to examples/ColorSensor/ColorSensor.ino examples/MoveHubColorSensor/MoveHubColorSensor.ino renamed to examples/ColorSensor/ColorSensor.ino

@@ -1,6 +1,8 @@
 /**
- * A MoveHub basic example to connect a boost hub, set the led color of the hub 
- * dependent on the detected color of the color/distance sensor. 
+ * A Hub basic example to connect a hub, set the led color of the hub 
+ * dependent on the detected color of the color/distance sensor which 
+ * could be attached to any free port. The sketch will wait till a color
+ * sensor ist attached to a port. 
  * 
  * (c) Copyright 2020 - Cornelius Munz
  * Released under MIT License
@@ -10,13 +12,13 @@
 #include "Lpf2Hub.h"
 
 // create a hub instance
-Lpf2Hub myMoveHub;
-byte portC = (byte)MoveHubPort::C;
+Lpf2Hub myHub;
+bool isInitialized = false;
 
 void setup()
 {
   Serial.begin(115200);
-  myMoveHub.init(); // initalize the MoveHub instance
+  myHub.init(); // initalize the hub instance
 }
 
 // callback function to handle updates of sensor values
@@ -25,7 +27,9 @@ void colorDistanceSensorCallback(void *hub, byte portNumber, DeviceType deviceTy
   Lpf2Hub *myHub = (Lpf2Hub *)hub;
 
   Serial.print("sensorMessage callback for port: ");
-  Serial.println(portNumber, DEC);
+  Serial.print(portNumber, DEC);
+  Serial.print(" value: ");
+  Serial.println(pData[4], DEC);
   if (deviceType == DeviceType::COLOR_DISTANCE_SENSOR)
   {
     int color = myHub->parseColor(pData);
@@ -43,27 +47,34 @@ void loop()
 {
 
   // connect flow. Search for BLE services and try to connect if the uuid of the hub is found
-  if (myMoveHub.isConnecting())
+  if (myHub.isConnecting())
   {
-    myMoveHub.connectHub();
-    if (myMoveHub.isConnected())
+    myHub.connectHub();
+    if (myHub.isConnected())
     {
       Serial.println("Connected to HUB");
-      delay(200); //needed because otherwise the message is to fast after the connection procedure and the message will get lost
-      // connect color/distance sensor to port c, activate sensor for updates
-      myMoveHub.activatePortDevice(portC, colorDistanceSensorCallback);
-      myMoveHub.setLedColor(GREEN);
+      myHub.setLedColor(BLUE);
     }
     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 (myMoveHub.isConnected())
+  if (myHub.isConnected() && !isInitialized)
   {
-    // nothing has to be done because the sensor values are received in the callback function if an update occurs
+    delay(200);
+    Serial.print("check ports... if needed sensor is already connected: ");
+    byte portForDevice = myHub.getPortForDeviceType((byte)DeviceType::COLOR_DISTANCE_SENSOR);
+    Serial.println(portForDevice, DEC);
+    if (portForDevice != 255)
+    {
+      Serial.println("activatePortDevice");
+      myHub.activatePortDevice(portForDevice, colorDistanceSensorCallback);
+      delay(200);
+      myHub.setLedColor(GREEN);
+      isInitialized = true;
+    };
   }
 
 } // End of loop

…DistanceSensor/MoveHubDistanceSensor.ino …amples/DistanceSensor/DistanceSensor.inoexamples/MoveHubDistanceSensor/MoveHubDistanceSensor.ino renamed to examples/DistanceSensor/DistanceSensor.ino examples/MoveHubDistanceSensor/MoveHubDistanceSensor.ino renamed to examples/DistanceSensor/DistanceSensor.ino

@@ -1,6 +1,8 @@
 /**
- * A MoveHub basic example to connect a boost hub, set the led color of the hub 
- * dependent on the detected distance of the distance/color sensor
+ * A hub basic example to connect a  hub, set the led color of the hub 
+ * dependent on the detected distance of the distance/color sensor. The sensor
+ * can be connect to any port. The sketch will wait till a color-distance sensor
+ * will be attached on any port.
  * 
  * (c) Copyright 2020 - Cornelius Munz
  * Released under MIT License
@@ -10,16 +12,18 @@
 #include "Lpf2Hub.h"
 
 // create a hub instance
-Lpf2Hub myMoveHub;
-byte portC = (byte)MoveHubPort::C;
+Lpf2Hub myHub;
+bool isInitialized = false;
 
 // callback function to handle updates of sensor values
 void distanceSensorCallback(void *hub, byte portNumber, DeviceType deviceType, uint8_t *pData)
 {
   Lpf2Hub *myHub = (Lpf2Hub *)hub;
 
   Serial.print("sensorMessage callback for port: ");
-  Serial.println(portNumber, DEC);
+  Serial.print(portNumber, DEC);
+  Serial.print(" value: ");
+  Serial.println(pData[7], DEC);
   if (deviceType == DeviceType::COLOR_DISTANCE_SENSOR)
   {
     double distance = myHub->parseDistance(pData);
@@ -47,34 +51,42 @@ void distanceSensorCallback(void *hub, byte portNumber, DeviceType deviceType, u
 void setup()
 {
   Serial.begin(115200);
-  myMoveHub.init(); // initalize the MoveHub instance
+  myHub.init(); // initalize the MoveHub instance
 }
 
 // main loop
 void loop()
 {
 
   // connect flow. Search for BLE services and try to connect if the uuid of the hub is found
-  if (myMoveHub.isConnecting())
+  if (myHub.isConnecting())
   {
-    myMoveHub.connectHub();
-    if (myMoveHub.isConnected())
+    myHub.connectHub();
+    if (myHub.isConnected())
     {
       Serial.println("Connected to HUB");
-      delay(200); //needed because otherwise the message is to fast after the connection procedure and the message will get lost
-      // connect color/distance sensor to port c, activate sensor for updates, set callback function if distance value changes
-      myMoveHub.activatePortDevice(portC, distanceSensorCallback);
-      myMoveHub.setLedColor(GREEN);
+      myHub.setLedColor(BLUE);
     }
     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 (myMoveHub.isConnected())
+  if (myHub.isConnected() && !isInitialized)
   {
+    delay(200);
+    Serial.print("check ports... if needed sensor is already connected: ");
+    byte portForDevice = myHub.getPortForDeviceType((byte)DeviceType::COLOR_DISTANCE_SENSOR);
+    Serial.println(portForDevice, DEC);
+    if (portForDevice != 255)
+    {
+      Serial.println("activatePortDevice");
+      myHub.activatePortDevice(portForDevice, distanceSensorCallback);
+      delay(200);
+      myHub.setLedColor(GREEN);
+      isInitialized = true;
+    };
   }
 
 } // End of loop

…RotationSensor/MoveHubRotationSensor.ino …amples/RotationSensor/RotationSensor.inoexamples/MoveHubRotationSensor/MoveHubRotationSensor.ino renamed to examples/RotationSensor/RotationSensor.ino examples/MoveHubRotationSensor/MoveHubRotationSensor.ino renamed to examples/RotationSensor/RotationSensor.ino

@@ -1,7 +1,9 @@
 /**
- * A MoveHub basic example to connect a boost hub, set the led color of the hub 
- * dependent on the detected rotation of the boost tacho motor. Usage of callback function
- * if motor angle is changed
+ * A hub basic example to connect a hub, set the led color of the hub 
+ * dependent on the detected rotation of the connected tacho motor. Usage of callback function
+ * if motor angle is changed. The tacho motor can be attached to any port and the 
+ * sketch will wait until the tacho motor is attached. If the hub button is pressed,
+ * the encode position will be set to 0
  * 
  * (c) Copyright 2020 - Cornelius Munz
  * Released under MIT License
@@ -10,10 +12,13 @@
 
 #include "Lpf2Hub.h"
 
-// create a hub instance
-Lpf2Hub myMoveHub;
-byte portD = (byte)MoveHubPort::D;
+// Define here the linear/angular motor which you will connect to a port of your hub
+DeviceType device = DeviceType::MEDIUM_LINEAR_MOTOR;
 
+// create a hub instance
+Lpf2Hub myHub;
+byte port;
+bool isInitialized = false;
 
 void buttonCallback(void *hub, HubPropertyReference hubProperty, uint8_t *pData)
 {
@@ -22,7 +27,7 @@ void buttonCallback(void *hub, HubPropertyReference hubProperty, uint8_t *pData)
   if (hubProperty == HubPropertyReference::BUTTON)
   {
     if (myHub->parseHubButton(pData) == ButtonState::PRESSED) {
-      myHub->setAbsoluteMotorEncoderPosition(portD, 0);
+      myHub->setAbsoluteMotorEncoderPosition(port, 0);
     }
   }
 }
@@ -47,38 +52,46 @@ void tachoMotorCallback(void *hub, byte portNumber, DeviceType deviceType, uint8
 void setup()
 {
   Serial.begin(115200);
-  myMoveHub.init(); // initalize the MoveHub instance
+  myHub.init(); // initalize the MoveHub instance
 }
 
 // main loop
 void loop()
 {
 
   // connect flow. Search for BLE services and try to connect if the uuid of the hub is found
-  if (myMoveHub.isConnecting())
+  if (myHub.isConnecting())
   {
-    myMoveHub.connectHub();
-    if (myMoveHub.isConnected())
+    myHub.connectHub();
+    if (myHub.isConnected())
     {
       Serial.println("Connected to HUB");
       delay(200); //needed because otherwise the message is to fast after the connection procedure and the message will get lost
-      // connect boost tacho motor  to port d, activate sensor for updates, set callback function for rotation changes
-      myMoveHub.activatePortDevice(portD, tachoMotorCallback);
-      delay(50);
-      myMoveHub.activateHubPropertyUpdate(HubPropertyReference::BUTTON, buttonCallback);
-
-      myMoveHub.setLedColor(GREEN);
+      myHub.activateHubPropertyUpdate(HubPropertyReference::BUTTON, buttonCallback);
+      myHub.setLedColor(BLUE);
     }
     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 (myMoveHub.isConnected())
+  if (myHub.isConnected() && !isInitialized)
   {
-    // nothing has to be done because the sensor values are received in the callback function if an update occurs
+    delay(200);
+    Serial.print("check ports... if needed sensor is already connected: ");
+    byte portForDevice = myHub.getPortForDeviceType((byte)device);
+    Serial.println(portForDevice, DEC);
+    if (portForDevice != 255)
+    {
+      port = portForDevice;
+      Serial.println("activatePortDevice");
+      myHub.activatePortDevice(portForDevice, tachoMotorCallback);
+      delay(200);
+      myHub.setLedColor(GREEN);
+      isInitialized = true;
+    };
   }
 
+
 } // End of loop

examples/TrainColor/TrainColor.ino

@@ -1,7 +1,7 @@
 /**
  * A Train hub basic example to connect a PoweredUp hub, and set the speed of the train 
  * motor dependent on the detected color. If the train is stopped, you can start the train by
- * pressing the hub button.
+ * pressing the hub button. The train motor has to be connected to Port A and the Color sensor to Port B
  * 
  * (c) Copyright 2020 - Cornelius Munz
  * Released under MIT License

library.properties

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

src/Boost.cpp

@@ -8,6 +8,8 @@
  * 
 */
 
+#if defined(ESP32)
+
 #include "Boost.h"
 
 Boost::Boost(){};
@@ -104,3 +106,5 @@ void Boost::moveArcRight(int degrees = 90)
 {
     moveArc(degrees);
 }
+
+#endif // ESP32