Remove SCLK definition

fpistm · fpistm · commit ebe46ff84295 · 2017-08-23T11:56:25.000+02:00
Signed-off-by: Frederic.Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
@@ -22,7 +22,7 @@ SPIClass::SPIClass() : g_active_id(-1)
 {
   _spi.pin_miso = digitalPinToPinName(MISO);
   _spi.pin_mosi = digitalPinToPinName(MOSI);
-  _spi.pin_sclk = digitalPinToPinName(SCLK);
+  _spi.pin_sclk = digitalPinToPinName(SCK);
   _spi.pin_ssel = NC;
 }
 
diff --git a/variants/DISCO_F100RB/variant.h b/variants/DISCO_F100RB/variant.h
@@ -147,8 +147,7 @@ enum {
 #define SS3                     42
 #define MOSI                    46
 #define MISO                    45
-#define SCLK                    44
-#define SCK                     SCLK
+#define SCK                     44
 
 //I2C Definitions
 #define SDA                     38
diff --git a/variants/DISCO_F407VG/variant.h b/variants/DISCO_F407VG/variant.h
@@ -174,8 +174,7 @@ enum {
 #define SS2                     14
 #define MOSI                    44
 #define MISO                    5
-#define SCLK                    43
-#define SCK                     SCLK
+#define SCK                     43
 
 //I2C Definitions
 #define SDA                     66
diff --git a/variants/DISCO_F746NG/variant.h b/variants/DISCO_F746NG/variant.h
@@ -104,8 +104,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F030R8/variant.h b/variants/NUCLEO_F030R8/variant.h
@@ -146,8 +146,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F091RC/variant.h b/variants/NUCLEO_F091RC/variant.h
@@ -144,8 +144,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F103RB/variant.h b/variants/NUCLEO_F103RB/variant.h
@@ -144,8 +144,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F207ZG/variant.h b/variants/NUCLEO_F207ZG/variant.h
@@ -189,8 +189,7 @@ enum {
 #define SS                      BOARD_SPI_DEFAULT_SS
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F303RE/variant.h b/variants/NUCLEO_F303RE/variant.h
@@ -144,8 +144,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F401RE/variant.h b/variants/NUCLEO_F401RE/variant.h
@@ -145,8 +145,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F411RE/variant.h b/variants/NUCLEO_F411RE/variant.h
@@ -145,8 +145,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_F429ZI/variant.h b/variants/NUCLEO_F429ZI/variant.h
@@ -179,8 +179,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_L053R8/variant.h b/variants/NUCLEO_L053R8/variant.h
@@ -144,8 +144,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_L152RE/variant.h b/variants/NUCLEO_L152RE/variant.h
@@ -149,8 +149,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/NUCLEO_L432KC/variant.h b/variants/NUCLEO_L432KC/variant.h
@@ -99,8 +99,7 @@ enum {
 #define SS                      BOARD_SPI_DEFAULT_SS
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     4
diff --git a/variants/NUCLEO_L476RG/variant.h b/variants/NUCLEO_L476RG/variant.h
@@ -144,8 +144,7 @@ enum {
 #define SS3                     8
 #define MOSI                    11
 #define MISO                    12
-#define SCLK                    13
-#define SCK                     SCLK
+#define SCK                     13
 
 //I2C Definitions
 #define SDA                     14
diff --git a/variants/board_template/variant.h b/variants/board_template/variant.h
@@ -101,8 +101,7 @@ enum {
 #define SS                      BOARD_SPI_DEFAULT_SS
 #define MOSI                    11 // Default for Arduino connector compatibility
 #define MISO                    12 // Default for Arduino connector compatibility
-#define SCLK                    13 // Default for Arduino connector compatibility
-#define SCK                     SCLK
+#define SCK                     13 // Default for Arduino connector compatibility
 
 //I2C Definitions
 #define SDA                     14 // Default for Arduino connector compatibility

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ SPIClass::SPIClass() : g_active_id(-1)`
`22`	`22`	`{`
`23`	`23`	`_spi.pin_miso = digitalPinToPinName(MISO);`
`24`	`24`	`_spi.pin_mosi = digitalPinToPinName(MOSI);`
`25`		`- _spi.pin_sclk = digitalPinToPinName(SCLK);`
	`25`	`+ _spi.pin_sclk = digitalPinToPinName(SCK);`
`26`	`26`	`_spi.pin_ssel = NC;`
`27`	`27`	`}`
`28`	`28`