Update mock/test to use Adafruit library instead

Author: Marcus Sonestedt

ServoPID.sln

@@ -14,6 +14,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		servopid.ino = servopid.ino
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adafruit-PWM-Servo-Driver", "Adafruit-PWM-Servo-Driver", "{09887C7C-D3AA-455B-B617-DCAFE1D65349}"
+	ProjectSection(SolutionItems) = preProject
+		Adafruit-PWM-Servo-Driver-Library\Adafruit_PWMServoDriver.cpp = Adafruit-PWM-Servo-Driver-Library\Adafruit_PWMServoDriver.cpp
+		Adafruit-PWM-Servo-Driver-Library\Adafruit_PWMServoDriver.h = Adafruit-PWM-Servo-Driver-Library\Adafruit_PWMServoDriver.h
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

ServoPID.sln.DotSettings

@@ -5,5 +5,10 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CppFormatting/NAMESPACE_INDENTATION/@EntryValue">Inner</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CppFormatting/OUTDENT_COMMAS/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECpp_002ECodeStyle_002ESettingsUpgrade_002EFunctionReturnStyleSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Adafruit/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=addr/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Arduino/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=coeff/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=caddr/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=coeff/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=prescale/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=totempole/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

TestServoPID/ArduinoMock.h

@@ -15,7 +15,9 @@ extern std::vector<int> gAnalogPins;
 
 }
 inline unsigned long micros() { return mock::gMicros; }
-inline void setMockMicros(const unsigned long value) { mock::gMicros = value;}
+inline void setMockMicros(const unsigned long value) { mock::gMicros = value; }
+
+inline void delay(int ms) {};
 
 inline int analogRead(const int pin) { return mock::gAnalogPins.at(pin);}
 inline void setMockAnalogRead(const int pin, const int value)

TestServoPID/TestServoPID.vcxproj

@@ -160,6 +160,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="AdafruitPwmServoDriverMock.cpp" />
     <ClCompile Include="TestPID.cpp" />
     <ClCompile Include="TestSerial.cpp" />
     <ClCompile Include="TestSetupAndLoop.cpp" />
@@ -168,6 +169,7 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="AdafruitPwmServoDriverMock.h" />
     <ClInclude Include="ArduinoMock.h" />
     <ClInclude Include="PCA9685Mock.h" />
     <ClInclude Include="pch.h" />

TestServoPID/TestServoPID.vcxproj.filters

@@ -36,6 +36,9 @@
     <ClCompile Include="TestSetupAndLoop.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="AdafruitPwmServoDriverMock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />
@@ -50,5 +53,8 @@
     <ClInclude Include="PCA9685Mock.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="AdafruitPwmServoDriverMock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

servopid.ino

@@ -1,21 +1,21 @@
 #define USE_PCA9685 1 // set 0 to use Arduino to directly control servos
 
-#ifndef ARDUINO
-#include "ArduinoMock.h"
-
-namespace
-{
-#if USE_PCA9685 == 1
-    #include "PCA9685Mock.h"
-#endif
-
-#else
+#ifdef ARDUINO
 #if USE_PCA9685 == 1
      #include <Wire.h>
      #include <Adafruit_PWMServoDriver.h>
 #else
      #include <Servo.h>
 #endif
+#else
+#include "TestServoPID/ArduinoMock.h"
+
+#if USE_PCA9685 == 1
+    #include "TestServoPID/AdafruitPwmServoDriverMock.h"
+#endif
+
+namespace
+{
 #endif
 
 // PID regulator, incl low-pass lambda filter on D part
@@ -121,7 +121,7 @@ public:
     {
         const auto cAngle = constrain(angle, float(MinAngle), float(MaxAngle));
         const auto pwm = _pwmMin + (_pwmMax - _pwmMin) * cAngle / (float(MaxAngle) - float(MinAngle));
-        gPwmController.setPWM(_pin, 0, pwm);
+        gPwmController.setPWM(_pin, 0, uint16_t(pwm));
     }
 
 private: