Selaa lähdekoodia

Tweak Sanguinololu-related pins files

Scott Lahteine 7 vuotta sitten
vanhempi
commit
356af7dcb0

+ 1
- 2
Marlin/pins_AZTEEG_X1.h Näytä tiedosto

26
 
26
 
27
 #define BOARD_NAME "Azteeg X1"
27
 #define BOARD_NAME "Azteeg X1"
28
 
28
 
29
-#define SANGUINOLOLU_V_1_2
30
-#include "pins_SANGUINOLOLU_11.h"
29
+#include "pins_SANGUINOLOLU_12.h"

+ 2
- 7
Marlin/pins_MELZI.h Näytä tiedosto

25
  */
25
  */
26
 
26
 
27
 #define BOARD_NAME "Melzi"
27
 #define BOARD_NAME "Melzi"
28
-
29
-#ifdef __AVR_ATmega1284P__
30
-  #define LARGE_FLASH true
31
-#endif
32
-
33
-#define SANGUINOLOLU_V_1_2
34
-#include "pins_SANGUINOLOLU_11.h"
28
+#define IS_MELZI
29
+#include "pins_SANGUINOLOLU_12.h"

+ 2
- 7
Marlin/pins_MELZI_CREALITY.h Näytä tiedosto

25
  */
25
  */
26
 
26
 
27
 #define BOARD_NAME "Melzi (Creality)"
27
 #define BOARD_NAME "Melzi (Creality)"
28
-
29
-#ifdef __AVR_ATmega1284P__
30
-  #define LARGE_FLASH true
31
-#endif
28
+#define IS_MELZI
29
+#include "pins_SANGUINOLOLU_12.h"
32
 
30
 
33
 // For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
31
 // For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
34
 //   option for the display in Configuration.h
32
 //   option for the display in Configuration.h
35
 
33
 
36
-#define SANGUINOLOLU_V_1_2
37
-#include "pins_SANGUINOLOLU_11.h"
38
-
39
 #undef LCD_SDSS
34
 #undef LCD_SDSS
40
 #undef LED_PIN
35
 #undef LED_PIN
41
 
36
 

+ 2
- 7
Marlin/pins_MELZI_MAKR3D.h Näytä tiedosto

25
  */
25
  */
26
 
26
 
27
 #define BOARD_NAME "Melzi (ATmega1284)"
27
 #define BOARD_NAME "Melzi (ATmega1284)"
28
-
29
-#ifdef __AVR_ATmega1284P__
30
-  #define LARGE_FLASH true
31
-#endif
32
-
33
-#define SANGUINOLOLU_V_1_2
34
-#include "pins_SANGUINOLOLU_11.h"
28
+#define IS_MELZI
29
+#include "pins_SANGUINOLOLU_12.h"

+ 20
- 9
Marlin/pins_SANGUINOLOLU_11.h Näytä tiedosto

59
   #define BOARD_NAME "Sanguinololu <1.2"
59
   #define BOARD_NAME "Sanguinololu <1.2"
60
 #endif
60
 #endif
61
 
61
 
62
-#define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D) || MB(MELZI_CREALITY))
62
+#ifdef __AVR_ATmega1284P__
63
+  #define LARGE_FLASH true
64
+#endif
63
 
65
 
64
 //
66
 //
65
 // Limit Switches
67
 // Limit Switches
116
 
118
 
117
 #endif
119
 #endif
118
 
120
 
119
-#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
121
+#if MB(AZTEEG_X1) || MB(STB_11) || ENABLED(IS_MELZI)
120
   #define FAN_PIN           4 // Works for Panelolu2 too
122
   #define FAN_PIN           4 // Works for Panelolu2 too
121
 #endif
123
 #endif
122
 
124
 
133
 //#define SDSS               24
135
 //#define SDSS               24
134
 #define SDSS               31
136
 #define SDSS               31
135
 
137
 
136
-#if IS_MELZI
137
-  #define LED_PIN           27
138
+#if ENABLED(IS_MELZI)
139
+  #define LED_PIN          27
138
 #elif MB(STB_11)
140
 #elif MB(STB_11)
139
   #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
141
   #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
140
 #endif
142
 #endif
141
 
143
 
142
 #if DISABLED(SPINDLE_LASER_ENABLE) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL))  // try to use IO Header
144
 #if DISABLED(SPINDLE_LASER_ENABLE) && ENABLED(SANGUINOLOLU_V_1_2) && !(ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL))  // try to use IO Header
143
-  #define CASE_LIGHT_PIN         4   // MUST BE HARDWARE PWM  - see if IO Header is available
145
+  #define CASE_LIGHT_PIN     4 // MUST BE HARDWARE PWM  - see if IO Header is available
144
 #endif
