瀏覽代碼

Merge pull request #7554 from thinkyhead/bf1_sanguino_config

Sanguinololu example config
Scott Lahteine 7 年之前
父節點
當前提交
ddfe527ff2

+ 3
- 2
Marlin/Marlin_main.cpp 查看文件

@@ -13324,6 +13324,7 @@ void setup() {
13324 13324
     SERIAL_ECHOPGM(MSG_CONFIGURATION_VER);
13325 13325
     SERIAL_ECHOPGM(STRING_DISTRIBUTION_DATE);
13326 13326
     SERIAL_ECHOLNPGM(MSG_AUTHOR STRING_CONFIG_H_AUTHOR);
13327
+    SERIAL_ECHO_START();
13327 13328
     SERIAL_ECHOLNPGM("Compiled: " __DATE__);
13328 13329
   #endif
13329 13330
 
@@ -13491,12 +13492,12 @@ void setup() {
13491 13492
   #if ENABLED(SWITCHING_NOZZLE)
13492 13493
     move_nozzle_servo(0);  // Initialize nozzle servo
13493 13494
   #endif
13494
-  
13495
+
13495 13496
   #if ENABLED(PARKING_EXTRUDER)
13496 13497
     #if ENABLED(PARKING_EXTRUDER_SOLENOIDS_INVERT)
13497 13498
       pe_activate_magnet(0);
13498 13499
       pe_activate_magnet(1);
13499
-    #else 
13500
+    #else
13500 13501
       pe_deactivate_magnet(0);
13501 13502
       pe_deactivate_magnet(1);
13502 13503
     #endif

+ 2
- 2
Marlin/configuration_store.cpp 查看文件

@@ -659,7 +659,7 @@ void MarlinSettings::postprocess() {
659 659
       #if ENABLED(EEPROM_CHITCHAT)
660 660
         SERIAL_ECHO_START();
661 661
         SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET));
662
-        SERIAL_ECHOPAIR(" bytes; crc ", final_crc);
662
+        SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)final_crc);
663 663
         SERIAL_ECHOLNPGM(")");
664 664
       #endif
665 665
     }
@@ -1010,7 +1010,7 @@ void MarlinSettings::postprocess() {
1010 1010
           SERIAL_ECHO_START();
1011 1011
           SERIAL_ECHO(version);
1012 1012
           SERIAL_ECHOPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET));
1013
-          SERIAL_ECHOPAIR(" bytes; crc ", working_crc);
1013
+          SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)working_crc);
1014 1014
           SERIAL_ECHOLNPGM(")");
1015 1015
         #endif
1016 1016
       }

+ 1688
- 0
Marlin/example_configurations/Sanguinololu/Configuration.h
文件差異過大導致無法顯示
查看文件


+ 1374
- 0
Marlin/example_configurations/Sanguinololu/Configuration_adv.h
文件差異過大導致無法顯示
查看文件


+ 148
- 113
Marlin/pins.h 查看文件

@@ -35,27 +35,11 @@
35 35
 #ifndef __PINS_H__
36 36
 #define __PINS_H__
37 37
 
38
-#if MB(GEN7_CUSTOM)
39
-  #include "pins_GEN7_CUSTOM.h"
40
-#elif MB(GEN7_12)
41
-  #include "pins_GEN7_12.h"
42
-#elif MB(GEN7_13)
43
-  #include "pins_GEN7_13.h"
44
-#elif MB(GEN7_14)
45
-  #include "pins_GEN7_14.h"
46
-#elif MB(CNCONTROLS_11)
47
-  #include "pins_CNCONTROLS_11.h"
48
-#elif MB(CNCONTROLS_12)
49
-  #include "pins_CNCONTROLS_12.h"
50
-#elif MB(CHEAPTRONIC)
51
-  #include "pins_CHEAPTRONIC.h"
52
-#elif MB(CHEAPTRONIC_V2)
53
-  #include "pins_CHEAPTRONICv2.h"
54
-#elif MB(SETHI)
55
-  #include "pins_SETHI.h"
56
-#elif MB(MIGHTYBOARD_REVE)
57
-  #include "pins_MIGHTYBOARD_REVE.h"
58
-#elif MB(RAMPS_OLD)
38
+//
39
+// RAMPS 1.3 / 1.4 - ATmega1280, ATmega2560
40
+//
41
+
42
+#if MB(RAMPS_OLD)
59 43
   #include "pins_RAMPS_OLD.h"
