Skip to content

Commit

Permalink
Merge branch 'RCBugFix' into configurations/KosselXL
Browse files Browse the repository at this point in the history
* RCBugFix: (64 commits)
  Automatically set X2 stepper pins
  Add Travis test for DUAL_X_CARRIAGE
  Implements S1 argument in M999
  Improve DUAL_X_CARRIAGE sanity check errors
  Declare extruder_duplication_enabled in Marlin.h
  Update Japanese trasration
  Function decl. in headers don't need "extern"
  Bezier style and DELTA patch
  XYZ unhomed
  Require homing of Z before G29
  Minor DELTA segmentation speedup
  G29: Report final position back to host when using MBL
  Add stowing process for MECHANICAL_PROBE
  Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE
  Fix checkExtruderAutoFans
  Bugfix: iteration invokes undefined behavior
  Fix MBL zigzag calls
  Follow-up the PR MarlinFirmware#3720 and MarlinFirmware#3759
  Remove the hotbed icon when HAS_TEMP_BED is false
  Prevent watchdog timeout in bezier moves
  ...

# Conflicts:
#	Marlin/pins_RAMPS_14.h
  • Loading branch information
João Martins committed May 19, 2016
2 parents af00786 + b422e39 commit 32c4889
Show file tree
Hide file tree
Showing 1,004 changed files with 2,915 additions and 503,232 deletions.
78 changes: 57 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,53 @@
language: c
#
before_install:
#
# Travis runs a detached head. We need to find the current branch
- git checkout `git branch --contains HEAD | grep -v '*'`
#
# Also tags for the root(s) of the minor version(s)
- git fetch origin --tags
- mkdir ~/bin
#
# Publish the buildroot script folder
- chmod +x ${TRAVIS_BUILD_DIR}/buildroot/bin/*
- ln -s ${TRAVIS_BUILD_DIR}/buildroot/bin/ ~/bin
#
# Start fb X server
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
- sleep 3
- export DISPLAY=:1.0
#
install:
# Install arduino 1.6.4
- wget http://downloads-02.arduino.cc/arduino-1.6.4-linux64.tar.xz
- tar Jxf arduino-1.6.4-linux64.tar.xz
- sudo mv arduino-1.6.4 /usr/local/share/arduino
- ln -s /usr/local/share/arduino/arduino ~/bin/arduino
# Our custom build commands
- mv LinuxAddons/bin/* ~/bin/
- ls -la ~/bin
# install our platform
- cp -r ArduinoAddons/Arduino_1.6.x/hardware/* /usr/local/share/arduino/hardware
# copy libraries to arduino dir, as conditional includes do not work in .ino files
- cp -r /usr/local/share/arduino/hardware/marlin/avr/libraries/* /usr/local/share/arduino/libraries/
- cp -r ArduinoAddons/Arduino_1.6.x/libraries/* /usr/local/share/arduino/libraries/
# add LiquidCrystal_I2C & LiquidTWI2 libraries
#
# Install arduino 1.6.8
- wget http://downloads-02.arduino.cc/arduino-1.6.8-linux64.tar.xz
- tar xf arduino-1.6.8-linux64.tar.xz
- sudo mv arduino-1.6.8 /usr/local/share/arduino
- ln -s /usr/local/share/arduino/arduino ${TRAVIS_BUILD_DIR}/buildroot/bin/arduino
#
# Install: LiquidCrystal_I2C library
- git clone https://github.com/kiyoshigawa/LiquidCrystal_I2C.git
- mv LiquidCrystal_I2C/LiquidCrystal_I2C /usr/local/share/arduino/libraries/LiquidCrystal_I2C
#
# Install: LiquidTWI2 library
- git clone https://github.com/lincomatic/LiquidTWI2.git
- mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
- sudo mv LiquidTWI2 /usr/local/share/arduino/libraries/LiquidTWI2
#
# Install: Monochrome Graphics Library for LCDs and OLEDs
- arduino --install-library "U8glib"
#
# Install: L6470 Stepper Motor Driver library
- git clone https://github.com/ameyer/Arduino-L6470.git
- sudo mv Arduino-L6470/L6470 /usr/local/share/arduino/libraries/L6470
#
# Install: TMC26X Stepper Motor Controller library
- git clone https://github.com/trinamic/TMC26XStepper.git
- sudo mv TMC26XStepper /usr/local/share/arduino/libraries/TMC26XStepper
#
before_script:
# arduino requires an X server even with command line
# https://github.com/arduino/Arduino/issues/1981
- Xvfb :1 -screen 0 1024x768x16 &> xvfb.log &
# change back to home directory for compiling
- cd $TRAVIS_BUILD_DIR
#
# Change current working directory to the build dir
- cd ${TRAVIS_BUILD_DIR}
#
script:
#
Expand Down Expand Up @@ -89,6 +104,16 @@ script:
- opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT
- build_marlin
#
# Test DUAL_X_CARRIAGE
#
- restore_configs
- opt_set MOTHERBOARD BOARD_RUMBA
- opt_set EXTRUDERS 2
- opt_set TEMP_SENSOR_1 1
- opt_enable USE_XMAX_PLUG
- opt_enable_adv DUAL_X_CARRIAGE
- build_marlin
#
### LCDS ###
#
#
Expand Down Expand Up @@ -179,6 +204,12 @@ script:
- opt_enable ULTIMAKERCONTROLLER FILAMENT_LCD_DISPLAY
- build_marlin
#
# Enable BEZIER_CURVE_SUPPORT
#
- restore_configs
- opt_enable_adv BEZIER_CURVE_SUPPORT
- build_marlin
#
# Enable COREXY
#
- restore_configs
Expand Down Expand Up @@ -208,6 +239,11 @@ script:
#
######## Example Configurations ##############
#
# BQ Hephestos 2
- restore_configs
- use_example_configs Hephestos_2
- build_marlin
#
# Delta Config (generic)
- restore_configs
- use_example_configs delta/generic
Expand Down
23 changes: 0 additions & 23 deletions ArduinoAddons/Arduino_1.0.x/hardware/OMC_tkj/boards.txt

This file was deleted.

This file was deleted.

Loading

0 comments on commit 32c4889

Please sign in to comment.