Merge pull request #2 from ws0w/master

Jim Lindblom · web-flow · commit 10d0b4228119 · 2016-12-06T10:34:03.000-07:00
Fix bug in update that masked 2s from the tens digit for hours.
diff --git a/src/SparkFunDS1307RTC.cpp b/src/SparkFunDS1307RTC.cpp
@@ -162,8 +162,8 @@ bool DS1307::update(void)
 				_pm = true;
 			else
 				_pm = false;
+			_time[TIME_HOURS] &= 0x1F; // Mask out 24-hour bit from hours
 		}
-		_time[TIME_HOURS] &= 0x1F; // Mask out 24-hour bit from hours
 		
 		return true;
 	}
@@ -496,4 +496,4 @@ bool DS1307::i2cReadBytes(uint8_t deviceAddress, ds1307_registers reg, uint8_t *
 	return true;  
 }
 
-DS1307 rtc; // Use rtc in sketches
+DS1307 rtc; // Use rtc in sketches

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,8 @@ bool DS1307::update(void)`
`162`	`162`	`_pm = true;`
`163`	`163`	`else`
`164`	`164`	`_pm = false;`
	`165`	`+ _time[TIME_HOURS] &= 0x1F; // Mask out 24-hour bit from hours`
`165`	`166`	`}`
`166`		`- _time[TIME_HOURS] &= 0x1F; // Mask out 24-hour bit from hours`
`167`	`167`
`168`	`168`	`return true;`
`169`	`169`	`}`
`@@ -496,4 +496,4 @@ bool DS1307::i2cReadBytes(uint8_t deviceAddress, ds1307_registers reg, uint8_t *`
`496`	`496`	`return true;`
`497`	`497`	`}`
`498`	`498`
`499`		`-DS1307 rtc; // Use rtc in sketches`
	`499`	`+DS1307 rtc; // Use rtc in sketches`