60 44
 #elif MB(RAMPS_13_EFB)
61 45
   #define IS_RAMPS_EFB
@@ -87,115 +71,166 @@
87 71
 #elif MB(RAMPS_14_SF)
88 72
   #define IS_RAMPS_SF
89 73
   #include "pins_RAMPS.h"
90
-#elif MB(GEN6)
91
-  #include "pins_GEN6.h"
92
-#elif MB(GEN6_DELUXE)
93
-  #include "pins_GEN6_DELUXE.h"
94
-#elif MB(SANGUINOLOLU_11)
95
-  #include "pins_SANGUINOLOLU_11.h"
96
-#elif MB(SANGUINOLOLU_12)
97
-  #include "pins_SANGUINOLOLU_12.h"
98
-#elif MB(MELZI)
99
-  #include "pins_MELZI.h"
100
-#elif MB(MELZI_MAKR3D)
101
-  #include "pins_MELZI_MAKR3D.h"
102
-#elif MB(MELZI_CREALITY)
103
-  #include "pins_MELZI_CREALITY.h"
104
-#elif MB(STB_11)
105
-  #include "pins_STB_11.h"
106
-#elif MB(AZTEEG_X1)
107
-  #include "pins_AZTEEG_X1.h"
108
-#elif MB(AZTEEG_X3)
109
-  #include "pins_AZTEEG_X3.h"
110
-#elif MB(AZTEEG_X3_PRO)
111
-  #include "pins_AZTEEG_X3_PRO.h"
112
-#elif MB(ANET_10)
113
-  #include "pins_ANET_10.h"
114
-#elif MB(ULTIMAKER)
115
-  #include "pins_ULTIMAKER.h"
116
-#elif MB(ULTIMAKER_OLD)
117
-  #include "pins_ULTIMAKER_OLD.h"
118
-#elif MB(ULTIMAIN_2)
119
-  #include "pins_ULTIMAIN_2.h"
74
+
75
+//
76
+// RAMPS Derivatives - ATmega1280, ATmega2560
77
+//
78
+
120 79
 #elif MB(3DRAG)
121
-  #include "pins_3DRAG.h"
80
+  #include "pins_3DRAG.h"             // ATmega1280, ATmega2560
122 81
 #elif MB(K8200)
123
-  #include "pins_K8200.h"
82
+  #include "pins_K8200.h"             // ATmega1280, ATmega2560 (3DRAG)
124 83
 #elif MB(K8400)
125
-  #include "pins_K8400.h"
126
-#elif MB(TEENSYLU)
127
-  #include "pins_TEENSYLU.h"
84
+  #include "pins_K8400.h"             // ATmega1280, ATmega2560 (3DRAG)
85
+#elif MB(BAM_DICE)
86
+  #include "pins_RAMPS.h"             // ATmega1280, ATmega2560
87
+#elif MB(BAM_DICE_DUE)
88
+  #include "pins_BAM_DICE_DUE.h"      // ATmega1280, ATmega2560
89
+#elif MB(MKS_BASE)
90
+  #include "pins_MKS_BASE.h"          // ATmega1280, ATmega2560
91
+#elif MB(MKS_13)
92
+  #include "pins_MKS_13.h"            // ATmega1280, ATmega2560
93
+#elif MB(ZRIB_V20)
94
+  #include "pins_ZRIB_V20.h"          // ATmega1280, ATmega2560 (MKS_13)
95
+#elif MB(FELIX2)
96
+  #include "pins_FELIX2.h"            // ATmega1280, ATmega2560
97
+#elif MB(RIGIDBOARD)
98
+  #include "pins_RIGIDBOARD.h"        // ATmega1280, ATmega2560
99
+#elif MB(RIGIDBOARD_V2)
100
+  #include "pins_RIGIDBOARD_V2.h"     // ATmega1280, ATmega2560
101
+#elif MB(SAINSMART_2IN1)
102
+  #include "pins_SAINSMART_2IN1.h"    // ATmega1280, ATmega2560
103
+#elif MB(ULTIMAKER)
104
+  #include "pins_ULTIMAKER.h"         // ATmega1280, ATmega2560
105
+#elif MB(ULTIMAKER_OLD)
106
+  #include "pins_ULTIMAKER_OLD.h"     // ATmega1280, ATmega2560
107
+#elif MB(AZTEEG_X3)
108
+  #include "pins_AZTEEG_X3.h"         // ATmega2560
109
+#elif MB(AZTEEG_X3_PRO)
110
+  #include "pins_AZTEEG_X3_PRO.h"     // ATmega2560
111
+#elif MB(ULTIMAIN_2)
112
+  #include "pins_ULTIMAIN_2.h"        // ATmega2560
128 113
 #elif MB(RUMBA)
