gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-27 21:50:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot 2021-06-03 06:27:15 +00:00
commit 2344d06475
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/avr/spi_master.c
View File

@ -14,10 +14,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <avr/io.h>
#include "spi_master.h"
#include "quantum.h"
#include "timer.h"
#if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)

4
drivers/avr/spi_master.h
View File

@ -16,7 +16,9 @@
#pragma once
#include "quantum.h"
#include <stdbool.h>
#include "gpio.h"
typedef int16_t spi_status_t;

2
drivers/chibios/spi_master.c
View File

@ -15,7 +15,7 @@
*/
#include "spi_master.h"
#include "quantum.h"
#include "timer.h"
static pin_t currentSlavePin = NO_PIN;

4
drivers/chibios/spi_master.h
View File

@ -18,7 +18,9 @@
#include <ch.h>
#include <hal.h>
#include "quantum.h"
#include <stdbool.h>
#include "gpio.h"
#ifndef SPI_DRIVER
# define SPI_DRIVER SPID2