thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🚸 Renumber EXP pins to match schematics/RRF/Klipper

Browse Source
This commit is contained in:
Scott Lahteine
2022-07-16 16:26:36 -05:00
parent 05a7be7b25
commit 504fec9823
53 changed files with 2587 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View File

@@ -132,10 +132,10 @@
/**
* EXP1 Connector EXP1 as CR10 STOCKDISPLAY
* ------ ------
* PA4 |10 9 | PC0 BEEPER_PIN |10 9 | BTN_ENC
* PD3 | 8 7 | RESET BTN_EN1 | 8 7 | RESET
* PD2 6 5 | PA1 BTN_EN2 6 5 | LCD_PINS_D4 (ST9720 CLK)
* PA3 | 4 3 | PC1 (ST9720 CS) LCD_PINS_RS | 4 3 | LCD_PINS_ENABLE (ST9720 DAT)
* GND | 2 1 | 5V GND | 2 1 | 5V
* PA4 | 1 2 | PC0 BEEPER_PIN | 1 2 | BTN_ENC
* PD3 | 3 4 | RESET BTN_EN1 | 3 4 | RESET
* PD2 5 6 | PA1 BTN_EN2 5 6 | LCD_PINS_D4 (ST9720 CLK)
* PA3 | 7 8 | PC1 (ST9720 CS) LCD_PINS_RS | 7 8 | LCD_PINS_ENABLE (ST9720 DAT)
* GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
*/

48
Marlin/src/pins/sanguino/pins_ZMIB_V2.h
View File

@@ -164,25 +164,25 @@
/** EXP1
* ------
* (MOSI) D5 |10 9 | D7 (SCK)
* (CS) D11 | 8 7 | D10 (DC/D4)
* (EN2) D12 6 5 | D4 or D3 (EN/RS)
* (ENC) D29 | 4 3 | D2 (EN1)
* (GND) | 2 1 | (5V)
* (MOSI) D5 | 1 2 | D7 (SCK)
* (CS) D11 | 3 4 | D10 (DC/D4)
* (EN2) D12 5 6 | D4 or D3 (EN/RS)
* (ENC) D29 | 7 8 | D2 (EN1)
* (GND) | 9 10 | (5V)
* ------
*/
#define EXP1_03_PIN 2
#define EXP1_04_PIN 29
#define EXP1_08_PIN 2
#define EXP1_07_PIN 29
#ifndef IS_ZMIB_V2
#define EXP1_05_PIN 4 // ZMIB V1
#define EXP1_06_PIN 4 // ZMIB V1
#else
#define EXP1_05_PIN 3 // ZMIB V2
#define EXP1_06_PIN 3 // ZMIB V2
#endif
#define EXP1_06_PIN 12
#define EXP1_07_PIN 10
#define EXP1_08_PIN 11
#define EXP1_09_PIN 7
#define EXP1_10_PIN 5
#define EXP1_05_PIN 12
#define EXP1_04_PIN 10
#define EXP1_03_PIN 11
#define EXP1_02_PIN 7
#define EXP1_01_PIN 5
#if ENABLED(ZONESTAR_12864LCD)
//
@@ -190,10 +190,10 @@
//
#define LCDSCREEN_NAME "ZONESTAR_12864LCD"
#define FORCE_SOFT_SPI
//#define LCD_SDSS EXP1_08_PIN
#define LCD_PINS_RS EXP1_08_PIN // ST7920_CS_PIN (LCD module pin 4)
#define LCD_PINS_ENABLE EXP1_05_PIN // ST7920_DAT_PIN (LCD module pin 5)
#define LCD_PINS_D4 EXP1_07_PIN // ST7920_CLK_PIN (LCD module pin 6)
//#define LCD_SDSS EXP1_03_PIN
#define LCD_PINS_RS EXP1_03_PIN // ST7920_CS_PIN (LCD module pin 4)
#define LCD_PINS_ENABLE EXP1_06_PIN // ST7920_DAT_PIN (LCD module pin 5)
#define LCD_PINS_D4 EXP1_04_PIN // ST7920_CLK_PIN (LCD module pin 6)
#define BOARD_ST7920_DELAY_1 DELAY_2_NOP
#define BOARD_ST7920_DELAY_2 DELAY_2_NOP
@@ -205,9 +205,9 @@
//
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
#define FORCE_SOFT_SPI
#define LCD_PINS_RS EXP1_05_PIN
#define LCD_PINS_DC EXP1_07_PIN
#define DOGLCD_CS EXP1_08_PIN
#define LCD_PINS_RS EXP1_06_PIN
#define LCD_PINS_DC EXP1_04_PIN
#define DOGLCD_CS EXP1_03_PIN
#if ENABLED(OLED_HW_IIC)
#error "Oops! can't choose HW IIC for ZMIB board!!"
@@ -224,9 +224,9 @@
// All the above are also RRDSC with rotary encoder
//
#if IS_RRD_SC
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXP1_04_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_05_PIN
#define BTN_ENC EXP1_07_PIN
#define BEEPER_PIN -1
#define KILL_PIN -1
#endif