146
 #endif
145
 
147
 
148
+/**
149
+ * Sanguinololu 1.4 AUX pins:
150
+ *
151
+ *           PWM  TX1  RX1  SDA  SCL
152
+ *  12V  5V  D12  D11  D10  D17  D16
153
+ *  GND GND  D31  D30  D29  D28  D27
154
+ *            A4   A3   A2   A1   A0
155
+ */
156
+
146
 //
157
 //
147
 // LCD / Controller
158
 // LCD / Controller
148
 //
159
 //
152
 
163
 
153
     #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
164
     #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
154
 
165
 
155
-      #if IS_MELZI // Melzi board
166
+      #if ENABLED(IS_MELZI)
156
         #define LCD_PINS_RS     30 // CS chip select /SS chip slave select
167
         #define LCD_PINS_RS     30 // CS chip select /SS chip slave select
157
         #define LCD_PINS_ENABLE 29 // SID (MOSI)
168
         #define LCD_PINS_ENABLE 29 // SID (MOSI)
158
         #define LCD_PINS_D4     17 // SCK (CLK) clock
169
         #define LCD_PINS_D4     17 // SCK (CLK) clock
160
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
171
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
161
         // with M42 instead of BEEPER_PIN.
172
         // with M42 instead of BEEPER_PIN.
162
         #define BEEPER_PIN      27
173
         #define BEEPER_PIN      27
163
-      #else        // Sanguinololu 1.3
174
+      #else        // Sanguinololu >=1.3
164
         #define LCD_PINS_RS      4
175
         #define LCD_PINS_RS      4
165
         #define LCD_PINS_ENABLE 17
176
         #define LCD_PINS_ENABLE 17
166
         #define LCD_PINS_D4     30
177
         #define LCD_PINS_D4     30
210
 
221
 
211
   #if ENABLED(LCD_I2C_PANELOLU2)
222
   #if ENABLED(LCD_I2C_PANELOLU2)
212
 
223
 
213
-    #if IS_MELZI
224
+    #if ENABLED(IS_MELZI)
214
       #define BTN_ENC           29
225
       #define BTN_ENC           29
215
       #define LCD_SDSS          30 // Panelolu2 SD card reader rather than the Melzi
226
       #define LCD_SDSS          30 // Panelolu2 SD card reader rather than the Melzi
216
     #else
227
     #else
280
      *                                   MS3  O|     |O  2A
291
      *                                   MS3  O|     |O  2A
281
      *                                /RESET  O|     |O  1A
292
      *                                /RESET  O|     |O  1A
282
      *                                /SLEEP  O|     |O  1B
293
      *                                /SLEEP  O|     |O  1B
283
-     *  SPINDLE_LASER_PWM_PIN  STEP  O|     |O  VDD
294
+     *  SPINDLE_LASER_PWM_PIN           STEP  O|     |O  VDD
284
      *  SPINDLE_LASER_ENABLE_PIN         DIR  O|     |O  GND
295
      *  SPINDLE_LASER_ENABLE_PIN         DIR  O|     |O  GND
285
      *                                         -------
296
      *                                         -------
286
      *
297
      *

+ 3
- 4
Marlin/pins_SANGUINOLOLU_12.h Näytä tiedosto

27
  *
27
  *
28
  *  AZTEEG_X1
28
  *  AZTEEG_X1
29
  *  MELZI
29
  *  MELZI
30
+ *  MELZI_CREALITY
30
  *  MELZI_MAKR3D
31
  *  MELZI_MAKR3D
31
  *  SANGUINOLOLU_12
32
  *  SANGUINOLOLU_12
32
  *  STB_11
33
  *  STB_11
33
  */
34
  */
34
 
35
 
35
-#define BOARD_NAME "Sanguinololu 1.2"
36
-
37
-#ifdef __AVR_ATmega1284P__
38
-  #define LARGE_FLASH true
36
+#ifndef BOARD_NAME
37
+  #define BOARD_NAME "Sanguinololu 1.2"
39
 #endif
38
 #endif
40
 
39
 
41
 #define SANGUINOLOLU_V_1_2
40
 #define SANGUINOLOLU_V_1_2

+ 1
- 7
Marlin/pins_STB_11.h Näytä tiedosto

25
  */
25
  */
26
 
26
 
27
 #define BOARD_NAME "STB V1.1"
27
 #define BOARD_NAME "STB V1.1"
28
-
29
-#ifdef __AVR_ATmega1284P__
30
-  #define LARGE_FLASH true
31
-#endif
32
-
33
-#define SANGUINOLOLU_V_1_2
34
-#include "pins_SANGUINOLOLU_11.h"
28
+#include "pins_SANGUINOLOLU_12.h"

Loading…
Peruuta
Tallenna