bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

M355 S0, S1 fixes & faster LCD, SD card

Browse Source 
fix Travis error
This commit is contained in:
Christopher Pepper
2017-06-18 00:36:10 +01:00
committed by Bob-the-Kuhn
parent 8c622a59cf
commit bea3ec2724
19 changed files with 515 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/pins/pins.h
View File

@ -403,9 +403,6 @@
#ifndef SDPOWER
#define SDPOWER -1
#endif
#ifndef SDSS
#define SDSS -1
#endif
#ifndef LED_PIN
#define LED_PIN -1
#endif

4
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View File

@ -105,7 +105,7 @@
#define TEMP_1_PIN 2 //A2 (T2) - D69 - TEMP_1_PIN
#define TEMP_2_PIN 3 //A3 - D63 - J5-3 & AUX-2
#define TEMP_3_PIN 4 //A4 - D37 - BUZZER_PIN
#define TEMP_4_PIN 5 //A5 - D49 - SD_DETECT_PIN
//#define TEMP_4_PIN 5 //A5 - D49 - SD_DETECT_PIN
//#define ?? 6 //A6 - D0 - RXD0 - J4-4 & AUX-1
#define FILWIDTH_PIN 7 //A7 - D1 - TXD0 - J4-5 & AUX-1
@ -288,8 +288,6 @@
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
// #define LCD_SCREEN_ROT_180
#define SOFTWARE_SPI // temp to see if it fixes the "not found" error
#undef BEEPER_PIN
#define BEEPER_PIN 37 // may change if cable changes