129
-  #include "pins_RUMBA.h"
130
-#elif MB(PRINTRBOARD)
131
-  #include "pins_PRINTRBOARD.h"
132
-#elif MB(PRINTRBOARD_REVF)
133
-  #include "pins_PRINTRBOARD_REVF.h"
134
-#elif MB(BRAINWAVE)
135
-  #include "pins_BRAINWAVE.h"
136
-#elif MB(BRAINWAVE_PRO)
137
-  #include "pins_BRAINWAVE_PRO.h"
138
-#elif MB(SAV_MKI)
139
-  #include "pins_SAV_MKI.h"
140
-#elif MB(TEENSY2)
141
-  #include "pins_TEENSY2.h"
142
-#elif MB(GEN3_PLUS)
143
-  #include "pins_GEN3_PLUS.h"
144
-#elif MB(GEN3_MONOLITHIC)
145
-  #include "pins_GEN3_MONOLITHIC.h"
114
+  #include "pins_RUMBA.h"             // ATmega2560
115
+#elif MB(BQ_ZUM_MEGA_3D)
116
+  #include "pins_BQ_ZUM_MEGA_3D.h"    // ATmega2560
117
+
118
+//
119
+// Other ATmega1280, ATmega2560
120
+//
121
+
122
+#elif MB(CNCONTROLS_11)
123
+  #include "pins_CNCONTROLS_11.h"     // ATmega1280, ATmega2560
124
+#elif MB(CNCONTROLS_12)
125
+  #include "pins_CNCONTROLS_12.h"     // ATmega1280, ATmega2560
126
+#elif MB(MIGHTYBOARD_REVE)
127
+  #include "pins_MIGHTYBOARD_REVE.h"  // ATmega1280, ATmega2560
128
+#elif MB(CHEAPTRONIC)
129
+  #include "pins_CHEAPTRONIC.h"       // ATmega2560
130
+#elif MB(CHEAPTRONIC_V2)
131
+  #include "pins_CHEAPTRONICv2.h"     // ATmega2560
146 132
 #elif MB(MEGATRONICS)
147
-  #include "pins_MEGATRONICS.h"
148
-#elif MB(MINITRONICS)
149
-  #include "pins_MINITRONICS.h"
133
+  #include "pins_MEGATRONICS.h"       // ATmega2560
150 134
 #elif MB(MEGATRONICS_2)
151
-  #include "pins_MEGATRONICS_2.h"
135
+  #include "pins_MEGATRONICS_2.h"     // ATmega2560
152 136
 #elif MB(MEGATRONICS_3)
153
-  #include "pins_MEGATRONICS_3.h"
137
+  #include "pins_MEGATRONICS_3.h"     // ATmega2560
154 138
 #elif MB(MEGATRONICS_31)
155 139
   #define MEGATRONICS_31
156
-  #include "pins_MEGATRONICS_3.h"
157
-#elif MB(OMCA_A)
158
-  #include "pins_OMCA_A.h"
159
-#elif MB(OMCA)
160
-  #include "pins_OMCA.h"
140
+  #include "pins_MEGATRONICS_3.h"     // ATmega2560
161 141
 #elif MB(RAMBO)
162
-  #include "pins_RAMBO.h"
142
+  #include "pins_RAMBO.h"             // ATmega2560
163 143
 #elif MB(MINIRAMBO)
164
-  #include "pins_MINIRAMBO.h"
144
+  #include "pins_MINIRAMBO.h"         // ATmega2560
165 145
 #elif MB(ELEFU_3)
166
-  #include "pins_ELEFU_3.h"
167
-#elif MB(5DPRINT)
168
-  #include "pins_5DPRINT.h"
146
+  #include "pins_ELEFU_3.h"           // ATmega2560
169 147
 #elif MB(LEAPFROG)
