Quellcode durchsuchen

SPI defines cleanup (#14506)

Giuliano Zaro vor 5 Jahren
Ursprung
Commit
66e16af29d

+ 1
- 1
Marlin/src/HAL/HAL_AVR/HAL_spi_AVR.cpp Datei anzeigen

@@ -173,7 +173,7 @@ void spiBegin(void) {
173 173
     // Invert the SPI2X bit
174 174
     clockDiv ^= 0x1;
175 175
 
176
-    SPCR = _BV(SPE) | _BV(MSTR) | ((bitOrder == SPI_LSBFIRST) ? _BV(DORD) : 0) |
176
+    SPCR = _BV(SPE) | _BV(MSTR) | ((bitOrder == LSBFIRST) ? _BV(DORD) : 0) |
177 177
       (dataMode << CPHA) | ((clockDiv >> 1) << SPR0);
178 178
     SPSR = clockDiv | 0x01;
179 179
   }

+ 0
- 8
Marlin/src/HAL/HAL_DUE/u8g_com_HAL_DUE_shared_hw_spi.cpp Datei anzeigen

@@ -66,14 +66,6 @@
66 66
 
67 67
 #include "../../Marlin.h"
68 68
 
69
-#define SPI_FULL_SPEED      0
70
-#define SPI_HALF_SPEED      1
71
-#define SPI_QUARTER_SPEED   2
72
-#define SPI_EIGHTH_SPEED    3
73
-#define SPI_SIXTEENTH_SPEED 4
74
-#define SPI_SPEED_5         5
75
-#define SPI_SPEED_6         6
76
-
77 69
 void spiBegin();
78 70
 void spiInit(uint8_t spiRate);
79 71
 void spiSend(uint8_t b);

+ 1
- 9
Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp Datei anzeigen

@@ -59,16 +59,8 @@
59 59
 
60 60
 #if HAS_GRAPHICAL_LCD
61 61
 
62
-//#include <inttypes.h>
63 62
 #include <U8glib.h>
64
-
65
-#define SPI_FULL_SPEED 0
66
-#define SPI_HALF_SPEED 1
67
-#define SPI_QUARTER_SPEED 2
68
-#define SPI_EIGHTH_SPEED 3
69
-#define SPI_SIXTEENTH_SPEED 4
70
-#define SPI_SPEED_5 5
71
-#define SPI_SPEED_6 6
63
+#include "../../shared/HAL_SPI.h"
72 64
 
73 65
 void spiBegin();
74 66
 void spiInit(uint8_t spiRate);

+ 1
- 9
Marlin/src/HAL/HAL_LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp Datei anzeigen

@@ -59,18 +59,10 @@
59 59
 
60 60
 #if HAS_GRAPHICAL_LCD
61 61
 
62
-//#include <inttypes.h>
63 62
 #include <U8glib.h>
63
+#include "../../shared/HAL_SPI.h"
64 64
 #include "../../shared/Delay.h"
65 65
 
66
-#define SPI_FULL_SPEED 0
67
-#define SPI_HALF_SPEED 1
68
-#define SPI_QUARTER_SPEED 2
69
-#define SPI_EIGHTH_SPEED 3
70
-#define SPI_SIXTEENTH_SPEED 4
71
-#define SPI_SPEED_5 5
72
-#define SPI_SPEED_6 6
73
-
74 66
 void spiBegin();
75 67
 void spiInit(uint8_t spiRate);
76 68
 void spiSend(uint8_t b);

+ 0
- 8
Marlin/src/HAL/shared/HAL_SPI.h Datei anzeigen

@@ -53,14 +53,6 @@
53 53
 #define SPI_SPEED_5         5   // Set SCK rate to 1/32 of max rate
54 54
 #define SPI_SPEED_6         6   // Set SCK rate to 1/64 of max rate
55 55
 
56
-#define SPI_LSBFIRST 0
57
-#define SPI_MSBFIRST 1
58
-
59
-#define SPI_DATAMODE_0 0x00
60
-#define SPI_DATAMODE_1 0x04
61
-#define SPI_DATAMODE_2 0x08
62
-#define SPI_DATAMODE_3 0x0C
63
-
64 56
 // Standard SPI functions
65 57
 /** Initialize SPI bus */
66 58
 void spiBegin(void);

Laden…
Abbrechen
Speichern