kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 14:03:55 +01:00
Code Releases Activity

Merge pull request #7788 from miri64/ds1307/fix/init-error

Browse Source 
ds1307: return error when nothing is read or written on initialization
This commit is contained in:
Hauke Petersen 2017-10-24 13:25:03 +02:00 committed by GitHub
commit 8fb310648f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ds1307/ds1307.c
View File

@ -64,7 +64,7 @@ int ds1307_init(ds1307_t *dev, const ds1307_params_t *params)
}
/* normalize hour format */
res = i2c_read_reg(dev->i2c, DS1307_I2C_ADDRESS, DS1307_REG_HOUR, &hour);
if (res < 0) {
if (res <= 0) { /* should be 1 if device is connected */
i2c_release(dev->i2c);
DEBUG("ds1307: Error reading HOUR register on init: %i\n", res);
return -1;
@ -73,7 +73,7 @@ int ds1307_init(ds1307_t *dev, const ds1307_params_t *params)
_convert_12_to_24(hour));
i2c_release(dev->i2c);
if (res < 0) {
if (res <= 0) {
DEBUG("ds1307: Error writing HOUR register on init: %i\n", res);
return -1;
}

3
tests/driver_ds1307/tests/01-run.py
View File

@ -13,7 +13,8 @@ sys.path.append(os.path.join(os.environ['RIOTBASE'], 'dist/tools/testrunner'))
import testrunner
def testfunc(child):
child.expect(u"OK \\([0-9]+ tests\\)")
child.expect([r"OK \([0-9]+ tests\)",
r"error: unable to initialize RTC \[I2C initialization error\]"])
if __name__ == "__main__":
sys.exit(testrunner.run(testfunc))