diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-18 17:29:08 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-18 17:29:08 +0000 |
| commit | 06f9297f9468a48c8be53c48b830e1eaa9a1665d (patch) | |
| tree | 7f43f28337b5b54498fab492bc53dfa91ffca9c1 /drivers | |
| parent | 115b60b0e11f8661385b2219ce5ddbf2982b1f8c (diff) | |
| parent | a9f7d4dccc9cd0351658e64d5fbc809c93ac9b46 (diff) | |
| download | qmk_firmware-06f9297f9468a48c8be53c48b830e1eaa9a1665d.tar.gz qmk_firmware-06f9297f9468a48c8be53c48b830e1eaa9a1665d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/haptic/DRV2605L.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/haptic/DRV2605L.c b/drivers/haptic/DRV2605L.c index 830d629da..5de2b354c 100644 --- a/drivers/haptic/DRV2605L.c +++ b/drivers/haptic/DRV2605L.c | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | #include <math.h> | 21 | #include <math.h> |
| 22 | 22 | ||
| 23 | uint8_t DRV2605L_transfer_buffer[2]; | 23 | uint8_t DRV2605L_transfer_buffer[2]; |
| 24 | uint8_t DRV2605L_tx_register[0]; | ||
| 25 | uint8_t DRV2605L_read_buffer[0]; | ||
| 26 | uint8_t DRV2605L_read_register; | 24 | uint8_t DRV2605L_read_register; |
| 27 | 25 | ||
| 28 | void DRV_write(uint8_t drv_register, uint8_t settings) { | 26 | void DRV_write(uint8_t drv_register, uint8_t settings) { |
| @@ -32,8 +30,7 @@ void DRV_write(uint8_t drv_register, uint8_t settings) { | |||
| 32 | } | 30 | } |
| 33 | 31 | ||
| 34 | uint8_t DRV_read(uint8_t regaddress) { | 32 | uint8_t DRV_read(uint8_t regaddress) { |
| 35 | i2c_readReg(DRV2605L_BASE_ADDRESS << 1, regaddress, DRV2605L_read_buffer, 1, 100); | 33 | i2c_readReg(DRV2605L_BASE_ADDRESS << 1, regaddress, &DRV2605L_read_register, 1, 100); |
| 36 | DRV2605L_read_register = (uint8_t)DRV2605L_read_buffer[0]; | ||
| 37 | 34 | ||
| 38 | return DRV2605L_read_register; | 35 | return DRV2605L_read_register; |
| 39 | } | 36 | } |