diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-13 18:51:35 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-13 18:51:35 +0000 |
| commit | 25a1cb5a15d201bc4e9b6a8e520ecd2d085699c8 (patch) | |
| tree | b403829df180da7e9165591ef8fe493e93d30f4c | |
| parent | 11ee2736bd4a68d24d107c9daf6877e488c0b168 (diff) | |
| parent | 70f40339c2b4431dbbafa5d9439c04f9a0d47884 (diff) | |
| download | qmk_firmware-25a1cb5a15d201bc4e9b6a8e520ecd2d085699c8.tar.gz qmk_firmware-25a1cb5a15d201bc4e9b6a8e520ecd2d085699c8.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | docs/eeprom_driver.md | 1 | ||||
| -rw-r--r-- | drivers/eeprom/eeprom_i2c.h | 5 | ||||
| -rw-r--r-- | keyboards/xelus/valor_frl_tkl/config.h | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/docs/eeprom_driver.md b/docs/eeprom_driver.md index 188b95caa..e2c262546 100644 --- a/docs/eeprom_driver.md +++ b/docs/eeprom_driver.md | |||
| @@ -40,6 +40,7 @@ Module | Equivalent `#define` | Source | |||
| 40 | -----------------|---------------------------------|------------------------------------------ | 40 | -----------------|---------------------------------|------------------------------------------ |
| 41 | CAT24C512 EEPROM | `#define EEPROM_I2C_CAT24C512` | <https://www.sparkfun.com/products/14764> | 41 | CAT24C512 EEPROM | `#define EEPROM_I2C_CAT24C512` | <https://www.sparkfun.com/products/14764> |
| 42 | RM24C512C EEPROM | `#define EEPROM_I2C_RM24C512C` | <https://www.sparkfun.com/products/14764> | 42 | RM24C512C EEPROM | `#define EEPROM_I2C_RM24C512C` | <https://www.sparkfun.com/products/14764> |
| 43 | 24LC64 EEPROM | `#define EEPROM_I2C_24LC64` | <https://www.microchip.com/wwwproducts/en/24LC64> | ||
| 43 | 24LC128 EEPROM | `#define EEPROM_I2C_24LC128` | <https://www.microchip.com/wwwproducts/en/24LC128> | 44 | 24LC128 EEPROM | `#define EEPROM_I2C_24LC128` | <https://www.microchip.com/wwwproducts/en/24LC128> |
| 44 | 24LC256 EEPROM | `#define EEPROM_I2C_24LC256` | <https://www.sparkfun.com/products/525> | 45 | 24LC256 EEPROM | `#define EEPROM_I2C_24LC256` | <https://www.sparkfun.com/products/525> |
| 45 | MB85RC256V FRAM | `#define EEPROM_I2C_MB85RC256V` | <https://www.adafruit.com/product/1895> | 46 | MB85RC256V FRAM | `#define EEPROM_I2C_MB85RC256V` | <https://www.adafruit.com/product/1895> |
diff --git a/drivers/eeprom/eeprom_i2c.h b/drivers/eeprom/eeprom_i2c.h index 51bce825b..77eea66d6 100644 --- a/drivers/eeprom/eeprom_i2c.h +++ b/drivers/eeprom/eeprom_i2c.h | |||
| @@ -49,6 +49,11 @@ | |||
| 49 | # define EXTERNAL_EEPROM_PAGE_SIZE 64 | 49 | # define EXTERNAL_EEPROM_PAGE_SIZE 64 |
| 50 | # define EXTERNAL_EEPROM_ADDRESS_SIZE 2 | 50 | # define EXTERNAL_EEPROM_ADDRESS_SIZE 2 |
| 51 | # define EXTERNAL_EEPROM_WRITE_TIME 5 | 51 | # define EXTERNAL_EEPROM_WRITE_TIME 5 |
| 52 | #elif defined(EEPROM_I2C_24LC64) | ||
| 53 | # define EXTERNAL_EEPROM_BYTE_COUNT 8192 | ||
| 54 | # define EXTERNAL_EEPROM_PAGE_SIZE 32 | ||
| 55 | # define EXTERNAL_EEPROM_ADDRESS_SIZE 2 | ||
| 56 | # define EXTERNAL_EEPROM_WRITE_TIME 5 | ||
| 52 | #elif defined(EEPROM_I2C_MB85RC256V) | 57 | #elif defined(EEPROM_I2C_MB85RC256V) |
| 53 | # define EXTERNAL_EEPROM_BYTE_COUNT 32768 | 58 | # define EXTERNAL_EEPROM_BYTE_COUNT 32768 |
| 54 | # define EXTERNAL_EEPROM_PAGE_SIZE 128 | 59 | # define EXTERNAL_EEPROM_PAGE_SIZE 128 |
diff --git a/keyboards/xelus/valor_frl_tkl/config.h b/keyboards/xelus/valor_frl_tkl/config.h index ad29555ec..ff2ea6dd0 100644 --- a/keyboards/xelus/valor_frl_tkl/config.h +++ b/keyboards/xelus/valor_frl_tkl/config.h | |||
| @@ -61,10 +61,7 @@ | |||
| 61 | 61 | ||
| 62 | // I2C EEPROM | 62 | // I2C EEPROM |
| 63 | // 24LC64 | 63 | // 24LC64 |
| 64 | #define EXTERNAL_EEPROM_BYTE_COUNT 65535 | 64 | #define EEPROM_I2C_24LC64 |
| 65 | #define EXTERNAL_EEPROM_PAGE_SIZE 32 | ||
| 66 | #define EXTERNAL_EEPROM_ADDRESS_SIZE 2 | ||
| 67 | #define EXTERNAL_EEPROM_WRITE_TIME 5 | ||
| 68 | 65 | ||
| 69 | // Dynamic EEPROM | 66 | // Dynamic EEPROM |
| 70 | // Something sensible or else VIA may crash | 67 | // Something sensible or else VIA may crash |