Преглед изворни кода

Merge pull request #292 from jothan/lcdfix

Lcd fixes
daid пре 12 година
родитељ
комит
ccd9fd0dc3
3 измењених фајлова са 43 додато и 23 уклоњено
  1. 6
    1
      Marlin/Configuration.h
  2. 4
    4
      Marlin/Makefile
  3. 33
    18
      Marlin/pins.h

+ 6
- 1
Marlin/Configuration.h Прегледај датотеку

@@ -296,8 +296,13 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
296 296
 //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
297 297
 //#define ULTIPANEL  //the ultipanel as on thingiverse
298 298
 
299
+// The RepRapDiscount Smart Controller
300
+// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
301
+//#define REPRAP_DISCOUNT_SMART_CONTROLLER
299 302
 
300
-#ifdef ULTIMAKERCONTROLLER    //automatic expansion
303
+
304
+//automatic expansion
305
+#if defined(ULTIMAKERCONTROLLER) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER)
301 306
  #define ULTIPANEL
302 307
  #define NEWPANEL
303 308
 #endif 

+ 4
- 4
Marlin/Makefile Прегледај датотеку

@@ -89,10 +89,10 @@ SRC =  pins_arduino.c wiring.c \
89 89
 	wiring_analog.c wiring_digital.c \
90 90
 	wiring_pulse.c \
91 91
 	wiring_shift.c WInterrupts.c
92
-CXXSRC = WMath.cpp WString.cpp Print.cpp \
93
-	Marlin.cpp MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp \
94
-	SdFatUtil.cpp SdFile.cpp SdVolume.cpp motion_control.cpp \
95
-	planner.cpp stepper.cpp temperature.cpp cardreader.cpp
92
+CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin.cpp Marlin_main.cpp	\
93
+	MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp	\
94
+	SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp		\
95
+	stepper.cpp temperature.cpp cardreader.cpp
96 96
 #CXXSRC += LiquidCrystal.cpp ultralcd.cpp
97 97
 #CXXSRC += ultralcd.cpp
98 98
 FORMAT = ihex

+ 33
- 18
Marlin/pins.h Прегледај датотеку

@@ -360,7 +360,12 @@
360 360
 #define FAN_PIN            4 // IO pin. Buffer needed
361 361
 #endif
362 362
 #define PS_ON_PIN          12
363
+
364
+#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
365
+#define KILL_PIN           41
366
+#else
363 367
 #define KILL_PIN           -1
368
+#endif
364 369
 
365 370
 #define HEATER_0_PIN       10   // EXTRUDER 1
366 371
 #if MOTHERBOARD == 33
@@ -378,8 +383,15 @@
378 383
 #ifdef ULTRA_LCD
379 384
 
380 385
   #ifdef NEWPANEL
381
-  //arduino pin which triggers an piezzo beeper
382
-    #define BEEPER 33			// Beeper on AUX-4
386
+     //encoder rotation values
387
+    #define encrot0 0
388
+    #define encrot1 2
389
+    #define encrot2 3
390
+    #define encrot3 1
391
+
392
+    #define BLEN_A 0
393
+    #define BLEN_B 1
394
+    #define BLEN_C 2
383 395
 
384 396
     #define LCD_PINS_RS 16 
385 397
     #define LCD_PINS_ENABLE 17
@@ -388,22 +400,25 @@
388 400
     #define LCD_PINS_D6 27
389 401
     #define LCD_PINS_D7 29
390 402
     
391
-    //buttons are directly attached using AUX-2
392
-    #define BTN_EN1 37
393
-    #define BTN_EN2 35
394
-    #define BTN_ENC 31  //the click
395
-    
396
-    #define BLEN_C 2
397
-    #define BLEN_B 1
398
-    #define BLEN_A 0
399
-    
400
-    #define SDCARDDETECT -1		// Ramps does not use this port
401
-    
402
-      //encoder rotation values
403
-    #define encrot0 0
404
-    #define encrot1 2
405
-    #define encrot2 3
406
-    #define encrot3 1
403
+    #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
404
+      #define BEEPER 37
405
+
406
+      #define BTN_EN1 31
407
+      #define BTN_EN2 33
408
+      #define BTN_ENC 35
409
+
410
+      #define SDCARDDETECT 49
411
+    #else
412
+      //arduino pin which triggers an piezzo beeper
413
+      #define BEEPER 33	 // Beeper on AUX-4
414
+
415
+      //buttons are directly attached using AUX-2
416
+      #define BTN_EN1 37
417
+      #define BTN_EN2 35
418
+      #define BTN_ENC 31  //the click
419
+
420
+      #define SDCARDDETECT -1  // Ramps does not use this port
421
+    #endif
407 422
 
408 423
   #else //old style panel with shift register
409 424
     //arduino pin witch triggers an piezzo beeper

Loading…
Откажи
Сачувај