andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Clean up SPI and ST7920 defines (#19956)

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
d9a47ec075
commit
95fb749923
21 changed files with 68 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Marlin/src/HAL/STM32F1/spi_pins.h
  2. 32
      Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
  3. 41
      Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
  4. 3
      Marlin/src/pins/pins_postprocess.h
  5. 3
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
  6. 1
      Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
  7. 2
      Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
  8. 2
      Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
  9. 2
      Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
  10. 2
      Marlin/src/pins/stm32f1/pins_FLY_MINI.h
  11. 2
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
  12. 3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
  13. 2
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
  14. 7
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
  15. 27
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
  16. 2
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
  17. 2
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
  18. 3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
  19. 4
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
  20. 2
      Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
  21. 2
      Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h

6
Marlin/src/HAL/STM32F1/spi_pins.h
View File

@ -49,10 +49,6 @@
#undef SDSS #undef SDSS
#define SDSS SS_PIN #define SDSS SS_PIN
#if ENABLED(ENABLE_SPI3) #ifndef SPI_DEVICE
#define SPI_DEVICE 3
#elif ENABLED(ENABLE_SPI2)
#define SPI_DEVICE 2
#else
#define SPI_DEVICE 1 #define SPI_DEVICE 1
#endif #endif

32
Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
View File

@ -33,6 +33,38 @@
#include "ultralcd_st7920_u8glib_rrd_AVR.h" #include "ultralcd_st7920_u8glib_rrd_AVR.h"
#if F_CPU >= 20000000
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(50)
#elif MB(3DRAG, K8200, K8400)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(188)
#define CPU_ST7920_DELAY_3 DELAY_NS(0)
#elif MB(MINIRAMBO, EINSY_RAMBO, EINSY_RETRO, SILVER_GATE)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(250)
#define CPU_ST7920_DELAY_3 DELAY_NS(0)
#elif MB(RAMBO)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(0)
#elif MB(BQ_ZUM_MEGA_3D)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(189)
#elif defined(ARDUINO_ARCH_STM32)
#define CPU_ST7920_DELAY_1 DELAY_NS(300)
#define CPU_ST7920_DELAY_2 DELAY_NS(40)
#define CPU_ST7920_DELAY_3 DELAY_NS(340)
#elif F_CPU == 16000000
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(63)
#else
#error "No valid condition for delays in 'ultralcd_st7920_u8glib_rrd_AVR.h'"
#endif
#ifndef ST7920_DELAY_1 #ifndef ST7920_DELAY_1
#ifdef BOARD_ST7920_DELAY_1 #ifdef BOARD_ST7920_DELAY_1
#define ST7920_DELAY_1 BOARD_ST7920_DELAY_1 #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1

41
Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
View File

@ -37,43 +37,6 @@
#include <U8glib.h> #include <U8glib.h>
// If you want you can define your own set of delays in Configuration.h
//#define ST7920_DELAY_1 DELAY_NS(0)
//#define ST7920_DELAY_2 DELAY_NS(0)
//#define ST7920_DELAY_3 DELAY_NS(0)
#if F_CPU >= 20000000
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(50)
#elif MB(3DRAG, K8200, K8400)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(188)
#define CPU_ST7920_DELAY_3 DELAY_NS(0)
#elif MB(MINIRAMBO, EINSY_RAMBO, EINSY_RETRO, SILVER_GATE)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(250)
#define CPU_ST7920_DELAY_3 DELAY_NS(0)
#elif MB(RAMBO)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(0)
#elif MB(BQ_ZUM_MEGA_3D)
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(189)
#elif defined(ARDUINO_ARCH_STM32)
#define CPU_ST7920_DELAY_1 DELAY_NS(300)
#define CPU_ST7920_DELAY_2 DELAY_NS(40)
#define CPU_ST7920_DELAY_3 DELAY_NS(340)
#elif F_CPU == 16000000
#define CPU_ST7920_DELAY_1 DELAY_NS(0)
#define CPU_ST7920_DELAY_2 DELAY_NS(0)
#define CPU_ST7920_DELAY_3 DELAY_NS(63)
#else
#error "No valid condition for delays in 'ultralcd_st7920_u8glib_rrd_AVR.h'"
#endif
void ST7920_SWSPI_SND_8BIT(uint8_t val); void ST7920_SWSPI_SND_8BIT(uint8_t val);
#if DOGM_SPI_DELAY_US > 0 #if DOGM_SPI_DELAY_US > 0
@ -82,8 +45,8 @@ void ST7920_SWSPI_SND_8BIT(uint8_t val);
#define U8G_DELAY() DELAY_US(10) #define U8G_DELAY() DELAY_US(10)
#endif #endif
#define ST7920_CS() { WRITE(ST7920_CS_PIN,1); U8G_DELAY(); } #define ST7920_CS() { WRITE(ST7920_CS_PIN, HIGH); U8G_DELAY(); }
#define ST7920_NCS() { WRITE(ST7920_CS_PIN,0); } #define ST7920_NCS() { WRITE(ST7920_CS_PIN, LOW); }
#define ST7920_SET_CMD() { ST7920_SWSPI_SND_8BIT(0xF8); U8G_DELAY(); } #define ST7920_SET_CMD() { ST7920_SWSPI_SND_8BIT(0xF8); U8G_DELAY(); }
#define ST7920_SET_DAT() { ST7920_SWSPI_SND_8BIT(0xFA); U8G_DELAY(); } #define ST7920_SET_DAT() { ST7920_SWSPI_SND_8BIT(0xFA); U8G_DELAY(); }
#define ST7920_WRITE_BYTE(a) { ST7920_SWSPI_SND_8BIT((uint8_t)((a)&0xF0u)); ST7920_SWSPI_SND_8BIT((uint8_t)((a)<<4U)); U8G_DELAY(); } #define ST7920_WRITE_BYTE(a) { ST7920_SWSPI_SND_8BIT((uint8_t)((a)&0xF0u)); ST7920_SWSPI_SND_8BIT((uint8_t)((a)<<4U)); U8G_DELAY(); }

3
Marlin/src/pins/pins_postprocess.h
View File

@ -871,6 +871,9 @@
#undef ST7920_DELAY_1 #undef ST7920_DELAY_1
#undef ST7920_DELAY_2 #undef ST7920_DELAY_2
#undef ST7920_DELAY_3 #undef ST7920_DELAY_3
#undef BOARD_ST7920_DELAY_1
#undef BOARD_ST7920_DELAY_2
#undef BOARD_ST7920_DELAY_3
#endif #endif
#undef HAS_FREE_AUX2_PINS #undef HAS_FREE_AUX2_PINS

3
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View File

@ -210,14 +210,13 @@
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define ENABLE_SPI3 #define SPI_DEVICE 3
#define SD_DETECT_PIN PB9 #define SD_DETECT_PIN PB9
#define SCK_PIN PB3 #define SCK_PIN PB3
#define MISO_PIN PB4 #define MISO_PIN PB4
#define MOSI_PIN PB5 #define MOSI_PIN PB5
#define SS_PIN PA15 #define SS_PIN PA15
#elif SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
#define ENABLE_SPI1
#define SD_DETECT_PIN PA3 #define SD_DETECT_PIN PA3
#define SCK_PIN PA5 #define SCK_PIN PA5
#define MISO_PIN PA6 #define MISO_PIN PA6

1
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
View File

@ -165,7 +165,6 @@
// SD-NAND // SD-NAND
// //
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define ENABLE_SPI1
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#define SCK_PIN PA5 #define SCK_PIN PA5
#define MISO_PIN PA6 #define MISO_PIN PA6

2
Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
View File

@ -185,7 +185,7 @@
// SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available // SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
// Needs to use SPI2 // Needs to use SPI2
#define ENABLE_SPI2 #define SPI_DEVICE 2
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN PB14 #define MISO_PIN PB14
#define MOSI_PIN PB15 #define MOSI_PIN PB15

2
Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
View File

@ -200,7 +200,7 @@
// SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available // SPI1(PA7)=LCD & SPI3(PB5)=STUFF, are not available
// so SPI2 is required. // so SPI2 is required.
#define ENABLE_SPI2 #define SPI_DEVICE 2
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN PB14 #define MISO_PIN PB14
#define MOSI_PIN PB15 #define MOSI_PIN PB15

2
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
View File

@ -56,7 +56,7 @@
// SPI // SPI
// Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface. // Note: FLSun Hispeed (clone MKS_Robin_miniV2) board is using SPI2 interface.
// //
#define ENABLE_SPI2 #define SPI_DEVICE 2
// SPI Flash // SPI Flash
#define HAS_SPI_FLASH 1 #define HAS_SPI_FLASH 1

2
Marlin/src/pins/stm32f1/pins_FLY_MINI.h
View File

@ -132,7 +132,7 @@
// //
// LCD / Controller // LCD / Controller
// //
#define ENABLE_SPI2 #define SPI_DEVICE 2
#define SS_PIN PB12 #define SS_PIN PB12
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN PB14 #define MISO_PIN PB14

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
View File

@ -166,7 +166,7 @@
#endif #endif
// SPI1(PA7) & SPI3(PB5) not available // SPI1(PA7) & SPI3(PB5) not available
#define ENABLE_SPI2 #define SPI_DEVICE 2
#if ENABLED(SDIO_SUPPORT) #if ENABLED(SDIO_SUPPORT)
#define SCK_PIN PB13 // SPI2 #define SCK_PIN PB13 // SPI2

3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
View File

@ -55,8 +55,7 @@
// //
// Note: MKS Robin board is using SPI2 interface. // Note: MKS Robin board is using SPI2 interface.
// //
//#define SPI_MODULE 2 #define SPI_DEVICE 2
#define ENABLE_SPI2
// //
// Limit Switches // Limit Switches

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View File

@ -167,7 +167,7 @@
// //
// SD Card // SD Card
// //
#define ENABLE_SPI2 #define SPI_DEVICE 2
#define SD_DETECT_PIN PC10 #define SD_DETECT_PIN PC10
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN PB14 #define MISO_PIN PB14

7
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
View File

@ -34,7 +34,6 @@
//#define DISABLE_DEBUG //#define DISABLE_DEBUG
#define DISABLE_JTAG #define DISABLE_JTAG
#define ENABLE_SPI2
// //
// Limit Switches // Limit Switches
@ -135,8 +134,12 @@
// //
// SD Card // SD Card
// //
#define ENABLE_SPI2
#define SD_DETECT_PIN PC10 #define SD_DETECT_PIN PC10
//
// SPI
//
#define SPI_DEVICE 2
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN P1B4 #define MISO_PIN P1B4
#define MOSI_PIN P1B5 #define MOSI_PIN P1B5

27
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
View File

@ -38,7 +38,6 @@
//#define DISABLE_DEBUG //#define DISABLE_DEBUG
#define DISABLE_JTAG #define DISABLE_JTAG
#define ENABLE_SPI2
// //
// Servos // Servos
@ -87,9 +86,9 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_BED_PIN PA1 //TB #define TEMP_BED_PIN PA1 // TB
#define TEMP_0_PIN PA0 //TH1 #define TEMP_0_PIN PA0 // TH1
#define TEMP_1_PIN PA2 //TH2 #define TEMP_1_PIN PA2 // TH2
#define FIL_RUNOUT_PIN PB10 // MT_DET #define FIL_RUNOUT_PIN PB10 // MT_DET
@ -132,24 +131,22 @@
#endif // !MKS_MINI_12864 #endif // !MKS_MINI_12864
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD
// //
// SD Card // SD Card
// //
#define ENABLE_SPI2
#define SD_DETECT_PIN PC10 #define SD_DETECT_PIN PC10
//
// SPI
//
#define SPI_DEVICE 2
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN PB14 #define MISO_PIN PB14
#define MOSI_PIN PB15 #define MOSI_PIN PB15
#define SS_PIN PA15 #define SS_PIN PA15
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
View File

@ -48,7 +48,7 @@
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB #define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif #endif
#define ENABLE_SPI2 #define SPI_DEVICE 2
// //
// Limit Switches // Limit Switches

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@ -48,7 +48,7 @@
#define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB #define MARLIN_EEPROM_SIZE EEPROM_PAGE_SIZE // 2KB
#endif #endif
#define ENABLE_SPI2 #define SPI_DEVICE 2
// //
// Limit Switches // Limit Switches

3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View File

@ -55,8 +55,7 @@
// //
// Note: MKS Robin board is using SPI2 interface. // Note: MKS Robin board is using SPI2 interface.
// //
//#define SPI_MODULE 2 #define SPI_DEVICE 2
#define ENABLE_SPI2
// //
// Limit Switches // Limit Switches

4
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View File

@ -41,8 +41,7 @@
// //
// Note: MKS Robin board is using SPI2 interface. // Note: MKS Robin board is using SPI2 interface.
// //
//#define SPI_MODULE 2 #define SPI_DEVICE 2
#define ENABLE_SPI2
// //
// Servos // Servos
@ -191,7 +190,6 @@
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define ENABLE_SPI2
#define SD_DETECT_PIN PG3 #define SD_DETECT_PIN PG3
#define SCK_PIN PB13 #define SCK_PIN PB13
#define MISO_PIN PB14 #define MISO_PIN PB14

2
Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
View File

@ -173,7 +173,7 @@
#endif #endif
// SPI1(PA7) & SPI3(PB5) not available // SPI1(PA7) & SPI3(PB5) not available
#define ENABLE_SPI2 #define SPI_DEVICE 2
#if ENABLED(SDIO_SUPPORT) #if ENABLED(SDIO_SUPPORT)
#define SCK_PIN PB13 // SPI2 ok #define SCK_PIN PB13 // SPI2 ok

2
Marlin/src/pins/stm32f4/pins_RUMBA32_MKS.h
View File

@ -46,8 +46,6 @@
#define FLASH_EEPROM_LEVELING #define FLASH_EEPROM_LEVELING
#endif #endif
#define ENABLE_SPI1
#include "pins_RUMBA32_common.h" #include "pins_RUMBA32_common.h"
#if HAS_TMC_UART #if HAS_TMC_UART

Write Preview
Loading…
Cancel
Save