Update examples for new API

platisd · platisd · commit 6e792efc1004 · 2020-06-07T22:12:06.000+02:00
diff --git a/examples/Car/DistanceCar/DistanceCar.ino b/examples/Car/DistanceCar/DistanceCar.ino
@@ -1,17 +1,24 @@
 #include <Smartcar.h>
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
 const auto pulsesPerMeter = 600;
 
 DirectionlessOdometer leftOdometer(
-    smartcarlib::pins::v2::leftOdometerPin, []() { leftOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::leftOdometerPin,
+    []() { leftOdometer.update(); },
+    pulsesPerMeter);
 DirectionlessOdometer rightOdometer(
-    smartcarlib::pins::v2::rightOdometerPin, []() { rightOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::rightOdometerPin,
+    []() { rightOdometer.update(); },
+    pulsesPerMeter);
 
-DistanceCar car(control, leftOdometer, rightOdometer);
+DistanceCar car(arduino, control, leftOdometer, rightOdometer);
 
 void setup()
 {
diff --git a/examples/Car/FullSerialControl/FullSerialControl.ino b/examples/Car/FullSerialControl/FullSerialControl.ino
@@ -1,7 +1,8 @@
 #include <Smartcar.h>
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
 SimpleCar car(control);
diff --git a/examples/Car/HeadingCar/HeadingCar.ino b/examples/Car/HeadingCar/HeadingCar.ino
@@ -4,11 +4,12 @@ const int GYROSCOPE_OFFSET         = 37;
 const unsigned long PRINT_INTERVAL = 100;
 unsigned long previousPrintout     = 0;
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
-GY50 gyroscope(GYROSCOPE_OFFSET);
+GY50 gyroscope(arduino, GYROSCOPE_OFFSET);
 
 HeadingCar car(control, gyroscope);
 
diff --git a/examples/Car/PidControllerMonitor/PidControllerMonitor.ino b/examples/Car/PidControllerMonitor/PidControllerMonitor.ino
@@ -9,18 +9,25 @@ const unsigned long PRINTOUT_INTERVAL = 100;
 unsigned long previousPrintOut        = 0;
 float carSpeed                        = 0.5;
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
 const auto pulsesPerMeter = 600;
 
 DirectionlessOdometer leftOdometer(
-    smartcarlib::pins::v2::leftOdometerPin, []() { leftOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::leftOdometerPin,
+    []() { leftOdometer.update(); },
+    pulsesPerMeter);
 DirectionlessOdometer rightOdometer(
-    smartcarlib::pins::v2::rightOdometerPin, []() { rightOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::rightOdometerPin,
+    []() { rightOdometer.update(); },
+    pulsesPerMeter);
 
-DistanceCar car(control, leftOdometer, rightOdometer);
+DistanceCar car(arduino, control, leftOdometer, rightOdometer);
 
 void setup()
 {
diff --git a/examples/Car/SimpleCar/SimpleCar.ino b/examples/Car/SimpleCar/SimpleCar.ino
@@ -1,7 +1,8 @@
 #include <Smartcar.h>
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
 SimpleCar car(control);
diff --git a/examples/Car/SmartCar/SmartCar.ino b/examples/Car/SmartCar/SmartCar.ino
@@ -3,20 +3,27 @@
 const unsigned long PRINT_INTERVAL = 100;
 unsigned long previousPrintout     = 0;
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
-GY50 gyroscope(37);
+GY50 gyroscope(arduino, 37);
 
 const auto pulsesPerMeter = 600;
 
 DirectionlessOdometer leftOdometer(
-    smartcarlib::pins::v2::leftOdometerPin, []() { leftOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::leftOdometerPin,
+    []() { leftOdometer.update(); },
+    pulsesPerMeter);
 DirectionlessOdometer rightOdometer(
-    smartcarlib::pins::v2::rightOdometerPin, []() { rightOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::rightOdometerPin,
+    []() { rightOdometer.update(); },
+    pulsesPerMeter);
 
-SmartCar car(control, gyroscope, leftOdometer, rightOdometer);
+SmartCar car(arduino, control, gyroscope, leftOdometer, rightOdometer);
 
 void setup()
 {
diff --git a/examples/Car/automatedMovements/automatedMovements.ino b/examples/Car/automatedMovements/automatedMovements.ino
@@ -4,20 +4,27 @@ const float carSpeed        = 1.0;
 const long distanceToTravel = 40;
 const int degreesToTurn     = 90;
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
-GY50 gyroscope(37);
+GY50 gyroscope(arduino, 37);
 
 const auto pulsesPerMeter = 600;
 
 DirectionlessOdometer leftOdometer(
-    smartcarlib::pins::v2::leftOdometerPin, []() { leftOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::leftOdometerPin,
+    []() { leftOdometer.update(); },
+    pulsesPerMeter);
 DirectionlessOdometer rightOdometer(
-    smartcarlib::pins::v2::rightOdometerPin, []() { rightOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::rightOdometerPin,
+    []() { rightOdometer.update(); },
+    pulsesPerMeter);
 
-SmartCar car(control, gyroscope, leftOdometer, rightOdometer);
+SmartCar car(arduino, control, gyroscope, leftOdometer, rightOdometer);
 
 void setup()
 {
diff --git a/examples/Car/manualControl/manualControl.ino b/examples/Car/manualControl/manualControl.ino
@@ -5,8 +5,9 @@ const int bSpeed   = -70; // 70% of the full speed backward
 const int lDegrees = -75; // degrees to turn left
 const int rDegrees = 75;  // degrees to turn right
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
 SimpleCar car(control);
diff --git a/examples/Car/manualWithCruiseControl/manualWithCruiseControl.ino b/examples/Car/manualWithCruiseControl/manualWithCruiseControl.ino
@@ -5,18 +5,25 @@ const float bSpeed = -0.5; // a ground speed (m/sec)y for going backward
 const int lDegrees = -75;  // degrees to turn left
 const int rDegrees = 75;   // degrees to turn right
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
 const auto pulsesPerMeter = 600;
 
 DirectionlessOdometer leftOdometer(
-    smartcarlib::pins::v2::leftOdometerPin, []() { leftOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::leftOdometerPin,
+    []() { leftOdometer.update(); },
+    pulsesPerMeter);
 DirectionlessOdometer rightOdometer(
-    smartcarlib::pins::v2::rightOdometerPin, []() { rightOdometer.update(); }, pulsesPerMeter);
+    arduino,
+    smartcarlib::pins::v2::rightOdometerPin,
+    []() { rightOdometer.update(); },
+    pulsesPerMeter);
 
-DistanceCar car(control, leftOdometer, rightOdometer);
+DistanceCar car(arduino, control, leftOdometer, rightOdometer);
 
 void setup()
 {
diff --git a/examples/Car/rotateOnSpot/rotateOnSpot.ino b/examples/Car/rotateOnSpot/rotateOnSpot.ino
@@ -3,11 +3,12 @@
 const int carSpeed         = 80; // 80% of the max speed
 const int GYROSCOPE_OFFSET = 37;
 
-BrushedMotor leftMotor(smartcarlib::pins::v2::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v2::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v2::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v2::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
-GY50 gyroscope(GYROSCOPE_OFFSET);
+GY50 gyroscope(arduino, GYROSCOPE_OFFSET);
 
 HeadingCar car(control, gyroscope);
 
diff --git a/examples/Car/shieldMotorsTest/shieldMotorsTest.ino b/examples/Car/shieldMotorsTest/shieldMotorsTest.ino
@@ -11,8 +11,9 @@
 
 #include <Smartcar.h>
 
-BrushedMotor leftMotor(smartcarlib::pins::v1::leftMotorPins);
-BrushedMotor rightMotor(smartcarlib::pins::v1::rightMotorPins);
+ArduinoRuntime arduino;
+BrushedMotor leftMotor(arduino, smartcarlib::pins::v1::leftMotorPins);
+BrushedMotor rightMotor(arduino, smartcarlib::pins::v1::rightMotorPins);
 DifferentialControl control(leftMotor, rightMotor);
 
 SimpleCar car(control);
diff --git a/examples/sensors/gyroscope/gyroscopeCalibration/gyroscopeCalibration.ino b/examples/sensors/gyroscope/gyroscopeCalibration/gyroscopeCalibration.ino
@@ -1,17 +1,19 @@
 #include <Smartcar.h>
 
-GY50 gyro(0); // Provide the gyroscope with a random offset
+ArduinoRuntime arduino;
+GY50 gyro(arduino, 0); // Provide the gyroscope with a random offset
 
-void setup() {
-  Serial.begin(9600);
-  Serial.println("Calibrating gyroscope, this might take some seconds");
-  int offset = gyro.getOffset();
-  Serial.print("This gyro's offset value is: ");
-  Serial.println(offset);
-  Serial.print("Please initialize Gyroscope with the above value as: GY50 gyro(");
-  Serial.print(offset);
-  Serial.println("); or another similar value that works better according to your experimentation.");
+void setup()
+{
+    Serial.begin(9600);
+    Serial.println("Calibrating gyroscope, this might take some seconds");
+    int offset = gyro.getOffset();
+    Serial.print("This gyro's offset value is: ");
+    Serial.println(offset);
+    Serial.print("Please initialize Gyroscope with the above value as: GY50 gyro(");
+    Serial.print(offset);
+    Serial.println(
+        "); or another similar value that works better according to your experimentation.");
 }
 
-void loop() {
-}
+void loop() {}
diff --git a/examples/sensors/gyroscope/gyroscopeHeading/gyroscopeHeading.ino b/examples/sensors/gyroscope/gyroscopeHeading/gyroscopeHeading.ino
@@ -1,17 +1,20 @@
 #include <Smartcar.h>
 
+ArduinoRuntime arduino;
 // Determine the offset for your gyroscope using the `getOffset` method
 const int GYROSCOPE_OFFSET = 37;
-GY50 gyro(GYROSCOPE_OFFSET);
+GY50 gyro(arduino, GYROSCOPE_OFFSET);
 
-void setup() {
-  Serial.begin(9600);
-  delay(1500);
+void setup()
+{
+    Serial.begin(9600);
+    delay(1500);
 }
 
-void loop() {
-  // Update the readings of the gyroscope
-  // You should have this method being freely executed within your main loop
-  gyro.update();
-  Serial.println(gyro.getHeading());
+void loop()
+{
+    // Update the readings of the gyroscope
+    // You should have this method being freely executed within your main loop
+    gyro.update();
+    Serial.println(gyro.getHeading());
 }
diff --git a/examples/sensors/infrareds/GP2D120/GP2D120.ino b/examples/sensors/infrareds/GP2D120/GP2D120.ino
@@ -1,13 +1,17 @@
 #include <Smartcar.h>
 
-const int SIDE_FRONT_PIN = A0; //you can use only analog enabled pins
-GP2D120 sideFrontIR(SIDE_FRONT_PIN); //measure distances between 5 and 25 centimeters
+const int SIDE_FRONT_PIN = A0; // you can use only analog enabled pins
 
-void setup() {
-  Serial.begin(9600); //start the serial
+ArduinoRuntime arduino;
+GP2D120 sideFrontIR(arduino, SIDE_FRONT_PIN); // measure distances between 5 and 25 centimeters
+
+void setup()
+{
+    Serial.begin(9600); // start the serial
 }
 
-void loop() {
-  Serial.println(sideFrontIR.getDistance());
-  delay(100);
+void loop()
+{
+    Serial.println(sideFrontIR.getDistance());
+    delay(100);
 }
diff --git a/examples/sensors/infrareds/GP2Y0A02/GP2Y0A02.ino b/examples/sensors/infrareds/GP2Y0A02/GP2Y0A02.ino
@@ -1,13 +1,17 @@
 #include <Smartcar.h>
 
 const int SIDE_FRONT_PIN = A0;
-GP2Y0A02 sideFrontIR(SIDE_FRONT_PIN); //measure distances between 25 and 120 centimeters
 
-void setup() {
-  Serial.begin(9600); //start the serial
+ArduinoRuntime arduino;
+GP2Y0A02 sideFrontIR(arduino, SIDE_FRONT_PIN); // measure distances between 25 and 120 centimeters
+
+void setup()
+{
+    Serial.begin(9600); // start the serial
 }
 
-void loop() {
-  Serial.println(sideFrontIR.getDistance());
-  delay(100);
+void loop()
+{
+    Serial.println(sideFrontIR.getDistance());
+    delay(100);
 }
diff --git a/examples/sensors/infrareds/GP2Y0A21/GP2Y0A21.ino b/examples/sensors/infrareds/GP2Y0A21/GP2Y0A21.ino
@@ -1,13 +1,17 @@
 #include <Smartcar.h>
 
 const int SIDE_FRONT_PIN = A0;
-GP2Y0A21 sideFrontIR(SIDE_FRONT_PIN); //measure distances between 12 and 78 centimeters
 
-void setup() {
-  Serial.begin(9600); //start the serial
+ArduinoRuntime arduino;
+GP2Y0A21 sideFrontIR(arduino, SIDE_FRONT_PIN); // measure distances between 12 and 78 centimeters
+
+void setup()
+{
+    Serial.begin(9600); // start the serial
 }
 
-void loop() {
-  Serial.println(sideFrontIR.getDistance());
-  delay(100);
+void loop()
+{
+    Serial.println(sideFrontIR.getDistance());
+    delay(100);
 }
diff --git a/examples/sensors/odometer/directionalOdometers/directionalOdometers.ino b/examples/sensors/odometer/directionalOdometers/directionalOdometers.ino
@@ -3,11 +3,14 @@
 const unsigned long LEFT_PULSES_PER_METER  = 600;
 const unsigned long RIGHT_PULSES_PER_METER = 740;
 
+ArduinoRuntime arduino;
 DirectionalOdometer leftOdometer(
+    arduino,
     smartcarlib::pins::v2::leftOdometerPins,
     []() { leftOdometer.update(); },
     LEFT_PULSES_PER_METER);
 DirectionalOdometer rightOdometer(
+    arduino,
     smartcarlib::pins::v2::rightOdometerPins,
     []() { rightOdometer.update(); },
     RIGHT_PULSES_PER_METER);
diff --git a/examples/sensors/odometer/findPulsesPerMeter/findPulsesPerMeter.ino b/examples/sensors/odometer/findPulsesPerMeter/findPulsesPerMeter.ino
@@ -3,8 +3,9 @@
 const unsigned short odometerPin   = 2;
 const unsigned long pulsesPerMeter = 100;
 
+ArduinoRuntime arduino;
 DirectionlessOdometer odometer(
-    odometerPin, []() { odometer.update(); }, pulsesPerMeter);
+    arduino, odometerPin, []() { odometer.update(); }, pulsesPerMeter);
 
 void setup()
 {
diff --git a/examples/sensors/odometer/singleOdometer/singleOdometer.ino b/examples/sensors/odometer/singleOdometer/singleOdometer.ino
diff --git a/examples/sensors/odometer/twoOdometers/twoOdometers.ino b/examples/sensors/odometer/twoOdometers/twoOdometers.ino
diff --git a/examples/sensors/ultrasounds/SR04/SR04.ino b/examples/sensors/ultrasounds/SR04/SR04.ino
diff --git a/examples/sensors/ultrasounds/SRF08/SRF08.ino b/examples/sensors/ultrasounds/SRF08/SRF08.ino