170
-  #include "pins_LEAPFROG.h"
171
-#elif MB(BAM_DICE)
172
-  #include "pins_RAMPS.h"
173
-#elif MB(BAM_DICE_DUE)
174
-  #include "pins_BAM_DICE_DUE.h"
175
-#elif MB(FELIX2)
176
-  #include "pins_FELIX2.h"
177
-#elif MB(MKS_BASE)
178
-  #include "pins_MKS_BASE.h"
179
-#elif MB(RIGIDBOARD)
180
-  #include "pins_RIGIDBOARD.h"
181
-#elif MB(RIGIDBOARD_V2)
182
-  #include "pins_RIGIDBOARD_V2.h"
148
+  #include "pins_LEAPFROG.h"          // ATmega1280, ATmega2560
183 149
 #elif MB(MEGACONTROLLER)
184
-  #include "pins_MEGACONTROLLER.h"
185
-#elif MB(BQ_ZUM_MEGA_3D)
186
-  #include "pins_BQ_ZUM_MEGA_3D.h"
150
+  #include "pins_MEGACONTROLLER.h"    // ATmega2560
187 151
 #elif MB(SCOOVO_X9H)
188
-  #include "pins_SCOOVO_X9H.h"
189
-#elif MB(MKS_13)
190
-  #include "pins_MKS_13.h"
191
-#elif MB(SAINSMART_2IN1)
192
-  #include "pins_SAINSMART_2IN1.h"
193
-#elif MB(ZRIB_V20)
194
-  #include "pins_ZRIB_V20.h"
152
+  #include "pins_SCOOVO_X9H.h"        // ATmega2560
195 153
 #elif MB(GT2560_REV_A)
196
-  #include "pins_GT2560_REV_A.h"
154
+  #include "pins_GT2560_REV_A.h"      // ATmega1280, ATmega2560
197 155
 #elif MB(GT2560_REV_A_PLUS)
198
-  #include "pins_GT2560_REV_A_PLUS.h"
156
+  #include "pins_GT2560_REV_A_PLUS.h" // ATmega1280, ATmega2560
157
+
158
+//
159
+// ATmega1281, ATmega2561
160
+//
161
+
162
+#elif MB(MINITRONICS)
163
+  #include "pins_MINITRONICS.h"       // ATmega1281
164
+
165
+//
166
+// Sanguinololu and Derivatives - ATmega644P, ATmega1284P
167
+//
168
+
169
+#elif MB(SANGUINOLOLU_11)
170
+  #include "pins_SANGUINOLOLU_11.h"   // ATmega644P, ATmega1284P
171
+#elif MB(SANGUINOLOLU_12)
172
+  #include "pins_SANGUINOLOLU_12.h"   // ATmega644P, ATmega1284P
173
+#elif MB(MELZI)
174
+  #include "pins_MELZI.h"             // ATmega644P, ATmega1284P
175
+#elif MB(MELZI_MAKR3D)
176
+  #include "pins_MELZI_MAKR3D.h"      // ATmega644P, ATmega1284P
177
+#elif MB(MELZI_CREALITY)
178
+  #include "pins_MELZI_CREALITY.h"    // ATmega644P, ATmega1284P
179
+#elif MB(STB_11)
180
+  #include "pins_STB_11.h"            // ATmega644P, ATmega1284P
181
+#elif MB(AZTEEG_X1)
182
+  #include "pins_AZTEEG_X1.h"         // ATmega644P, ATmega1284P
183
+
184
+//
185
+// Other ATmega644P, ATmega644, ATmega1284P
186
+//
187
+
188
+#elif MB(GEN3_MONOLITHIC)
189
+  #include "pins_GEN3_MONOLITHIC.h"   // ATmega644P
190
+#elif MB(GEN3_PLUS)
191
+  #include "pins_GEN3_PLUS.h"         // ATmega644P, ATmega1284P
192
+#elif MB(GEN6)
193
+  #include "pins_GEN6.h"              // ATmega644P, ATmega1284P
194
+#elif MB(GEN6_DELUXE)
195
+  #include "pins_GEN6_DELUXE.h"       // ATmega644P, ATmega1284P
196
+#elif MB(GEN7_CUSTOM)
197
+  #include "pins_GEN7_CUSTOM.h"       // ATmega644P, ATmega644, ATmega1284P
198
+#elif MB(GEN7_12)
199
+  #include "pins_GEN7_12.h"           // ATmega644P, ATmega644, ATmega1284P
200
+#elif MB(GEN7_13)
201
+  #include "pins_GEN7_13.h"           // ATmega644P, ATmega644, ATmega1284P
202
+#elif MB(GEN7_14)
203
+  #include "pins_GEN7_14.h"           // ATmega644P, ATmega644, ATmega1284P
204
+#elif MB(OMCA_A)
205
+  #include "pins_OMCA_A.h"            // ATmega644
206
+#elif MB(OMCA)
207
+  #include "pins_OMCA.h"              // ATmega644P, ATmega644
208
+#elif MB(ANET_10)
209
+  #include "pins_ANET_10.h"           // ATmega1284P
210
+#elif MB(SETHI)
211
+  #include "pins_SETHI.h"             // ATmega644P, ATmega644, ATmega1284P
212
+
213
+//
214
+// Teensyduino - AT90USB1286, AT90USB1286P
215
+//
216
+
217
+#elif MB(TEENSYLU)
218
+  #include "pins_TEENSYLU.h"          // AT90USB1286, AT90USB1286P
219
+#elif MB(PRINTRBOARD)
220
+  #include "pins_PRINTRBOARD.h"       // AT90USB1286
221
+#elif MB(PRINTRBOARD_REVF)
222
+  #include "pins_PRINTRBOARD_REVF.h"  // AT90USB1286
223
+#elif MB(BRAINWAVE)
224
+  #include "pins_BRAINWAVE.h"         // AT90USB646
225
+#elif MB(BRAINWAVE_PRO)
226
+  #include "pins_BRAINWAVE_PRO.h"     // AT90USB1286
227
+#elif MB(SAV_MKI)
228
+  #include "pins_SAV_MKI.h"           // AT90USB1286
229
+#elif MB(TEENSY2)
230
+  #include "pins_TEENSY2.h"           // AT90USB1286
231
+#elif MB(5DPRINT)
232
+  #include "pins_5DPRINT.h"           // AT90USB1286
233
+
199 234
 #else
