From 42b96e0e27d56c76b3e56eb57da6e2ae968bac6a Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Thu, 30 Jul 2015 14:26:15 +0200 Subject: [PATCH] SD card: commit SD_CARD_SELECT_PIN to all the board files. For the bigger boards like RAMPS or Rumba the pin numbers were taken from Marlin. For the smaller boards, the pin is commented out. --- Makefile-common | 2 +- config/board.3drag.h | 14 ++++++++++++++ config/board.cnc-shield-v3.h | 14 ++++++++++++++ config/board.gen3.h | 14 ++++++++++++++ config/board.gen6.h | 14 ++++++++++++++ config/board.gen7-v1.1-v1.3.h | 14 ++++++++++++++ config/board.gen7-v1.4.h | 14 ++++++++++++++ config/board.nanoheart-v1.0.h | 14 ++++++++++++++ config/board.ramps-v1.2.h | 14 ++++++++++++++ config/board.ramps-v1.3.h | 14 ++++++++++++++ config/board.rumba.h | 14 ++++++++++++++ config/board.sanguinololu-v1.1.h | 14 ++++++++++++++ config/board.sanguinololu-v1.2.h | 14 ++++++++++++++ config/board.sanguish.h | 14 ++++++++++++++ config/board.teensy++-v2.0.h | 14 ++++++++++++++ config/board.teensy-v2.0.h | 14 ++++++++++++++ configtool/board.generic.h | 14 ++++++++++++++ testcases/config.h.Profiling | 14 ++++++++++++++ 18 files changed, 239 insertions(+), 1 deletion(-) diff --git a/Makefile-common b/Makefile-common index c7a24a1..071984e 100644 --- a/Makefile-common +++ b/Makefile-common @@ -123,7 +123,7 @@ regressiontests: # Generic RAMPS configuration. $(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.regtest-ramps.h \ MCU=atmega2560 F_CPU=16000000UL EXTRA_CFLAGS=-Werror all - # Generic Teensy2 configuration, which uses USB_SERIAL. + # Generic Teensy2 configuration, which uses USB_SERIAL and no SD card. $(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.regtest-teensy2.h \ MCU=atmega32u4 F_CPU=16000000UL EXTRA_CFLAGS=-Werror all # Generic Gen3 configuration for {TX,RX}_ENABLE_PIN. diff --git a/config/board.3drag.h b/config/board.3drag.h index afaaab3..ee1cc96 100644 --- a/config/board.3drag.h +++ b/config/board.3drag.h @@ -98,6 +98,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO25 + /***************************************************************************\ * * diff --git a/config/board.cnc-shield-v3.h b/config/board.cnc-shield-v3.h index c413af7..42d0d47 100644 --- a/config/board.cnc-shield-v3.h +++ b/config/board.cnc-shield-v3.h @@ -101,6 +101,20 @@ */ //#define DEBUG_LED_PIN DIO21 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\ * * diff --git a/config/board.gen3.h b/config/board.gen3.h index 88b9910..46436eb 100644 --- a/config/board.gen3.h +++ b/config/board.gen3.h @@ -98,6 +98,20 @@ */ //#define DEBUG_LED_PIN DIO21 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO4 + /***************************************************************************\ * * diff --git a/config/board.gen6.h b/config/board.gen6.h index 8349c27..3b00851 100644 --- a/config/board.gen6.h +++ b/config/board.gen6.h @@ -98,6 +98,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\ * * diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h index 073e34a..aa77a20 100644 --- a/config/board.gen7-v1.1-v1.3.h +++ b/config/board.gen7-v1.1-v1.3.h @@ -102,6 +102,20 @@ */ //#define DEBUG_LED_PIN DIO21 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO10 + /***************************************************************************\ * * diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h index aa70709..fc58d84 100644 --- a/config/board.gen7-v1.4.h +++ b/config/board.gen7-v1.4.h @@ -102,6 +102,20 @@ */ //#define DEBUG_LED_PIN DIO21 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO10 + /***************************************************************************\ * * diff --git a/config/board.nanoheart-v1.0.h b/config/board.nanoheart-v1.0.h index 655b744..a17f59b 100644 --- a/config/board.nanoheart-v1.0.h +++ b/config/board.nanoheart-v1.0.h @@ -101,6 +101,20 @@ */ #define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\ * * diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h index 8512d05..b1e5336 100644 --- a/config/board.ramps-v1.2.h +++ b/config/board.ramps-v1.2.h @@ -99,6 +99,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO53 + /***************************************************************************\ * * diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h index bad1e22..255a7bf 100644 --- a/config/board.ramps-v1.3.h +++ b/config/board.ramps-v1.3.h @@ -99,6 +99,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO53 + /***************************************************************************\ * * diff --git a/config/board.rumba.h b/config/board.rumba.h index 012db3e..c97cf90 100644 --- a/config/board.rumba.h +++ b/config/board.rumba.h @@ -98,6 +98,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO53 + /***************************************************************************\ * * diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h index 54ec6e1..ab512a3 100644 --- a/config/board.sanguinololu-v1.1.h +++ b/config/board.sanguinololu-v1.1.h @@ -101,6 +101,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\ * * diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h index c8906d9..c287539 100644 --- a/config/board.sanguinololu-v1.2.h +++ b/config/board.sanguinololu-v1.2.h @@ -101,6 +101,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO33 + /***************************************************************************\ * * diff --git a/config/board.sanguish.h b/config/board.sanguish.h index bed32c5..e60dc24 100644 --- a/config/board.sanguish.h +++ b/config/board.sanguish.h @@ -101,6 +101,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\ * * diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h index 39f4cb3..fde084c 100644 --- a/config/board.teensy++-v2.0.h +++ b/config/board.teensy++-v2.0.h @@ -98,6 +98,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\ * * diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h index 9f716b8..4d2200c 100644 --- a/config/board.teensy-v2.0.h +++ b/config/board.teensy-v2.0.h @@ -98,6 +98,20 @@ */ //#define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\ * * diff --git a/configtool/board.generic.h b/configtool/board.generic.h index 1d8a96c..071f8a1 100644 --- a/configtool/board.generic.h +++ b/configtool/board.generic.h @@ -99,6 +99,20 @@ */ #define DEBUG_LED_PIN DIO13 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +#define SD_CARD_SELECT_PIN DIO53 + /***************************************************************************\ * * diff --git a/testcases/config.h.Profiling b/testcases/config.h.Profiling index 9daec5c..3c78b86 100644 --- a/testcases/config.h.Profiling +++ b/testcases/config.h.Profiling @@ -327,6 +327,20 @@ */ #define DEBUG_LED_PIN DIO21 +/** \def SD_CARD_SELECT_PIN + + Chip Select pin of the SD card. + + SD cards work over SPI and have a Chip Select or Slave Select (SS) pin. + Choose this pin according to where on the board your SD card adapter is + connected. Disabling this pin also disables SD card support and makes the + firmware binary about 4.5 kB smaller. + + Connecting a device to SPI actually uses 4 signal lines, the other three + pins are choosen by Teacup automatically. +*/ +//#define SD_CARD_SELECT_PIN xxxx + /***************************************************************************\