diff options
| author | yiancar <yiangosyiangou@cytanet.com.cy> | 2018-08-28 16:03:11 +0300 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-08-28 09:03:11 -0400 |
| commit | fdd0f915271f79b104aa5d216566bcc3fd134e85 (patch) | |
| tree | 42656e9ebd132461b99d7b037563374e575053ae /drivers/arm/i2c_master.c | |
| parent | 2410f023598af65a551b42f569a2703a5621bdca (diff) | |
| download | qmk_firmware-fdd0f915271f79b104aa5d216566bcc3fd134e85.tar.gz qmk_firmware-fdd0f915271f79b104aa5d216566bcc3fd134e85.zip | |
ISSI31FL3733 driver (#3679)
* ISSI31FL3733 driver
- Addapted IS31 driver for the above driver
* fix my branch
* ISSI31FL3733 driver
- Inclusion of above ISSI led driver
* IS31fl3733 driver
- Added correct function for control registers
* Finalized support for ISSI31fl3733 led driver
- Finalized and tested driver.
- Modified i2c_master for arm due to declaration mistake.
- Fixed spaces/tabs in quantum.h file.
- Fixed spaces/tabs in common_features.mk file.
- Removed unnecessary includes from rgb_matrix.c file.
- Added local definitions for MIN and MAX macros in rgb_matrix.c file.
- Adjusted chevron effect.
- Added necessary define (RGB_3733_MATRIX_ENABLE) for makefile.
- Added necessary C define (ISSI3733) to aid with inclusion of the correct header file.
- Added documentation for the new driver.
* Driver structure update
- Changed rule includes to be more condensed (RGB_MATRIX_ENABLE = IS31FL3731) and (RGB_MATRIX_ENABLE = IS31FL3733)
- Updated documentation
- Reverted to the use of differently named functions for each driver and selecting the needed ones within rgb_matrix.c
* ISSI Drivers refractoring
- Moved issi drivers in a dedicated folder
- Updated documentation
* I2C library fix
I released the special pins incorrectly before. It is now fixed.
Diffstat (limited to 'drivers/arm/i2c_master.c')
| -rw-r--r-- | drivers/arm/i2c_master.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/arm/i2c_master.c b/drivers/arm/i2c_master.c index 2fdd9f65e..2a7badd35 100644 --- a/drivers/arm/i2c_master.c +++ b/drivers/arm/i2c_master.c | |||
| @@ -15,12 +15,14 @@ | |||
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | /* This library follows the convention of the AVR i2c_master library. | 18 | /* This library is only valid for STM32 processors. |
| 19 | * This library follows the convention of the AVR i2c_master library. | ||
| 19 | * As a result addresses are expected to be already shifted (addr << 1). | 20 | * As a result addresses are expected to be already shifted (addr << 1). |
| 20 | * I2CD1 is the default driver which corresponds to pins B6 and B7. This | 21 | * I2CD1 is the default driver which corresponds to pins B6 and B7. This |
| 21 | * can be changed. | 22 | * can be changed. |
| 22 | * Please ensure that HAL_USE_I2C is TRUE in the halconf.h file and that | 23 | * Please ensure that HAL_USE_I2C is TRUE in the halconf.h file and that |
| 23 | * STM32_I2C_USE_I2C1 is TRUE in the mcuconf.h file. | 24 | * STM32_I2C_USE_I2C1 is TRUE in the mcuconf.h file. Pins B6 and B7 are used |
| 25 | * but using any other I2C pins should be trivial. | ||
| 24 | */ | 26 | */ |
| 25 | 27 | ||
| 26 | #include "i2c_master.h" | 28 | #include "i2c_master.h" |
| @@ -41,7 +43,7 @@ static const I2CConfig i2cconfig = { | |||
| 41 | 43 | ||
| 42 | void i2c_init(void) | 44 | void i2c_init(void) |
| 43 | { | 45 | { |
| 44 | palSetGroupMode(GPIOB,6,7, PAL_MODE_INPUT); // Try releasing special pins for a short time | 46 | palSetGroupMode(GPIOB, GPIOB_PIN6 | GPIOB_PIN7, 0, PAL_MODE_INPUT); // Try releasing special pins for a short time |
| 45 | chThdSleepMilliseconds(10); | 47 | chThdSleepMilliseconds(10); |
| 46 | 48 | ||
| 47 | palSetPadMode(GPIOB, 6, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); | 49 | palSetPadMode(GPIOB, 6, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); |
| @@ -82,12 +84,12 @@ uint8_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t l | |||
| 82 | { | 84 | { |
| 83 | complete_packet[i+1] = data[i]; | 85 | complete_packet[i+1] = data[i]; |
| 84 | } | 86 | } |
| 85 | complete_packet[0] = regaddr | 87 | complete_packet[0] = regaddr; |
| 86 | 88 | ||
| 87 | return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 1, 0, 0, MS2ST(timeout)); | 89 | return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 1, 0, 0, MS2ST(timeout)); |
| 88 | } | 90 | } |
| 89 | 91 | ||
| 90 | uint8_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout) | 92 | uint8_t i2c_readReg(uint8_t devaddr, uint8_t* regaddr, uint8_t* data, uint16_t length, uint16_t timeout) |
| 91 | { | 93 | { |
| 92 | i2c_address = devaddr; | 94 | i2c_address = devaddr; |
| 93 | i2cStart(&I2C_DRIVER, &i2cconfig); | 95 | i2cStart(&I2C_DRIVER, &i2cconfig); |
| @@ -97,7 +99,6 @@ uint8_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t le | |||
| 97 | // This is usually not needed. It releases the driver to allow pins to become GPIO again. | 99 | // This is usually not needed. It releases the driver to allow pins to become GPIO again. |
| 98 | uint8_t i2c_stop(uint16_t timeout) | 100 | uint8_t i2c_stop(uint16_t timeout) |
| 99 | { | 101 | { |
| 100 | i2c_address = address; | ||
| 101 | i2cStop(&I2C_DRIVER); | 102 | i2cStop(&I2C_DRIVER); |
| 102 | return 0; | 103 | return 0; |
| 103 | } | 104 | } |