200 235
   #error "Unknown MOTHERBOARD value set in Configuration.h"
201 236
 #endif

+ 4
- 1
Marlin/pinsDebug.h 查看文件

@@ -272,7 +272,10 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
272 272
 static void err_is_counter()     { SERIAL_PROTOCOLPGM("   non-standard PWM mode"); }
273 273
 static void err_is_interrupt()   { SERIAL_PROTOCOLPGM("   compare interrupt enabled"); }
274 274
 static void err_prob_interrupt() { SERIAL_PROTOCOLPGM("   overflow interrupt enabled"); }
275
-static void print_is_also_tied() { SERIAL_PROTOCOLPGM(" is also tied to this pin"); SERIAL_PROTOCOL_SP(14); }
275
+
276
+#if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
277
+  static void print_is_also_tied() { SERIAL_PROTOCOLPGM(" is also tied to this pin"); SERIAL_PROTOCOL_SP(14); }
278
+#endif
276 279
 
277 280
 void com_print(uint8_t N, uint8_t Z) {
278 281
   const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);

+ 1
- 2
Marlin/pins_AZTEEG_X1.h 查看文件

@@ -26,5 +26,4 @@
26 26
 
27 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
- 4
Marlin/pins_GEN6.h 查看文件

@@ -51,10 +51,8 @@
51 51
  *
52 52
  */
53 53
 
54
-#ifndef __AVR_ATmega644P__
55
-  #ifndef __AVR_ATmega1284P__
56
-    #error "Oops!  Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
57
-  #endif
54
+#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
55
+  #error "Oops!  Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
58 56
 #endif
59 57
 
60 58
 #ifndef BOARD_NAME

+ 1
- 0
Marlin/pins_GT2560_REV_A_PLUS.h 查看文件

@@ -26,6 +26,7 @@
26 26
 
27 27
 #include "pins_GT2560_REV_A.h"
28 28
 
29
+#undef BOARD_NAME
29 30
 #define BOARD_NAME  "GT2560 Rev.A+"
30 31
 
31 32
 #define SERVO0_PIN  11

+ 2
- 7
Marlin/pins_MELZI.h 查看文件

@@ -25,10 +25,5 @@
25 25
  */
26 26
 
27 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 查看文件

@@ -25,17 +25,12 @@
25 25
  */
26 26
 
27 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 31
 // For the stock CR-10 use the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
34 32
 //   option for the display in Configuration.h
35 33
 
36
-#define SANGUINOLOLU_V_1_2
37
-#include "pins_SANGUINOLOLU_11.h"
38
-
39 34
 #undef LCD_SDSS
40 35
 #undef LED_PIN
41 36
 

+ 2
- 7
Marlin/pins_MELZI_MAKR3D.h 查看文件

