diff options
| author | William Chang <william@factual.com> | 2019-07-13 10:18:33 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-07-13 10:18:33 -0700 |
| commit | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (patch) | |
| tree | 3bb3e5e496621535611e087720aa5c4d7a533e5e /quantum/split_common | |
| parent | 86ad4988fe7ff64916127509d84f44c56fa097aa (diff) | |
| parent | da1f05fbc19477c05c0c01bb07fabfaf1ece9d54 (diff) | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'quantum/split_common')
| -rw-r--r-- | quantum/split_common/post_config.h | 4 | ||||
| -rw-r--r-- | quantum/split_common/transport.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/quantum/split_common/post_config.h b/quantum/split_common/post_config.h index 0e59df3d06..ff0fc5e193 100644 --- a/quantum/split_common/post_config.h +++ b/quantum/split_common/post_config.h @@ -4,6 +4,10 @@ #define RGBLIGHT_SPLIT #endif + #ifndef F_SCL + #define F_SCL 100000UL // SCL frequency + #endif + #else // use serial // When using serial, the user must define RGBLIGHT_SPLIT explicitly // in config.h as needed. diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c index a3539576f5..b32d48eb88 100644 --- a/quantum/split_common/transport.c +++ b/quantum/split_common/transport.c @@ -74,7 +74,7 @@ bool transport_master(matrix_row_t matrix[]) { # endif # ifdef ENCODER_ENABLE - i2c_readReg(SLAVE_I2C_ADDRESS, I2C_ENCODER_START, (void *)i2c_buffer->encoder_state, sizeof(I2C_slave_buffer_t.encoder_state), TIMEOUT); + i2c_readReg(SLAVE_I2C_ADDRESS, I2C_ENCODER_START, (void *)i2c_buffer->encoder_state, sizeof(i2c_buffer->encoder_state), TIMEOUT); encoder_update_raw(i2c_buffer->encoder_state); # endif |