Kaynağa Gözat

📌 Define RAMPS_SMART EXP headers, AZSMZ_12864

See #23501
Scott Lahteine 2 yıl önce
ebeveyn
işleme
8e24b34160

+ 1
- 2
Marlin/src/inc/Conditionals_LCD.h Dosyayı Görüntüle

@@ -101,9 +101,8 @@
101 101
 
102 102
 #elif ANY(miniVIKI, VIKI2, WYH_L12864, ELB_FULL_GRAPHIC_CONTROLLER, AZSMZ_12864)
103 103
 
104
-  #define IS_DOGM_12864 1
105
-
106 104
   #define DOGLCD
105
+  #define IS_DOGM_12864 1
107 106
   #define IS_ULTIPANEL 1
108 107
 
109 108
   #if ENABLED(miniVIKI)

+ 4
- 0
Marlin/src/pins/ramps/pins_RAMPS.h Dosyayı Görüntüle

@@ -600,6 +600,10 @@
600 600
       #define LCD_PINS_D6            AUX2_08_PIN
601 601
       #define LCD_PINS_D7            AUX2_10_PIN
602 602
 
603
+    #elif ENABLED(AZSMZ_12864)
604
+
605
+      // Pins only defined for RAMPS_SMART currently
606
+
603 607
     #else
604 608
 
605 609
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)

+ 46
- 23
Marlin/src/pins/sam/pins_RAMPS_SMART.h Dosyayı Görüntüle

@@ -61,53 +61,43 @@
61 61
  */
62 62
 
63 63
 #define BOARD_INFO_NAME "RAMPS-SMART"
64
-#define ALLOW_SAM3X8E
65
-#include "../ramps/pins_RAMPS.h"
66 64
 
67 65
 // I2C EEPROM with 4K of space
68 66
 #define I2C_EEPROM
69
-#define MARLIN_EEPROM_SIZE                0x1000
70
-
71
-#define SDA_PIN                               20
72
-#define SCL_PIN                               21
67
+#define MARLIN_EEPROM_SIZE                0x1000  // 4K
73 68
 
74 69
 // See EEPROM device datasheet for the following values. These are for 24xx256
75
-#define EEPROM_SERIAL_ADDR                  0x50  // 7 bit i2c address (without R/W bit)
76
-#define EEPROM_PAGE_SIZE                      64  // page write buffer size
77
-#define EEPROM_PAGE_WRITE_TIME                 7  // page write time in milliseconds (docs say 5ms but that is too short)
78
-
79
-#define TWI_CLOCK_FREQ                    400000
80
-#define EEPROM_ADDRSZ_BYTES TWI_MMR_IADRSZ_2_BYTE // TWI_MMR_IADRSZ_1_BYTE for 1 byte, or TWI_MMR_IADRSZ_2_BYTE for 2 byte
81
-#define EEPROM_AVAILABLE              EEPROM_I2C
82
-
83
-#define RESET_PIN                             42  // Resets the board if the jumper is attached
70
+#define EEPROM_DEVICE_ADDRESS               0x50  // 7 bit i2c address (without R/W bit)
71
+#define EEPROM_WRITE_DELAY                     7  // page write time in milliseconds (docs say 5ms but that is too short)
72
+//#define EEPROM_PAGE_SIZE                      64  // page write buffer size
73
+//#define TWI_CLOCK_FREQ                    400000
74
+//#define EEPROM_ADDRSZ_BYTES TWI_MMR_IADRSZ_2_BYTE // TWI_MMR_IADRSZ_1_BYTE for 1 byte, or TWI_MMR_IADRSZ_2_BYTE for 2 byte
75
+//#define EEPROM_AVAILABLE              EEPROM_I2C
84 76
 
85 77
 //
86 78
 // Temperature Sensors
87 79
 //
88
-#undef TEMP_0_PIN
89 80
 #define TEMP_0_PIN                             9  // Analog Input
90
-
91
-#undef TEMP_1_PIN
92 81
 #define TEMP_1_PIN                            10  // Analog Input
93
-
94
-#undef TEMP_BED_PIN
95 82
 #define TEMP_BED_PIN                          11  // Analog Input
96 83
 
97 84
 // SPI for MAX Thermocouple
98
-#undef TEMP_0_CS_PIN
99 85
 #if DISABLED(SDSUPPORT)
100 86
   #define TEMP_0_CS_PIN                       67  // Don't use 53 if using Display/SD card
101 87
 #else
102 88
   #define TEMP_0_CS_PIN                       67  // Don't use 49 (SD_DETECT_PIN)
103 89
 #endif
104 90
 
91
+#define SDA_PIN                               20
92
+#define SCL_PIN                               21
93
+#define RESET_PIN                             42  // Resets the board if the jumper is attached
94
+
105 95
 //
106 96
 // LCD / Controller
107 97
 //
108
-
109
-// Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
110 98
 #if ENABLED(AZSMZ_12864)
99
+
100
+  // Support for AZSMZ 12864 LCD with SD Card 3D printer smart controller control panel
111 101
   #define BEEPER_PIN                          66  // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 65
112 102
   #define DOGLCD_A0                           59
113 103
   #define DOGLCD_CS                           44
@@ -116,4 +106,37 @@
116 106
   #define BTN_ENC                             67  // Smart RAMPS 1.42 pinout diagram on RepRap WIKI erroneously says this should be pin 66
117 107
   #define SD_DETECT_PIN                       49  // Pin 49 for display sd interface, 72 for easy adapter board
118 108
   #define KILL_PIN                            42
109
+
110
+#else
111
+
112
+  /**        ------                     ------
113
+   *     37 |10  9 | 35      (MISO) 50 |10  9 | 52 (SCK)
114
+   *     31 | 8  7 | 41             29 | 8  7 | 53
115
+   *     33   6  5 | 23             25   6  5 | 51 (MOSI)
116
+   *     42 | 4  3 | 44             49 | 4  3 | 27
117
+   *    GND | 2  1 | 5V            GND | 2  1 | --
118
+   *         ------                     ------
119
+   *          EXP1                       EXP2
120
+   */
121
+  #define EXP1_03_PIN                         44
122
+  #define EXP1_04_PIN                         42
123
+  #define EXP1_05_PIN                         23
124
+  #define EXP1_06_PIN                         33
125
+  #define EXP1_07_PIN                         41
126
+  #define EXP1_08_PIN                         31
127
+  #define EXP1_09_PIN                         35
128
+  #define EXP1_10_PIN                         37
129
+
130
+  #define EXP2_03_PIN                         27
131
+  #define EXP2_04_PIN                         49
132
+  #define EXP2_05_PIN                         51
133
+  #define EXP2_06_PIN                         25
134
+  #define EXP2_07_PIN                         53
135
+  #define EXP2_08_PIN                         29
136
+  #define EXP2_09_PIN                         52
137
+  #define EXP2_10_PIN                         50
138
+
119 139
 #endif
140
+
141
+#define ALLOW_SAM3X8E
142
+#include "../ramps/pins_RAMPS.h"

Loading…
İptal
Kaydet