3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Code Issues Releases Wiki Activity

Merge CORE_XZ (PR#2503)

Browse Source
This commit is contained in:
Richard Wackerbarth 2015-07-23 19:53:33 -05:00
commit a0120a533c
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -140,6 +140,16 @@ script:
- sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h - sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h
- rm -rf .build/ - rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino - DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable COREXY
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define COREXY/#define COREXY/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
# Enable COREXZ
- cp Marlin/Configuration.h.backup Marlin/Configuration.h
- sed -i 's/\/\/#define COREXZ/#define COREXZ/g' Marlin/Configuration.h
- rm -rf .build/
- DISPLAY=:1.0 ~/bin/arduino --verify --board marlin:avr:mega Marlin/Marlin.ino
######## Example Configurations ############## ######## Example Configurations ##############
# Delta Config (generic) # Delta Config (generic)
- cp Marlin/example_configurations/delta/generic/Configuration* Marlin/ - cp Marlin/example_configurations/delta/generic/Configuration* Marlin/

4
Marlin/Configuration.h
View File

@ -305,10 +305,10 @@ Here are some standard links for getting your machine calibrated:
// @section machine // @section machine
// Uncomment this option to enable CoreXY kinematics // Uncomment this option to enable CoreXY kinematics
// #define COREXY //#define COREXY
// Uncomment this option to enable CoreXZ kinematics // Uncomment this option to enable CoreXZ kinematics
// #define COREXZ //#define COREXZ
// Enable this option for Toshiba steppers // Enable this option for Toshiba steppers
//#define CONFIG_STEPPERS_TOSHIBA //#define CONFIG_STEPPERS_TOSHIBA

5
Marlin/stepper.cpp
View File

@ -374,7 +374,7 @@ inline void update_endstops() {
UPDATE_ENDSTOP(Y, MAX); UPDATE_ENDSTOP(Y, MAX);
#endif #endif
} }
#if defined(COREXY) || defined(COREXZ) #if defined(COREXY)
} }
#endif #endif
@ -459,6 +459,9 @@ inline void update_endstops() {
} }
#endif #endif
} }
#if defined(COREXZ)
}
#endif
old_endstop_bits = current_endstop_bits; old_endstop_bits = current_endstop_bits;
} }