mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-28 11:47:32 +06:00
Code Issues Packages Projects Releases Wiki Activity

Add central location for ChibiOS defines (#7542)

Browse Source 
* Add central location for chibios defines

* Add central location for chibios defines - actually add files this time....

* Add Copyright header

* Update include order to resolve i2cv1 build errors
This commit is contained in:
Joel Challis 2019-12-21 18:22:49 +00:00 committed by GitHub
parent 05b479d349
commit 376419a4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/arm/i2c_master.c
View File

@ -24,9 +24,8 @@
* STM32_I2C_USE_I2C1 is TRUE in the mcuconf.h file. Pins B6 and B7 are used * STM32_I2C_USE_I2C1 is TRUE in the mcuconf.h file. Pins B6 and B7 are used
* but using any other I2C pins should be trivial. * but using any other I2C pins should be trivial.
*/ */
#include "i2c_master.h"
#include "quantum.h" #include "quantum.h"
#include "i2c_master.h"
#include <string.h> #include <string.h>
#include <hal.h> #include <hal.h>

28
drivers/arm/i2c_master.h
View File

@ -27,10 +27,6 @@
#include "ch.h" #include "ch.h"
#include <hal.h> #include <hal.h>
#if defined(STM32F1XX) || defined(STM32F1xx) || defined(STM32F2xx) || defined(STM32F4xx) || defined(STM32F4XX) || defined(STM32L0xx) || defined(STM32L1xx)
# define USE_I2CV1
#endif
#ifdef I2C1_BANK #ifdef I2C1_BANK
# define I2C1_SCL_BANK I2C1_BANK # define I2C1_SCL_BANK I2C1_BANK
# define I2C1_SDA_BANK I2C1_BANK # define I2C1_SDA_BANK I2C1_BANK
@ -51,20 +47,6 @@
# define I2C1_SDA 7 # define I2C1_SDA 7
#endif #endif
#if defined(STM32F1XX) || defined(STM32F1xx)
# define USE_GPIOV1
#endif
#ifndef USE_GPIOV1
// The default PAL alternate modes are used to signal that the pins are used for I2C
# ifndef I2C1_SCL_PAL_MODE
# define I2C1_SCL_PAL_MODE 4
# endif
# ifndef I2C1_SDA_PAL_MODE
# define I2C1_SDA_PAL_MODE 4
# endif
#endif
#ifdef USE_I2CV1 #ifdef USE_I2CV1
# ifndef I2C1_OPMODE # ifndef I2C1_OPMODE
# define I2C1_OPMODE OPMODE_I2C # define I2C1_OPMODE OPMODE_I2C
@ -99,6 +81,16 @@
# define I2C_DRIVER I2CD1 # define I2C_DRIVER I2CD1
#endif #endif
#ifndef USE_GPIOV1
// The default PAL alternate modes are used to signal that the pins are used for I2C
# ifndef I2C1_SCL_PAL_MODE
# define I2C1_SCL_PAL_MODE 4
# endif
# ifndef I2C1_SDA_PAL_MODE
# define I2C1_SDA_PAL_MODE 4
# endif
#endif
typedef int16_t i2c_status_t; typedef int16_t i2c_status_t;
#define I2C_STATUS_SUCCESS (0) #define I2C_STATUS_SUCCESS (0)

4
quantum/backlight/backlight_arm.c
View File

@ -10,10 +10,6 @@
# error "Backlight support for STMF072 is not available. Please disable." # error "Backlight support for STMF072 is not available. Please disable."
# endif # endif
# if defined(STM32F1XX) || defined(STM32F1xx)
# define USE_GPIOV1
# endif
// GPIOV2 && GPIOV3 // GPIOV2 && GPIOV3
# ifndef BACKLIGHT_PAL_MODE # ifndef BACKLIGHT_PAL_MODE
# define BACKLIGHT_PAL_MODE 2 # define BACKLIGHT_PAL_MODE 2

1
quantum/quantum.h
View File

@ -22,6 +22,7 @@
#endif #endif
#if defined(PROTOCOL_CHIBIOS) #if defined(PROTOCOL_CHIBIOS)
# include "hal.h" # include "hal.h"
# include "chibios_config.h"
#endif #endif
#include "wait.h" #include "wait.h"

24
tmk_core/common/chibios/chibios_config.h Normal file
View File

@ -0,0 +1,24 @@
/* Copyright 2019
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#if defined(STM32F1XX)
# define USE_GPIOV1
#endif
#if defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(STM32L1XX)
# define USE_I2CV1
#endif