Merge branch 'master' of https://github.com/rogerclarkmelbourne/Arduino_STM32

rogerclarkmelbourne · rogerclarkmelbourne · commit 9b70d118b633 · 2017-09-17T18:24:38.000+10:00
diff --git a/STM32F1/libraries/Wire/Wire.cpp b/STM32F1/libraries/Wire/Wire.cpp
@@ -97,7 +97,10 @@ void HardWire::setClock(uint32_t frequencyHz)
 			dev_flags &= ~I2C_FAST_MODE;// clear FAST_MODE bit
 			break;
 	}
-	
+	if (sel_hard->regs->CR1 & I2C_CR1_PE){
+	    i2c_disable(sel_hard);
+	    i2c_master_enable(sel_hard, dev_flags);
+	}
 }
 
 HardWire Wire(1);

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,10 @@ void HardWire::setClock(uint32_t frequencyHz)`
`97`	`97`	`dev_flags &= ~I2C_FAST_MODE;// clear FAST_MODE bit`
`98`	`98`	`break;`
`99`	`99`	`}`
`100`		`-`
	`100`	`+ if (sel_hard->regs->CR1 & I2C_CR1_PE){`
	`101`	`+ i2c_disable(sel_hard);`
	`102`	`+ i2c_master_enable(sel_hard, dev_flags);`
	`103`	`+ }`
`101`	`104`	`}`
`102`	`105`
`103`	`106`	`HardWire Wire(1);`