Ver código fonte

fixed typos, removed M84 pin usage for MM

PavelSindler 7 anos atrás
pai
commit
4af075a316

+ 0 - 5
Firmware/Marlin_main.cpp

@@ -5803,7 +5803,6 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
 
 		  pinMode(E_MUX0_PIN, OUTPUT);
 		  pinMode(E_MUX1_PIN, OUTPUT);
-		  pinMode(E_MUX2_PIN, OUTPUT);
 
 		  delay(100);
 		  SERIAL_ECHO_START;
@@ -5813,22 +5812,18 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
 		  case 1:
 			  WRITE(E_MUX0_PIN, HIGH);
 			  WRITE(E_MUX1_PIN, LOW);
-			  WRITE(E_MUX2_PIN, LOW);
 			  break;
 		  case 2:
 			  WRITE(E_MUX0_PIN, LOW);
 			  WRITE(E_MUX1_PIN, HIGH);
-			  WRITE(E_MUX2_PIN, LOW);
 			  break;
 		  case 3:
 			  WRITE(E_MUX0_PIN, HIGH);
 			  WRITE(E_MUX1_PIN, HIGH);
-			  WRITE(E_MUX2_PIN, LOW);
 			  break;
 		  default:
 			  WRITE(E_MUX0_PIN, LOW);
 			  WRITE(E_MUX1_PIN, LOW);
-			  WRITE(E_MUX2_PIN, LOW);
 			  break;
 		  }
 		  delay(100);

+ 0 - 2
Firmware/pins.h

@@ -67,7 +67,6 @@
 
 #define E_MUX0_PIN 17
 #define E_MUX1_PIN 16
-#define E_MUX2_PIN 84
 
 
 #endif
@@ -229,7 +228,6 @@
 
 #define E_MUX0_PIN 17
 #define E_MUX1_PIN 16
-#define E_MUX2_PIN 84
 
 
 #endif

+ 4 - 21
Firmware/ultralcd.cpp

@@ -620,9 +620,9 @@ void lcd_commands()
 		{
 			lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
 			enquecommand_P(PSTR("G1 Z0.250 F7200.000"));
-			enquecommand_P(PSTR("G1 X50.0 E80.0  F1000.0));
-			nquecommand_P(PSTR("G1 X160.0 E20.0  F1000.0));
-			enquecommand_P(PSTR("G1 Z0.200 F7200.000));
+			enquecommand_P(PSTR("G1 X50.0 E80.0  F1000.0"));
+			enquecommand_P(PSTR("G1 X160.0 E20.0  F1000.0"));
+			enquecommand_P(PSTR("G1 Z0.200 F7200.000"));
 			enquecommand_P(PSTR("G1 X220.0 E13 F1000.0"));
 			enquecommand_P(PSTR("G1 X240.0 E0 F1000.0"));
 			enquecommand_P(PSTR("G92 E0.0"));
@@ -3799,33 +3799,24 @@ void change_extr(int extr) { //switches multiplexer for extruders
 
 	pinMode(E_MUX0_PIN, OUTPUT);
 	pinMode(E_MUX1_PIN, OUTPUT);
-	pinMode(E_MUX2_PIN, OUTPUT);
 
 	switch (extr) {
 	case 1:
-		SERIAL_ECHOPGM("extr2");
 		WRITE(E_MUX0_PIN, HIGH);
 		WRITE(E_MUX1_PIN, LOW);
-		WRITE(E_MUX2_PIN, LOW);
 		break;
 	case 2:
-		SERIAL_ECHOPGM("extr3");
 		WRITE(E_MUX0_PIN, LOW);
 		WRITE(E_MUX1_PIN, HIGH);
-		WRITE(E_MUX2_PIN, LOW);
 		break;
 	case 3:
-		SERIAL_ECHOPGM("extr4");
 		WRITE(E_MUX0_PIN, HIGH);
 		WRITE(E_MUX1_PIN, HIGH);
-		WRITE(E_MUX2_PIN, LOW);
 		
 		break;
 	default:
-		SERIAL_ECHOPGM("extr1");
 		WRITE(E_MUX0_PIN, LOW);
 		WRITE(E_MUX1_PIN, LOW);
-		WRITE(E_MUX2_PIN, LOW);
 		
 		break;
 	}	
@@ -3834,15 +3825,7 @@ void change_extr(int extr) { //switches multiplexer for extruders
 }
 
 static int get_ext_nr() { //reads multiplexer input pins and return current extruder number (counted from 0)
-	SERIAL_ECHOPGM("E_MUX0_PIN:");
-	READ(E_MUX0_PIN) ? SERIAL_ECHOLNPGM(" true") : SERIAL_ECHOLNPGM(" false");
-	SERIAL_ECHOPGM("E_MUX1_PIN:");
-	READ(E_MUX1_PIN) ? SERIAL_ECHOLNPGM(" true") : SERIAL_ECHOLNPGM(" false");
-	SERIAL_ECHOPGM("E_MUX2_PIN:");
-	READ(E_MUX2_PIN) ? SERIAL_ECHOLNPGM(" true") : SERIAL_ECHOLNPGM(" false");
-
-	return(4 * READ(E_MUX2_PIN) + 2 * READ(E_MUX1_PIN) + READ(E_MUX0_PIN));
-	//return(2 * READ(E_MUX1_PIN) + READ(E_MUX0_PIN));
+	return(2 * READ(E_MUX1_PIN) + READ(E_MUX0_PIN));
 }
 
 

+ 1 - 0
Firmware/ultralcd_implementation_hitachi_HD44780.h

@@ -498,6 +498,7 @@ void lcd_set_custom_characters_nextpage()
 	B10110,
 	B11100,
 	B01000,
+	B00000,
 	B00000
   };