3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/MK3' into MK3

Browse source 
reverting
This commit is contained in:
PavelSindler 2017-07-07 10:58:24 +02:00
commit 7e0a1717be
4 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Firmware/Marlin_main.cpp
View file

@ -911,14 +911,14 @@ static void lcd_language_menu();
#ifdef HAVE_PAT9125_SENSOR #ifdef HAVE_PAT9125_SENSOR
bool fsensor_enabled = true; bool fsensor_enabled = false;
bool fsensor_ignore_error = true; bool fsensor_ignore_error = true;
bool fsensor_M600 = false; bool fsensor_M600 = false;
long prev_pos_e = 0; long prev_pos_e = 0;
long err_cnt = 0; long err_cnt = 0;
#define FSENS_ESTEPS 140 //extruder resolution [steps/mm] #define FSENS_ESTEPS 280 //extruder resolution [steps/mm]
#define FSENS_MINDEL 280 //filament sensor min delta [steps] (3mm) #define FSENS_MINDEL 560 //filament sensor min delta [steps] (3mm)
#define FSENS_MINFAC 3 //filament sensor minimum factor [count/mm] #define FSENS_MINFAC 3 //filament sensor minimum factor [count/mm]
#define FSENS_MAXFAC 50 //filament sensor maximum factor [count/mm] #define FSENS_MAXFAC 50 //filament sensor maximum factor [count/mm]
#define FSENS_MAXERR 2 //filament sensor max error count #define FSENS_MAXERR 2 //filament sensor max error count
@ -5996,10 +5996,14 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
} }
break; break;
case 3: case 3:
#ifdef HAVE_PAT9125_SENSOR
fsensor_enable(); fsensor_enable();
#endif
break; break;
case 4: case 4:
#ifdef HAVE_PAT9125_SENSOR
fsensor_disable(); fsensor_disable();
#endif
break; break;
} }
} }

6
Firmware/swspi.h
View file

@ -21,9 +21,9 @@
#define SWSPI_CS 20 //SDA #define SWSPI_CS 20 //SDA
#endif //(MOTHERBOARD == BOARD_EINY_0_3a) #endif //(MOTHERBOARD == BOARD_EINY_0_3a)
#if (MOTHERBOARD == BOARD_EINY_0_4a) #if (MOTHERBOARD == BOARD_EINY_0_4a)
#define SWSPI_MISO 62 //PK0 #define SWSPI_MISO 21 //PK0
#define SWSPI_MOSI 62 //PK0 #define SWSPI_MOSI 21 //PK0
#define SWSPI_SCK 21 //SCL #define SWSPI_SCK 62 //SCL
#define SWSPI_CS 20 //SDA #define SWSPI_CS 20 //SDA
#endif //(MOTHERBOARD == BOARD_EINY_0_4a) #endif //(MOTHERBOARD == BOARD_EINY_0_4a)
#endif //SWSPI_AVR #endif //SWSPI_AVR

8
Firmware/ultralcd.cpp
View file

@ -102,6 +102,8 @@ int8_t SDscrool = 0;
int8_t SilentModeMenu = 0; int8_t SilentModeMenu = 0;
int8_t FSensorStateMenu = 0; int8_t FSensorStateMenu = 0;
extern void fsensor_enable();
extern void fsensor_disable();
#ifdef SNMM #ifdef SNMM
@ -2472,8 +2474,14 @@ void EEPROM_read(int pos, uint8_t* value, uint8_t size)
static void lcd_fsensor_state_set() static void lcd_fsensor_state_set()
{ {
if (!FSensorStateMenu==0) {
fsensor_disable();
}else{
fsensor_enable();
}
FSensorStateMenu = !FSensorStateMenu; FSensorStateMenu = !FSensorStateMenu;
lcd_goto_menu(lcd_settings_menu, 7); lcd_goto_menu(lcd_settings_menu, 7);
} }
static void lcd_silent_mode_set() { static void lcd_silent_mode_set() {

2
Firmware/variants/1_75mm_MK3-EINY04-E3Dv6full.h
View file

@ -139,7 +139,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
//#define TMC2130_DEBUG //#define TMC2130_DEBUG
//#define TMC2130_DEBUG_WR //#define TMC2130_DEBUG_WR
//#define TMC2130_DEBUG_RD #define TMC2130_DEBUG_RD
/*------------------------------------ /*------------------------------------