~ruther/qmk_firmware

2344d0647509496e14024ffedc35093c4c1e3468 — QMK Bot 4 years ago eaa2e0c + 261d94c
Merge remote-tracking branch 'origin/master' into develop
M drivers/avr/spi_master.c => drivers/avr/spi_master.c +1 -3
@@ 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__)

M drivers/avr/spi_master.h => drivers/avr/spi_master.h +3 -1
@@ 16,7 16,9 @@

#pragma once

#include "quantum.h"
#include <stdbool.h>

#include "gpio.h"

typedef int16_t spi_status_t;


M drivers/chibios/spi_master.c => drivers/chibios/spi_master.c +1 -1
@@ 15,7 15,7 @@
 */

#include "spi_master.h"
#include "quantum.h"

#include "timer.h"

static pin_t     currentSlavePin = NO_PIN;

M drivers/chibios/spi_master.h => drivers/chibios/spi_master.h +3 -1
@@ 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