Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stm32: Add support for STM32F1 I2C1 alternate pin mapping (#4012) 

This adds support for the alternate pin mapping of
I2C1 on PB8/9 in STM32F1 devices

Signed-off-by: Michael Kurz <michi.kurz@gmail.com>
This commit is contained in:
Michael Kurz 2021-03-03 05:02:20 +01:00 committed by GitHub
parent 5f80c84309
commit ab979a52cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stm32/i2c.c
View File

@ -17,12 +17,16 @@ struct i2c_info {
uint8_t scl_pin, sda_pin; uint8_t scl_pin, sda_pin;
}; };
DECL_ENUMERATION_RANGE("i2c_bus", "i2c1", 0, 2); DECL_ENUMERATION("i2c_bus", "i2c1", 0);
DECL_CONSTANT_STR("BUS_PINS_i2c1", "PB6,PB7"); DECL_CONSTANT_STR("BUS_PINS_i2c1", "PB6,PB7");
DECL_ENUMERATION("i2c_bus", "i2c1a", 1);
DECL_CONSTANT_STR("BUS_PINS_i2c1a", "PB8,PB9");
DECL_ENUMERATION("i2c_bus", "i2c2", 2);
DECL_CONSTANT_STR("BUS_PINS_i2c2", "PB10,PB11"); DECL_CONSTANT_STR("BUS_PINS_i2c2", "PB10,PB11");
static const struct i2c_info i2c_bus[] = { static const struct i2c_info i2c_bus[] = {
{ I2C1, GPIO('B', 6), GPIO('B', 7) }, { I2C1, GPIO('B', 6), GPIO('B', 7) },
{ I2C1, GPIO('B', 8), GPIO('B', 9) },
{ I2C2, GPIO('B', 10), GPIO('B', 11) }, { I2C2, GPIO('B', 10), GPIO('B', 11) },
}; };

14
src/stm32/stm32f1.c
View File

@ -124,10 +124,16 @@ gpio_peripheral(uint32_t gpio, uint32_t mode, int pullup)
// way from other STM32s. // way from other STM32s.
// Code below is emulating a few mappings to work like an STM32F4 // Code below is emulating a few mappings to work like an STM32F4
uint32_t func = (mode >> 4) & 0xf; uint32_t func = (mode >> 4) & 0xf;
if(( gpio == GPIO('B', 8) || gpio == GPIO('B', 9)) && if (gpio == GPIO('B', 8) || gpio == GPIO('B', 9)) {
func == 9) { // CAN if (func == 9) {
stm32f1_alternative_remap(AFIO_MAPR_CAN_REMAP_Msk, // CAN
AFIO_MAPR_CAN_REMAP_REMAP2); stm32f1_alternative_remap(AFIO_MAPR_CAN_REMAP_Msk,
AFIO_MAPR_CAN_REMAP_REMAP2);
} else if (func == 4) {
// I2C1 Alt
stm32f1_alternative_remap(AFIO_MAPR_I2C1_REMAP_Msk,
AFIO_MAPR_I2C1_REMAP);
}
} }
// Add more as needed // Add more as needed
} }