From 4567d2fecac9a6785b0a0ac2f3adc750827b3eb8 Mon Sep 17 00:00:00 2001
From: Robert Pelnar <robert.pelnar@seznam.cz>
Date: Sun, 10 Jun 2018 16:11:39 +0200
Subject: [PATCH] removed unused cond. trans. for NEW_SPI

---
 Firmware/Marlin_main.cpp                      |  4 --
 Firmware/tmc2130.cpp                          | 62 -------------------
 .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h  |  3 -
 3 files changed, 69 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index e48e181a..419c5597 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -82,9 +82,7 @@
 #include "swspi.h"
 #endif //SWSPI
 
-#ifdef NEW_SPI
 #include "spi.h"
-#endif //NEW_SPI
 
 #ifdef SWI2C
 #include "swi2c.h"
@@ -1087,9 +1085,7 @@ void setup()
     lcd_init();
 	fdev_setup_stream(lcdout, lcd_putchar, NULL, _FDEV_SETUP_WRITE); //setup lcdout stream
 
-#ifdef NEW_SPI
 	spi_init();
-#endif //NEW_SPI
 
 	lcd_splash();
 
diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp
index b55beb9b..dc1af62c 100644
--- a/Firmware/tmc2130.cpp
+++ b/Firmware/tmc2130.cpp
@@ -6,11 +6,7 @@
 #include "LiquidCrystal_Prusa.h"
 #include "ultralcd.h"
 #include "language.h"
-#ifndef NEW_SPI
-#include <SPI.h>
-#else //NEW_SPI
 #include "spi.h"
-#endif //NEW_SPI
 
 
 extern LiquidCrystal_Prusa lcd;
@@ -162,9 +158,6 @@ void tmc2130_init()
 	SET_INPUT(Y_TMC2130_DIAG);
 	SET_INPUT(Z_TMC2130_DIAG);
 	SET_INPUT(E0_TMC2130_DIAG);
-#ifndef NEW_SPI
-	SPI.begin();
-#endif //NEW_SPI
 	for (int axis = 0; axis < 2; axis++) // X Y axes
 	{
 		tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]);
@@ -628,59 +621,6 @@ inline void tmc2130_cs_high(uint8_t axis)
 	}
 }
 
-#ifndef NEW_SPI
-
-uint8_t tmc2130_tx(uint8_t axis, uint8_t addr, uint32_t wval)
-{
-	//datagram1 - request
-	printf_P(PSTR("tmc2130_tx %d 0x%02hhx, 0x%08lx\n"), axis, addr, wval);
-	SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE3));
-	printf_P(PSTR(" SPCR = 0x%02hhx\n"), SPCR);
-	printf_P(PSTR(" SPSR = 0x%02hhx\n"), SPSR);
-	tmc2130_cs_low(axis);
-	SPI.transfer(addr); // address
-	SPI.transfer((wval >> 24) & 0xff); // MSB
-	SPI.transfer((wval >> 16) & 0xff);
-	SPI.transfer((wval >> 8) & 0xff);
-	SPI.transfer(wval & 0xff); // LSB
-	tmc2130_cs_high(axis);
-	SPI.endTransaction();
-}
-
-uint8_t tmc2130_rx(uint8_t axis, uint8_t addr, uint32_t* rval)
-{
-	//datagram1 - request
-	SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE3));
-	tmc2130_cs_low(axis);
-	SPI.transfer(addr); // address
-	SPI.transfer(0); // MSB
-	SPI.transfer(0);
-	SPI.transfer(0);
-	SPI.transfer(0); // LSB
-	tmc2130_cs_high(axis);
-	SPI.endTransaction();
-	//datagram2 - response
-	SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE3));
-	tmc2130_cs_low(axis);
-	uint8_t stat = SPI.transfer(0); // status
-	uint32_t val32 = 0;
-	val32 = SPI.transfer(0); // MSB
-	val32 = (val32 << 8) | SPI.transfer(0);
-	val32 = (val32 << 8) | SPI.transfer(0);
-	val32 = (val32 << 8) | SPI.transfer(0); // LSB
-	tmc2130_cs_high(axis);
-	SPI.endTransaction();
-	if (rval != 0) *rval = val32;
-	return stat;
-}
-
-#else //NEW_SPI
-
-//Arduino SPI
-//#define TMC2130_SPI_ENTER()    SPI.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE3))
-//#define TMC2130_SPI_TXRX       SPI.transfer
-//#define TMC2130_SPI_LEAVE      SPI.endTransaction
-
 //spi
 #define TMC2130_SPI_ENTER()    spi_setup(TMC2130_SPCR, TMC2130_SPSR)
 #define TMC2130_SPI_TXRX       spi_txrx
@@ -727,8 +667,6 @@ uint8_t tmc2130_rx(uint8_t axis, uint8_t addr, uint32_t* rval)
 	return stat;
 }
 
-#endif //NEW_SPI
-
 
 void tmc2130_eeprom_load_config()
 {
diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
index 8d3a975d..66ccd4e2 100644
--- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
+++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
@@ -118,9 +118,6 @@
 // New XYZ calibration
 #define NEW_XYZCAL
 
-// Do not use Arduino SPI 
-#define NEW_SPI
-
 // Watchdog support
 #define WATCHDOG