Giles Barton-Owen / PWMAverage

A PWM/duty cycle measurement library using Timer2

Dependents:   PWMAverage_test pwm_duty_measurement

Diff: PWMAverage.h

Revision:
4:a3d3a60e30b7
Parent:
2:449ea283d634
--- a/PWMAverage.h	Wed Aug 29 11:47:48 2012 +0000
+++ b/PWMAverage.h	Wed Aug 29 12:02:45 2012 +0000
@@ -35,7 +35,11 @@
 
 /** A class for measuring PWM/Duty cycle of a signal connected to pins 30 and 29
  *
+<<<<<<< local
  * Example:
+=======
+ *
+>>>>>>> other
  * @code
  * // Measure and print the average duty cycle of a signal connected to p29 and p30 (together) while the button (p16) is pulled high
  *