Skip to content

Commit

Permalink
Merge branch 'bugfix-2.0.x' into HomeEnder3-SKR1_3
Browse files Browse the repository at this point in the history
* bugfix-2.0.x: (1131 commits)
  TOUCH_MI_DEPLOY_XPOS fallback to X_MIN_POS (MarlinFirmware#16226)
  Fix bad #ifdef (MarlinFirmware#16227)
  Move status screen defines
  Improve A20M config
  Tweak some config names
  Cardreader read/write open methods
  Include Z in SCARA steps feedrate (MarlinFirmware#16193)
  Update M503 MBL G29 report (MarlinFirmware#16199)
  Fix compile error (macro substitution typo) (MarlinFirmware#16194)
  Add MKS Robin Mini EEPROM defines (MarlinFirmware#16203)
  Flsun QQ-S example config (MarlinFirmware#16204)
  Fix RAMBo CNC test
  Tweak ExtUI Probeless Babystepping (MarlinFirmware#16177)
  Onboard (always-on) pullups support (MarlinFirmware#16144)
  Add a CI test for RAMBo + CNC (MarlinFirmware#16126)
  Disable SD_CHECK_AND_RETRY in BTT E3 configs (MarlinFirmware#16143)
  Invert E dir of Geeetech A10 (MarlinFirmware#16149)
  MKS 12864 OLED pins for SGEN-L (MarlinFirmware#16188)
  Update BTT comments for USB/SD Composite (MarlinFirmware#16130)
  Use error message !! hints (MarlinFirmware#16145)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
#	Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
#	platformio.ini
  • Loading branch information
bjh22 committed Dec 15, 2019
2 parents 39e7ebd + 7a71fac commit d3801fb
Show file tree
Hide file tree
Showing 1,530 changed files with 318,852 additions and 57,926 deletions.
275 changes: 0 additions & 275 deletions .circleci/config.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
custom: http://www.thinkyhead.com/donate-to-marlin
2 changes: 1 addition & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use the Marlin Firmware forum at http://forums.reprap.org/list.php?415 or the Marlin Facebook Group https://www.facebook.com/groups/1049718498464482/.
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use the Marlin Firmware forum at http://forums.reprap.org/list.php?415 or the Marlin Facebook Group https://www.facebook.com/groups/1049718498464482/ or the Marlin Discord Server https://discord.gg/n5NJ59y.
Before filing an issue be sure to test the 1.1 and/or 2.0 "bugfix" branches to see whether the issue is already addressed.
Expand Down
70 changes: 46 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,61 @@
dist: xenial
sudo: require
dist: bionic
sudo: false

language: python
python:
- "2.7"
- "3.7"

notifications:
email: false

# Cache PlatformIO packages using Travis CI container-based infrastructure
sudo: false
cache:
pip: true
directories:
- "~/.platformio"

env:
- TEST_PLATFORM="megaatmega2560"
# Base Environments
- TEST_PLATFORM="DUE"
- TEST_PLATFORM="esp32"
- TEST_PLATFORM="linux_native"
- TEST_PLATFORM="megaatmega2560"
- TEST_PLATFORM="teensy31"
- TEST_PLATFORM="teensy35"

# Extended AVR Environments
- TEST_PLATFORM="FYSETC_F6_13"
- TEST_PLATFORM="megaatmega1280"
- TEST_PLATFORM="rambo"
- TEST_PLATFORM="sanguino_atmega1284p"
- TEST_PLATFORM="sanguino_atmega644p"

# Extended STM32 Environments
- TEST_PLATFORM="STM32F103RC_bigtree"
- TEST_PLATFORM="STM32F103RC_bigtree_USB"
- TEST_PLATFORM="STM32F103RE_bigtree"
- TEST_PLATFORM="STM32F103RE_bigtree_USB"
- TEST_PLATFORM="STM32F103RC_fysetc"
- TEST_PLATFORM="jgaurora_a5s_a1"
- TEST_PLATFORM="STM32F103VE_longer"
- TEST_PLATFORM="STM32F407VE_black"
- TEST_PLATFORM="BIGTREE_SKR_PRO"
- TEST_PLATFORM="mks_robin"
- TEST_PLATFORM="ARMED"

# STM32 with non-STM framework. both broken for now. they should use HAL_STM32 which is working.
#- TEST_PLATFORM="STM32F4"
#- TEST_PLATFORM="STM32F7"

# Put lengthy tests last
- TEST_PLATFORM="LPC1768"
- TEST_PLATFORM="LPC1769"
- TEST_PLATFORM="STM32F1"
- TEST_PLATFORM="teensy35"
- TEST_PLATFORM="linux_native"
- TEST_PLATFORM="esp32"

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
# Non-working environment tests
#- TEST_PLATFORM="BIGTREE_BTT002" this board isn't released yet. we need pinout to be sure about what we do
#- TEST_PLATFORM="at90usb1286_cdc"
#- TEST_PLATFORM="at90usb1286_dfu"
#- TEST_PLATFORM="STM32F103CB_malyan"
#- TEST_PLATFORM="mks_robin_lite"
#- TEST_PLATFORM="mks_robin_mini"
#- TEST_PLATFORM="mks_robin_nano"
#- TEST_PLATFORM="SAMD51_grandcentral_m4"

before_install:
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
#
# Fetch the tag information for the current branch
- git fetch origin --tags
Expand All @@ -55,8 +77,8 @@ before_script:
- cd ${TRAVIS_BUILD_DIR}
#
# Generate custom version include
- generate_version ${TRAVIS_BUILD_DIR}/Marlin/src/inc
- cat ${TRAVIS_BUILD_DIR}/Marlin/src/inc/_Version.h
- generate_version ${TRAVIS_BUILD_DIR}/Marlin/
- cat ${TRAVIS_BUILD_DIR}/Marlin/Version.h
#
script:
- run_tests ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
Loading

0 comments on commit d3801fb

Please sign in to comment.