@@ -25,10 +25,5 @@
25 25
  */
26 26
 
27 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 查看文件

@@ -59,7 +59,9 @@
59 59
   #define BOARD_NAME "Sanguinololu <1.2"
60 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 67
 // Limit Switches
@@ -116,7 +118,7 @@
116 118
 
117 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 122
   #define FAN_PIN           4 // Works for Panelolu2 too
121 123
 #endif
122 124
 
@@ -133,16 +135,25 @@
133 135
 //#define SDSS               24
134 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 140
 #elif MB(STB_11)
139 141
   #define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
140 142
 #endif
141 143
 
142 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 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 158
 // LCD / Controller
148 159
 //
@@ -152,7 +163,7 @@
152 163
 
153 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 167
         #define LCD_PINS_RS     30 // CS chip select /SS chip slave select
157 168
         #define LCD_PINS_ENABLE 29 // SID (MOSI)
158 169
         #define LCD_PINS_D4     17 // SCK (CLK) clock
@@ -160,7 +171,7 @@
160 171
         // Marlin so this can be used for BEEPER_PIN. You can use this pin
161 172
         // with M42 instead of BEEPER_PIN.
162 173
         #define BEEPER_PIN      27
163
-      #else        // Sanguinololu 1.3
174
+      #else        // Sanguinololu >=1.3
164 175
         #define LCD_PINS_RS      4
165 176
         #define LCD_PINS_ENABLE 17
166 177
         #define LCD_PINS_D4     30
@@ -210,7 +221,7 @@
210 221
 
211 222
   #if ENABLED(LCD_I2C_PANELOLU2)
212 223
 
213
-    #if IS_MELZI
224
+    #if ENABLED(IS_MELZI)
214 225
       #define BTN_ENC           29
215 226
       #define LCD_SDSS          30 // Panelolu2 SD card reader rather than the Melzi
216 227
     #else
@@ -280,7 +291,7 @@
280 291
      *                                   MS3  O|     |O  2A
281 292
      *                                /RESET  O|     |O  1A
282 293
      *                                /SLEEP  O|     |O  1B
283
-     *  SPINDLE_LASER_PWM_PIN  STEP  O|     |O  VDD
294
+     *  SPINDLE_LASER_PWM_PIN           STEP  O|     |O  VDD
284 295
      *  SPINDLE_LASER_ENABLE_PIN         DIR  O|     |O  GND
285 296
      *                                         -------
286 297
      *

+ 3
- 4
Marlin/pins_SANGUINOLOLU_12.h 查看文件

@@ -27,15 +27,14 @@
27 27
  *
28 28
  *  AZTEEG_X1
29 29
  *  MELZI
30
+ *  MELZI_CREALITY
30 31
  *  MELZI_MAKR3D
31 32
  *  SANGUINOLOLU_12
32 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 38
 #endif
40 39
 
41 40
 #define SANGUINOLOLU_V_1_2

+ 1
- 7
Marlin/pins_STB_11.h 查看文件

@@ -25,10 +25,4 @@
25 25
  */
26 26
 
27 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"

+ 1
- 1
Marlin/temperature.cpp 查看文件

@@ -1559,7 +1559,7 @@ void Temperature::set_current_temp_raw() {
1559 1559
 
1560 1560
     if (endstop_change) {
1561 1561
       #if HAS_X_MIN
1562
-        if (TEST(endstop_change, X_MIN)) SERIAL_PROTOCOLPAIR("X_MIN:", !!TEST(current_endstop_bits_local, X_MIN));
1562
+        if (TEST(endstop_change, X_MIN)) SERIAL_PROTOCOLPAIR("  X_MIN:", !!TEST(current_endstop_bits_local, X_MIN));
1563 1563
       #endif
1564 1564
       #if HAS_X_MAX
1565 1565
         if (TEST(endstop_change, X_MAX)) SERIAL_PROTOCOLPAIR("  X_MAX:", !!TEST(current_endstop_bits_local, X_MAX));

+ 6
- 0
platformio.ini 查看文件

@@ -74,3 +74,9 @@ framework = arduino
74 74
 board = sanguino_atmega1284p
75 75
 upload_speed = 57600
76 76
 lib_deps = ${common.lib_deps}
77
+
78
+[env:sanguino_atmega644p]
79
+platform = atmelavr
80
+framework = arduino
81
+board = sanguino_atmega644p
82
+lib_deps = ${common.lib_deps}

Loading…
取消
儲存