mirror of https://github.com/noisymime/Arduino.git
Removing hardcoded CPU speed from Wire library.
Replacing CPU_FREQ with F_CPU.
This commit is contained in:
parent
1747292711
commit
57b4b0e10d
|
@ -79,7 +79,7 @@ void twi_init(void)
|
||||||
// initialize twi prescaler and bit rate
|
// initialize twi prescaler and bit rate
|
||||||
cbi(TWSR, TWPS0);
|
cbi(TWSR, TWPS0);
|
||||||
cbi(TWSR, TWPS1);
|
cbi(TWSR, TWPS1);
|
||||||
TWBR = ((CPU_FREQ / TWI_FREQ) - 16) / 2;
|
TWBR = ((F_CPU / TWI_FREQ) - 16) / 2;
|
||||||
|
|
||||||
/* twi bit rate formula from atmega128 manual pg 204
|
/* twi bit rate formula from atmega128 manual pg 204
|
||||||
SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))
|
SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR))
|
||||||
|
|
|
@ -24,10 +24,6 @@
|
||||||
|
|
||||||
//#define ATMEGA8
|
//#define ATMEGA8
|
||||||
|
|
||||||
#ifndef CPU_FREQ
|
|
||||||
#define CPU_FREQ 16000000L
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef TWI_FREQ
|
#ifndef TWI_FREQ
|
||||||
#define TWI_FREQ 100000L
|
#define TWI_FREQ 100000L
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue