diff options
| author | Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> | 2019-08-31 02:47:11 +0200 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2019-10-01 10:21:12 +0900 |
| commit | 6eae35c3c0d4707184aa9bceda5dd5381b1ad2d2 (patch) | |
| tree | 5c34be35b2fb63f93135f45cac885d78e8023c67 | |
| parent | d978c59b52642b1ae048bfec84793e16afca015e (diff) | |
Removed prescaler define from avr i2c, as it was impossible to use (#6617)
| -rw-r--r-- | docs/ChangeLog/20190830/PR4871.md | 4 | ||||
| -rw-r--r-- | docs/ChangeLog/20190830/PR6245.md | 5 | ||||
| -rw-r--r-- | drivers/avr/i2c_master.c | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/docs/ChangeLog/20190830/PR4871.md b/docs/ChangeLog/20190830/PR4871.md deleted file mode 100644 index e4ea171d7a..0000000000 --- a/docs/ChangeLog/20190830/PR4871.md +++ /dev/null @@ -1,4 +0,0 @@ -* LUFA USB descriptor cleanup - * Some code cleanups related to the USB HID descriptors on AVR keyboards, to make them easier to read and understand - * More information: see https://github.com/qmk/qmk_firmware/pull/4871 - * No behaviour changes anticipated and no keymaps modified diff --git a/docs/ChangeLog/20190830/PR6245.md b/docs/ChangeLog/20190830/PR6245.md deleted file mode 100644 index 62e71eee9e..0000000000 --- a/docs/ChangeLog/20190830/PR6245.md +++ /dev/null @@ -1,5 +0,0 @@ -* Update repo to use LUFA as a git submodule - * `/lib/LUFA` removed from the repo - * LUFA set as a submodule, pointing to qmk/lufa - * This should allow more flexibility with LUFA, and allow us to keep the sub-module up to date, a lot more easily. It was ~2 years out of date with no easy path to fix that. This prevents that from being an issue in the future - diff --git a/drivers/avr/i2c_master.c b/drivers/avr/i2c_master.c index 52924437e0..c084d5754f 100644 --- a/drivers/avr/i2c_master.c +++ b/drivers/avr/i2c_master.c @@ -27,8 +27,8 @@ #ifndef F_SCL # define F_SCL 400000UL // SCL frequency #endif -#define Prescaler 1 -#define TWBR_val ((((F_CPU / F_SCL) / Prescaler) - 16) / 2) + +#define TWBR_val (((F_CPU / F_SCL) - 16) / 2) void i2c_init(void) { TWSR = 0; /* no prescaler */ |