Refactor to build library on esp8266

platisd · platisd · commit 1ae4d992033e · 2019-01-22T20:49:52.000+01:00
Seems like esp8266 uses a rather different g++ so some syntax was
not compatible with it. Interesting to know that compiling in
Arduino IDE for AVR seems to be use a more modern configuration... 😕
diff --git a/.travis.yml b/.travis.yml
@@ -45,6 +45,7 @@ script:
     - build_platform uno
     - build_platform mega2560
     - build_platform leonardo
+    - build_platform esp8266
 
 after_success:
     - bash run_coverage.sh
diff --git a/src/car/distance/DistanceCar.cpp b/src/car/distance/DistanceCar.cpp
@@ -16,10 +16,10 @@ using namespace smartcarlib::utils;
 
 DistanceCar::DistanceCar(Control& control, Odometer& odometer, Runtime& runtime)
     : SimpleCar(control)
-    , mControl{ control }
-    , mOdometerLeft{ odometer }
-    , mOdometerRight{ odometer }
-    , mRuntime{ runtime }
+    , mControl(control)
+    , mOdometerLeft(odometer)
+    , mOdometerRight(odometer)
+    , mRuntime(runtime)
     , mCruiseControlEnabled{ false }
     , mProportional{ 0 }
     , mIntegral{ 0 }
@@ -38,10 +38,10 @@ DistanceCar::DistanceCar(Control& control,
                          Odometer& odometerRight,
                          Runtime& runtime)
     : SimpleCar(control)
-    , mControl{ control }
-    , mOdometerLeft{ odometerLeft }
-    , mOdometerRight{ odometerRight }
-    , mRuntime{ runtime }
+    , mControl(control)
+    , mOdometerLeft(odometerLeft)
+    , mOdometerRight(odometerRight)
+    , mRuntime(runtime)
     , mCruiseControlEnabled{ false }
     , mProportional{ 0 }
     , mIntegral{ 0 }
diff --git a/src/car/heading/HeadingCar.cpp b/src/car/heading/HeadingCar.cpp
@@ -2,7 +2,7 @@
 
 HeadingCar::HeadingCar(Control& control, HeadingSensor& headingSensor)
     : SimpleCar(control)
-    , mHeadingSensor{ headingSensor }
+    , mHeadingSensor(headingSensor)
 {
 }
 
diff --git a/src/car/simple/SimpleCar.cpp b/src/car/simple/SimpleCar.cpp
@@ -5,7 +5,7 @@ using namespace smartcarlib::constants::control;
 using namespace smartcarlib::utils;
 
 SimpleCar::SimpleCar(Control& control)
-    : mControl{ control }
+    : mControl(control)
 {
 }
 
diff --git a/src/control/ackerman/AckermanControl.cpp b/src/control/ackerman/AckermanControl.cpp
@@ -7,8 +7,8 @@ using namespace smartcarlib::constants::control;
 using namespace smartcarlib::constants::motor;
 
 AckermanControl::AckermanControl(Motor& steering, Motor& throttling)
-    : mSteering{ steering }
-    , mThrottling{ throttling }
+    : mSteering(steering)
+    , mThrottling(throttling)
 {
 }
 
diff --git a/src/control/differential/DifferentialControl.cpp b/src/control/differential/DifferentialControl.cpp
@@ -7,8 +7,8 @@ using namespace smartcarlib::constants::control;
 using namespace smartcarlib::constants::motor;
 
 DifferentialControl::DifferentialControl(Motor& leftMotor, Motor& rightMotor)
