aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGravatar skullY <skullydazed@gmail.com>2019-01-26 21:25:59 -0800
committerGravatar skullydazed <skullydazed@users.noreply.github.com>2019-02-10 15:37:12 -0800
commit6b74dd6de5359da18e87b2d4894e3ffc3fc89d47 (patch)
treed4b467f032aadac477c4c2fb21d17a6c35dd30a0 /drivers
parentbf2670601d29551896bab6811b9bb64de2d0ee0e (diff)
downloadqmk_firmware-6b74dd6de5359da18e87b2d4894e3ffc3fc89d47.tar.gz
led_matrix works now
Diffstat (limited to 'drivers')
-rw-r--r--drivers/arm/i2c_master.c11
-rw-r--r--drivers/arm/i2c_master.h10
-rw-r--r--drivers/issi/is31fl3731-simple.c5
3 files changed, 16 insertions, 10 deletions
diff --git a/drivers/arm/i2c_master.c b/drivers/arm/i2c_master.c
index 385bd97cb..1c3da2a1a 100644
--- a/drivers/arm/i2c_master.c
+++ b/drivers/arm/i2c_master.c
@@ -46,13 +46,13 @@ __attribute__ ((weak))
void i2c_init(void)
{
// Try releasing special pins for a short time
- palSetPadMode(GPIOB, 6, PAL_MODE_INPUT);
- palSetPadMode(GPIOB, 7, PAL_MODE_INPUT);
+ palSetPadMode(I2C1_BANK, I2C1_SCL, PAL_MODE_INPUT);
+ palSetPadMode(I2C1_BANK, I2C1_SDA, PAL_MODE_INPUT);
chThdSleepMilliseconds(10);
-
- palSetPadMode(GPIOB, 6, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
- palSetPadMode(GPIOB, 7, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
+
+ palSetPadMode(I2C1_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
+ palSetPadMode(I2C1_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);
//i2cInit(); //This is invoked by halInit() so no need to redo it.
}
@@ -67,6 +67,7 @@ uint8_t i2c_start(uint8_t address)
uint8_t i2c_transmit(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout)
{
+ // FIXME: Next steps: Add a print here, copy this file to your rgb_matrix firmware. Compare both.
i2c_address = address;
i2cStart(&I2C_DRIVER, &i2cconfig);
return i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, MS2ST(timeout));
diff --git a/drivers/arm/i2c_master.h b/drivers/arm/i2c_master.h
index 392760328..7a9eb32eb 100644
--- a/drivers/arm/i2c_master.h
+++ b/drivers/arm/i2c_master.h
@@ -26,6 +26,16 @@
#include "ch.h"
#include <hal.h>
+#ifndef I2C1_BANK
+ #define I2C1_BANK GPIOB
+#endif
+#ifndef I2C1_SCL
+ #define I2C1_SCL 6
+#endif
+#ifndef I2C1_SDA
+ #define I2C1_SDA 7
+#endif
+
#ifndef I2C_DRIVER
#define I2C_DRIVER I2CD1
#endif
diff --git a/drivers/issi/is31fl3731-simple.c b/drivers/issi/is31fl3731-simple.c
index 9c31df209..ff6620b72 100644
--- a/drivers/issi/is31fl3731-simple.c
+++ b/drivers/issi/is31fl3731-simple.c
@@ -158,12 +158,7 @@ void IS31FL3731_init(uint8_t addr) {
// enable software shutdown
IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
// this delay was copied from other drivers, might not be needed
- // FIXME: Don't we have a wrapper for this already?
- #ifdef __AVR__
- _delay_ms(10);
- #else
wait_ms(10);
- #endif
// picture mode
IS31FL3731_write_register(addr, ISSI_REG_CONFIG, ISSI_REG_CONFIG_PICTUREMODE);