Getting to compile after rebase

nseidle · nseidle · commit 4519b26fd423 · 2019-07-03T21:17:36.000-06:00
diff --git a/cores/arduino/ard_sup/analog/ap3_analog.cpp b/cores/arduino/ard_sup/analog/ap3_analog.cpp
@@ -239,7 +239,7 @@ ap3_err_t analogReadResolution(uint8_t bits)
         _analogBits = 16; // max out the resolution when this happens
         return AP3_ERR;
     }
-    _analogBits = res;
+    _analogBits = bits;
     return AP3_OK;
 }
 
diff --git a/libraries/Servo/src/Servo.cpp b/libraries/Servo/src/Servo.cpp
@@ -48,11 +48,10 @@ void Servo::write(uint8_t servoPosition)
 	servoWrite(_servoPadNumber, newServoPosition); // This and the above write should both produce 1.5 ms wide pulses, though using different resolutions
 }
 
-void Servo::writeMicroseconds(uint8_t servoPosition)
-{
-
-	servoWrite(_servoPadNumber, newServoPosition); // This and the above write should both produce 1.5 ms wide pulses, though using different resolutions
-}
+// void Servo::writeMicroseconds(uint8_t servoPosition)
+// {
+// 	servoWrite(_servoPadNumber, newServoPosition); // This and the above write should both produce 1.5 ms wide pulses, though using different resolutions
+// }
 
 void Servo::detach(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ ap3_err_t analogReadResolution(uint8_t bits)`
`239`	`239`	`_analogBits = 16; // max out the resolution when this happens`
`240`	`240`	`return AP3_ERR;`
`241`	`241`	`}`
`242`		`- _analogBits = res;`
	`242`	`+ _analogBits = bits;`
`243`	`243`	`return AP3_OK;`
`244`	`244`	`}`
`245`	`245`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,10 @@ void Servo::write(uint8_t servoPosition)`
`48`	`48`	`servoWrite(_servoPadNumber, newServoPosition); // This and the above write should both produce 1.5 ms wide pulses, though using different resolutions`
`49`	`49`	`}`
`50`	`50`
`51`		`-void Servo::writeMicroseconds(uint8_t servoPosition)`
`52`		`-{`
`53`		`-`
`54`		`- servoWrite(_servoPadNumber, newServoPosition); // This and the above write should both produce 1.5 ms wide pulses, though using different resolutions`
`55`		`-}`
	`51`	`+// void Servo::writeMicroseconds(uint8_t servoPosition)`
	`52`	`+// {`
	`53`	`+// servoWrite(_servoPadNumber, newServoPosition); // This and the above write should both produce 1.5 ms wide pulses, though using different resolutions`
	`54`	`+// }`
`56`	`55`
`57`	`56`	`void Servo::detach(void)`
`58`	`57`	`{`