-    : mLeftMotor{ leftMotor }
-    , mRightMotor{ rightMotor }
+    : mLeftMotor(leftMotor)
+    , mRightMotor(rightMotor)
     , mAngle{ 0 }
     , mSpeed{ 0 }
 {
diff --git a/src/motor/analog/pwm/BrushedMotor.cpp b/src/motor/analog/pwm/BrushedMotor.cpp
@@ -20,7 +20,7 @@ BrushedMotor::BrushedMotor(uint8_t forwardPin,
     : kForwardPin{ forwardPin }
     , kBackwardPin{ backwardPin }
     , kEnablePin{ enablePin }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
     , mAttached{ false }
 {
 }
diff --git a/src/motor/digital/servo/ServoMotor.cpp b/src/motor/digital/servo/ServoMotor.cpp
@@ -13,7 +13,7 @@ ServoMotor::ServoMotor(uint8_t controlPin,
     , kMinPulseLength{ minPulseLength }
     , kIdlePulseLength{ idlePulseLength }
     , kMaxPulseLength{ maxPulseLength }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
     , mAttached{ false }
 {
 }
diff --git a/src/sensors/distance/infrared/analog/InfraredAnalogSensor.cpp b/src/sensors/distance/infrared/analog/InfraredAnalogSensor.cpp
@@ -9,7 +9,7 @@ const unsigned long kMedianMeasurementDelay = 15;
 using namespace smartcarlib::utils;
 
 InfraredAnalogSensor::InfraredAnalogSensor(Runtime& runtime)
-    : mRuntime{ runtime }
+    : mRuntime(runtime)
 {
 }
 
@@ -20,7 +20,7 @@ unsigned int InfraredAnalogSensor::getMedianDistance(uint8_t iterations)
         return -1; // Return a large number to indicate error
     }
 
-    unsigned int measurements[iterations] = { 0 };
+    unsigned int measurements[iterations];
     for (auto i = 0; i < iterations; i++)
     {
         measurements[i] = getDistance();
diff --git a/src/sensors/distance/infrared/analog/sharp/GP2D120.cpp b/src/sensors/distance/infrared/analog/sharp/GP2D120.cpp
@@ -9,7 +9,7 @@ const auto kMaxDistance = 25; // GP2D120's maximum distance
 GP2D120::GP2D120(uint8_t pin, Runtime& runtime)
     : InfraredAnalogSensor(runtime)
     , kPin{ pin }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
 {
 }
 
diff --git a/src/sensors/distance/infrared/analog/sharp/GP2Y0A02.cpp b/src/sensors/distance/infrared/analog/sharp/GP2Y0A02.cpp
@@ -9,7 +9,7 @@ const auto kMaxDistance = 120; // GP2Y0A02's maximum distance
 GP2Y0A02::GP2Y0A02(uint8_t pin, Runtime& runtime)
     : InfraredAnalogSensor(runtime)
     , kPin{ pin }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
 {
 }
 
diff --git a/src/sensors/distance/infrared/analog/sharp/GP2Y0A21.cpp b/src/sensors/distance/infrared/analog/sharp/GP2Y0A21.cpp
@@ -9,7 +9,7 @@ const auto kMaxDistance = 78; // GP2Y0A21's maximum distance
 GP2Y0A21::GP2Y0A21(uint8_t pin, Runtime& runtime)
     : InfraredAnalogSensor(runtime)
     , kPin{ pin }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
 {
 }
 
diff --git a/src/sensors/distance/ultrasound/i2c/SRF08.cpp b/src/sensors/distance/ultrasound/i2c/SRF08.cpp
@@ -16,7 +16,7 @@ using namespace smartcarlib::utils;
 
 SRF08::SRF08(uint8_t address, Runtime& runtime)
     : mAddress{ address }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
     , mPingDelay{ kDefaultPingDelay }
     , mAttached{ false }
 {
@@ -65,7 +65,7 @@ unsigned int SRF08::getMedianDistance(uint8_t iterations)
         return -1; // Return a large number to indicate error
     }
 
-    unsigned int measurements[iterations] = { 0 };
+    unsigned int measurements[iterations];
     for (auto i = 0; i < iterations; i++)
     {
         measurements[i] = getDistance();
diff --git a/src/sensors/distance/ultrasound/ping/SR04.cpp b/src/sensors/distance/ultrasound/ping/SR04.cpp
@@ -21,7 +21,7 @@ SR04::SR04(uint8_t triggerPin, uint8_t echoPin, unsigned int maxDistance, Runtim
     , kEchoPin{ echoPin }
     , kMaxDistance{ maxDistance > 0 ? maxDistance : kDefaultMaxDistance }
     , kTimeout{ kMaxDistance * kTimeToMeasureOneCm }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
     , mAttached{ false }
 {
 }
@@ -61,7 +61,7 @@ unsigned int SR04::getMedianDistance(uint8_t iterations)
         return kError;
     }
 
-    unsigned int measurements[iterations] = { 0 };
+    unsigned int measurements[iterations];
     for (auto i = 0; i < iterations; i++)
     {
         measurements[i] = getDistance();
diff --git a/src/sensors/heading/gyroscope/GY50.cpp b/src/sensors/heading/gyroscope/GY50.cpp
@@ -18,7 +18,7 @@ using namespace smartcarlib::constants::gy50;
 GY50::GY50(int offset, unsigned long samplingInterval, Runtime& runtime)
     : kOffset{ offset }
     , kSamplingInterval{ samplingInterval }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
     , mPreviousSample{ 0 }
     , mAttached{ false }
     , mAngularDisplacement{ 0 }
diff --git a/src/sensors/odometer/interrupt/DirectionalOdometer.cpp b/src/sensors/odometer/interrupt/DirectionalOdometer.cpp
@@ -14,7 +14,7 @@ DirectionalOdometer::DirectionalOdometer(uint8_t directionPin,
     : DirectionlessOdometer(pulsesPerMeter, runtime)
     , mDirectionPin{ directionPin }
     , mPinStateWhenForward{ pinStateWhenForward }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
     , mNegativePulsesCounter{ 0 }
 {
 }
diff --git a/src/sensors/odometer/interrupt/DirectionlessOdometer.cpp b/src/sensors/odometer/interrupt/DirectionlessOdometer.cpp
@@ -22,7 +22,7 @@ DirectionlessOdometer::DirectionlessOdometer(unsigned long pulsesPerMeter, Runti
                                       lroundf(kMillimetersInMeter / pulsesPerMeter))
                                 : static_cast<unsigned long>(
                                       lroundf(kMillimetersInMeter / kDefaultPulsesPerMeter)) }
-    , mRuntime{ runtime }
+    , mRuntime(runtime)
     , mPin{ 0 }
     , mSensorAttached{ false }
     , mPulsesCounter{ 0 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`HeadingCar::HeadingCar(Control& control, HeadingSensor& headingSensor)`
`4`	`4`	`: SimpleCar(control)`
`5`		`- , mHeadingSensor{ headingSensor }`
	`5`	`+ , mHeadingSensor(headingSensor)`
`6`	`6`	`{`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ using namespace smartcarlib::constants::control;`
`5`	`5`	`using namespace smartcarlib::utils;`
`6`	`6`
`7`	`7`	`SimpleCar::SimpleCar(Control& control)`
`8`		`- : mControl{ control }`
	`8`	`+ : mControl(control)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ using namespace smartcarlib::constants::control;`
`7`	`7`	`using namespace smartcarlib::constants::motor;`
`8`	`8`
`9`	`9`	`AckermanControl::AckermanControl(Motor& steering, Motor& throttling)`
`10`		`- : mSteering{ steering }`
`11`		`- , mThrottling{ throttling }`
	`10`	`+ : mSteering(steering)`
	`11`	`+ , mThrottling(throttling)`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ BrushedMotor::BrushedMotor(uint8_t forwardPin,`
`20`	`20`	`: kForwardPin{ forwardPin }`
`21`	`21`	`, kBackwardPin{ backwardPin }`
`22`	`22`	`, kEnablePin{ enablePin }`
`23`		`- , mRuntime{ runtime }`
	`23`	`+ , mRuntime(runtime)`
`24`	`24`	`, mAttached{ false }`
`25`	`25`	`{`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ ServoMotor::ServoMotor(uint8_t controlPin,`
`13`	`13`	`, kMinPulseLength{ minPulseLength }`
`14`	`14`	`, kIdlePulseLength{ idlePulseLength }`
`15`	`15`	`, kMaxPulseLength{ maxPulseLength }`
`16`		`- , mRuntime{ runtime }`
	`16`	`+ , mRuntime(runtime)`
`17`	`17`	`, mAttached{ false }`
`18`	`18`	`{`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const unsigned long kMedianMeasurementDelay = 15;`
`9`	`9`	`using namespace smartcarlib::utils;`
`10`	`10`
`11`	`11`	`InfraredAnalogSensor::InfraredAnalogSensor(Runtime& runtime)`
`12`		`- : mRuntime{ runtime }`
	`12`	`+ : mRuntime(runtime)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`@@ -20,7 +20,7 @@ unsigned int InfraredAnalogSensor::getMedianDistance(uint8_t iterations)`
`20`	`20`	`return -1; // Return a large number to indicate error`
`21`	`21`	`}`
`22`	`22`
`23`		`- unsigned int measurements[iterations] = { 0 };`
	`23`	`+ unsigned int measurements[iterations];`
`24`	`24`	`for (auto i = 0; i < iterations; i++)`
`25`	`25`	`{`
`26`	`26`	`measurements[i] = getDistance();`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const auto kMaxDistance = 25; // GP2D120's maximum distance`
`9`	`9`	`GP2D120::GP2D120(uint8_t pin, Runtime& runtime)`
`10`	`10`	`: InfraredAnalogSensor(runtime)`
`11`	`11`	`, kPin{ pin }`
`12`		`- , mRuntime{ runtime }`
	`12`	`+ , mRuntime(runtime)`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`