Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						cce7b91cb1
					
				| @ -60,7 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define I2C1_SCL_PAL_MODE 1 | ||||
| #define I2C1_SDA_PAL_MODE 1 | ||||
| 
 | ||||
| #define I2C1_TIMINGR_PRESC 	0U | ||||
| #define I2C1_TIMINGR_SCLDEL 3U | ||||
| #define I2C1_TIMINGR_SDADEL 1U | ||||
| #define I2C1_TIMINGR_SCLH 	3U | ||||
|  | ||||
| @ -106,7 +106,6 @@ | ||||
| // 0b1110101 AD <-> SCL
 | ||||
| // 0b1110110 AD <-> SDA
 | ||||
| #define LED_DRIVER_ADDR_1 0b1110100 | ||||
| #define I2C1_BANK GPIOB | ||||
| #define I2C1_SCL 8 | ||||
| #define I2C1_SDA 9 | ||||
| 
 | ||||
|  | ||||
| @ -41,18 +41,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||||
| #define RGB_MATRIX_STARTUP_HUE 221 | ||||
| 
 | ||||
| #define I2C1_SCL_BANK GPIOB | ||||
| #define I2C1_SCL 8 | ||||
| #define I2C1_SDA_BANK GPIOB | ||||
| #define I2C1_SDA 9 | ||||
| 
 | ||||
| #define I2C1_SCL_PAL_MODE 1 | ||||
| #define I2C1_SDA_PAL_MODE 1 | ||||
| 
 | ||||
| #define I2C1_OPMODE OPMODE_I2C | ||||
| #define I2C1_CLOCK_SPEED 100000 | ||||
| #define I2C1_DUTY_CYCLE STD_DUTY_CYCLE | ||||
| 
 | ||||
| #define OLED_DISPLAY_ADDRESS 0x3C | ||||
| #define OLED_DISPLAY_128X64 | ||||
| #define OLED_COM_PINS 0x12 | ||||
|  | ||||
| @ -44,10 +44,3 @@ | ||||
| #define ENCODERS_PAD_B \ | ||||
|     { B8 } | ||||
| #define ENCODER_RESOLUTION 2 | ||||
| 
 | ||||
| /* OLED */ | ||||
| #define I2C_DRIVER I2CD1 | ||||
| #define I2C1_SCL_BANK GPIOB | ||||
| #define I2C1_SDA_BANK GPIOB | ||||
| #define I2C1_SCL 6 | ||||
| #define I2C1_SDA 7 | ||||
|  | ||||
| @ -20,6 +20,3 @@ | ||||
| 
 | ||||
| #undef STM32_I2C_USE_I2C1 | ||||
| #define STM32_I2C_USE_I2C1 TRUE | ||||
| 
 | ||||
| #undef I2C_DRIVER | ||||
| #define I2C_DRIVER I2CD1 | ||||
|  | ||||
| @ -82,7 +82,6 @@ | ||||
| #define DEBOUNCE    5 | ||||
| 
 | ||||
| // i2c setting
 | ||||
| #define USE_I2CV1 | ||||
| #define I2C1_SCL 8 | ||||
| #define I2C1_SDA 9 | ||||
| #define I2C1_CLOCK_SPEED 400000 | ||||
|  | ||||
| @ -26,7 +26,6 @@ | ||||
| #define DEBOUNCE    5 | ||||
| 
 | ||||
| // i2c setting
 | ||||
| #define USE_I2CV1 | ||||
| #define I2C1_SCL 8 | ||||
| #define I2C1_SDA 9 | ||||
| #define I2C1_CLOCK_SPEED 400000 | ||||
|  | ||||
| @ -49,7 +49,6 @@ | ||||
| #define I2C1_SCL_PAL_MODE 1 | ||||
| #define I2C1_SDA_PAL_MODE 1 | ||||
| 
 | ||||
| #define I2C1_TIMINGR_PRESC 	0U | ||||
| #define I2C1_TIMINGR_SCLDEL 3U | ||||
| #define I2C1_TIMINGR_SDADEL 1U | ||||
| #define I2C1_TIMINGR_SCLH 	3U | ||||
|  | ||||
| @ -53,7 +53,6 @@ | ||||
| #define I2C1_SCL_PAL_MODE 1 | ||||
| #define I2C1_SDA_PAL_MODE 1 | ||||
| 
 | ||||
| #define I2C1_TIMINGR_PRESC 	0U | ||||
| #define I2C1_TIMINGR_SCLDEL 3U | ||||
| #define I2C1_TIMINGR_SDADEL 1U | ||||
| #define I2C1_TIMINGR_SCLH 	3U | ||||
|  | ||||
| @ -70,13 +70,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||
| 
 | ||||
| // OLED defines
 | ||||
| #define OLED_TIMEOUT 60000 | ||||
| /* Both pins are in bank B */ | ||||
| #define I2C1_SCL 6 // B6
 | ||||
| #define I2C1_SDA 7 // B7
 | ||||
| #define I2C1_SCL_PAL_MODE 1 | ||||
| #define I2C1_SDA_PAL_MODE 1 | ||||
| /* This configures the I2C clock to 400khz assuming a 48Mhz clock */ | ||||
| #define I2C1_TIMINGR_PRESC 	0U | ||||
| #define I2C1_TIMINGR_SCLDEL 3U | ||||
| #define I2C1_TIMINGR_SDADEL 1U | ||||
| #define I2C1_TIMINGR_SCLH 	3U | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user