Compare commits

..

138 Commits

Author SHA1 Message Date
InsanityAutomation 098256d5df Merge pull request #55 from g0dsCookie/CrealityDwin_2.0
Fixed include paths
2019-09-17 08:58:44 -04:00
InsanityAutomation a0f00367fe Update max bed thermal limits for large dc bed at high temps 2019-09-16 22:22:11 -04:00
InsanityAutomation 60cfb42668 dont send octo cancel on timer stop 2019-09-09 10:09:54 -04:00
InsanityAutomation 138de675fe Add tone 2019-09-08 22:52:08 -04:00
InsanityAutomation 263ca25342 Merge branch 'CrealityDwin_2.0' of https://github.com/InsanityAutomation/Marlin into CrealityDwin_2.0 2019-09-08 19:58:39 -04:00
InsanityAutomation e4211d2358 Remove obsolete 2019-09-08 19:58:28 -04:00
InsanityAutomation 03897008e4 Add files via upload 2019-09-08 19:58:05 -04:00
InsanityAutomation 9291b46600 Bump 2019-09-08 19:57:39 -04:00
InsanityAutomation ed5cc1a0c0 Bump with M851XY 2019-09-08 18:38:25 -04:00
InsanityAutomation 769701e64a Update Configuration.h 2019-09-08 17:40:43 -04:00
InsanityAutomation 4c8f900950 Update Creality_DWIN.cpp 2019-09-08 16:37:12 -04:00
InsanityAutomation c0f97e7874 Merge branch 'CrealityDwin_2.0' of https://github.com/InsanityAutomation/Marlin into CrealityDwin_2.0 2019-09-07 11:32:17 -04:00
InsanityAutomation 232dec268d NewRev 2019-09-07 11:32:04 -04:00
InsanityAutomation 6af3951a47 Add files via upload 2019-09-07 11:31:17 -04:00
InsanityAutomation ea34fa2616 fix extui timers 2019-09-07 10:31:33 -04:00
InsanityAutomation 0e04d7b43d Update tool_change.cpp 2019-09-06 22:18:05 -04:00
InsanityAutomation 093d3cb32b revert non working bed leveling disable more tool change 2019-09-06 21:44:59 -04:00
InsanityAutomation f603a152c7 Merge branch 'CrealityDwin_2.0' of https://github.com/InsanityAutomation/Marlin into CrealityDwin_2.0 2019-09-05 21:33:51 -04:00
InsanityAutomation cf7e896328 Update Configuration.h 2019-09-05 21:33:46 -04:00
InsanityAutomation d4ad91c8f2 Add files via upload 2019-09-05 21:20:57 -04:00
InsanityAutomation e45d5354ea Add files via upload 2019-09-05 21:11:38 -04:00
InsanityAutomation 4279b78b17 dont compile creality dwin if not enabled 2019-09-05 20:46:59 -04:00
InsanityAutomation 5d24ecb17b Update Configuration.h 2019-09-05 16:28:13 -04:00
InsanityAutomation 23c7b5018e Small tweaks 2019-09-05 16:27:35 -04:00
InsanityAutomation 04d499c816 Update Configuration.h 2019-08-30 13:02:16 -04:00
g0dsCookie e943b54003 Fixed include paths 2019-08-30 15:51:51 +02:00
InsanityAutomation 7d04475e09 Update bltouch.cpp 2019-08-29 14:29:15 -04:00
InsanityAutomation 8c796fcd3b Update Configuration.h 2019-08-29 14:22:43 -04:00
InsanityAutomation 39997b7710 Update Creality_DWIN.cpp 2019-08-29 13:32:24 -04:00
InsanityAutomation 6ac884ee58 Update Creality_DWIN.cpp 2019-08-29 13:30:23 -04:00
InsanityAutomation b0829e5745 Update Creality_DWIN.cpp 2019-08-29 12:58:20 -04:00
InsanityAutomation ed2d955a42 Some ender 5 tweaks 2019-08-29 10:25:34 -04:00
InsanityAutomation 49c78a4b25 Fix Progress, test bltouch servo to 0, set message for z offset change 2019-08-28 17:31:58 -04:00
InsanityAutomation eb53a1c318 Update Configuration.h 2019-08-28 12:00:24 -04:00
InsanityAutomation 4743bb58e9 Update README.md 2019-08-24 15:02:43 -04:00
InsanityAutomation 27f48c2c46 Update bin file name 2019-08-24 14:54:44 -04:00
InsanityAutomation 9ab228f19d segmented move change 2019-08-24 00:44:32 -04:00
InsanityAutomation 00d3cdc8a6 Update README.md 2019-08-24 00:37:13 -04:00
InsanityAutomation 384f45dcae Update README.md 2019-08-24 00:23:11 -04:00
InsanityAutomation ebc40633a5 Add standard configuration Hex files 2019-08-23 21:42:01 -04:00
InsanityAutomation 61665a4b6f Update README.md 2019-08-23 21:29:03 -04:00
InsanityAutomation 848020d314 Update README.md 2019-08-23 21:24:51 -04:00
InsanityAutomation 885fe5f573 Update README.md 2019-08-23 21:20:56 -04:00
InsanityAutomation 39f035547a Update README.md 2019-08-23 21:18:36 -04:00
InsanityAutomation 975141f77e Tweaks 2019-08-23 21:18:09 -04:00
InsanityAutomation aa6b6a3b3d crx pid, tweaks 2019-08-23 19:58:17 -04:00
InsanityAutomation 0b81c1cd14 ExtUI babystep to position without probe 2019-08-23 15:55:26 -04:00
InsanityAutomation 1a1f9562d8 Update README.md 2019-08-23 14:04:29 -04:00
InsanityAutomation 334893f831 Update CR-X_Stock__1.70_Screen.7z 2019-08-23 13:42:49 -04:00
InsanityAutomation 73310d9848 Update README.md 2019-08-23 13:34:23 -04:00
InsanityAutomation 34cce5a26a Archive TFT files
50mb to 1.5mb
2019-08-23 11:14:54 -04:00
InsanityAutomation 45688c0ae6 Update README.md 2019-08-23 00:25:53 -04:00
InsanityAutomation 420ea1c30e Update README.md 2019-08-23 00:12:17 -04:00
InsanityAutomation 10a71da890 Update single extruder screens with 2.0 functions 2019-08-22 23:13:14 -04:00
InsanityAutomation dde5cdfb0b Update Creality_DWIN.cpp 2019-08-22 21:44:50 -04:00
InsanityAutomation 0fea530069 Tweaks 2019-08-22 20:55:42 -04:00
InsanityAutomation b55264b5ed fix status callback 2019-08-22 20:13:02 -04:00
InsanityAutomation fb1cd0cf3c TweaksTouchups 2019-08-22 19:39:40 -04:00
InsanityAutomation 6840dcf87d Update Configuration.h 2019-08-22 14:32:58 -04:00
InsanityAutomation 04f81d0aa4 Update Creality_DWIN.cpp 2019-08-22 13:15:59 -04:00
InsanityAutomation 1884f3754c Update Creality_DWIN.cpp 2019-08-22 13:04:17 -04:00
InsanityAutomation 8f8511d2e0 tweaks 2019-08-22 12:34:14 -04:00
InsanityAutomation 966ffa295f bump 2019-08-21 22:31:18 -04:00
InsanityAutomation 63815d9acc Bump 2019-08-21 20:32:28 -04:00
InsanityAutomation 1b5f70a35e fix level corners 2019-08-21 20:29:06 -04:00
InsanityAutomation f6fc94dbc4 sd card continuity bump 2019-08-21 17:17:47 -04:00
InsanityAutomation 06982535d2 Tweaks 2019-08-21 10:45:53 -04:00
InsanityAutomation f62a5f3ff6 Update Configuration.h 2019-08-21 00:14:46 -04:00
InsanityAutomation 2fc4871bc1 Update Configuration.h 2019-08-21 00:12:42 -04:00
InsanityAutomation 7e5b72bb49 Update Configuration.h 2019-08-20 23:25:52 -04:00
InsanityAutomation 31386be583 throttling 2019-08-20 22:45:47 -04:00
InsanityAutomation cff4360621 Tweaks 2019-08-20 20:28:39 -04:00
InsanityAutomation f515f22313 update pid refix old bug 2019-08-20 18:44:20 -04:00
InsanityAutomation e249e380fc usability tweaks 2019-08-20 18:12:01 -04:00
InsanityAutomation 9ce076a045 Bump 2019-08-20 17:59:36 -04:00
InsanityAutomation f70c1d59da debug 2019-08-20 17:21:49 -04:00
InsanityAutomation f30bf8ba7d Update README.md 2019-08-20 14:26:05 -04:00
InsanityAutomation 5e82e4e33d Update Creality_DWIN.cpp 2019-08-20 14:00:19 -04:00
InsanityAutomation b54f11859a Update Creality_DWIN.cpp 2019-08-20 10:20:35 -04:00
InsanityAutomation 5c051a005f Update README.md 2019-08-19 12:43:19 -04:00
InsanityAutomation d25e477f76 Update README.md 2019-08-19 12:40:37 -04:00
InsanityAutomation a1d8f5f79f Update README.md 2019-08-19 12:39:43 -04:00
InsanityAutomation fd52a71294 Update README.md 2019-08-19 12:38:59 -04:00
InsanityAutomation adc60676ae Update README.md 2019-08-19 10:16:42 -04:00
InsanityAutomation 55a69ca853 Update README.md 2019-08-19 10:15:31 -04:00
InsanityAutomation e0e42a5f61 cleanup 2019-08-18 23:20:16 -04:00
InsanityAutomation 2b10dfaf52 Update Creality_DWIN.cpp 2019-08-18 23:18:47 -04:00
InsanityAutomation 4599988e2a One more SD tweak 2019-08-18 23:01:39 -04:00
InsanityAutomation ea10994180 Tweak sd file select 2019-08-18 22:42:33 -04:00
InsanityAutomation 534a3f39bb Update Creality_DWIN.cpp 2019-08-18 21:00:40 -04:00
InsanityAutomation 9f04dfb0a1 Change txt to white 2019-08-18 20:42:54 -04:00
InsanityAutomation 34d8f1d81f Fix swapped icon 2019-08-18 19:14:21 -04:00
InsanityAutomation 005cbbbb17 Update G28.cpp 2019-08-18 19:09:08 -04:00
InsanityAutomation 9dbf731d9a fix runout trigering oon either sensor 2019-08-18 18:29:04 -04:00
InsanityAutomation 3f752657a7 turn runout back on 2019-08-18 18:04:52 -04:00
InsanityAutomation dd70e03767 lots of fixes 2019-08-18 18:00:35 -04:00
InsanityAutomation ecdc3a0911 Tweaks 2019-08-18 14:51:55 -04:00
InsanityAutomation 2416912aef Bump 2019-08-18 14:48:04 -04:00
InsanityAutomation 6d7220e379 Initial Ender 5 support, migrate max support 2019-08-18 14:44:53 -04:00
InsanityAutomation 80134a4a48 Update Configuration.h 2019-08-18 12:26:37 -04:00
InsanityAutomation e49bbfef14 Delete DWIN_SET.7z 2019-08-18 10:35:12 -04:00
InsanityAutomation 0c48e709ff Updates again 2019-08-18 00:45:27 -04:00
InsanityAutomation 38aba644c3 Update 2019-08-17 22:04:51 -04:00
InsanityAutomation 6498c4cf88 Config sync 2019-08-17 20:23:22 -04:00
InsanityAutomation 9948054cb7 Lots of fixes 2019-08-17 19:29:45 -04:00
InsanityAutomation 412e3aa1f6 Update ui_api.cpp 2019-08-17 00:49:32 -04:00
InsanityAutomation 9975799c5f CRX Works too 2019-08-17 00:18:56 -04:00
InsanityAutomation 5f688304f6 Update Creality_DWIN.cpp 2019-08-16 10:34:17 -04:00
InsanityAutomation ba919e49fc Mostly works ok-ish 2019-08-16 00:31:17 -04:00
InsanityAutomation a2fa854d9c Bump, filament runout mostly works 2019-08-14 00:24:51 -04:00
InsanityAutomation 518e313260 Update Configuration.h 2019-07-23 22:47:30 -04:00
InsanityAutomation 4e2b4ce9a0 Bump 2019-07-23 22:46:22 -04:00
InsanityAutomation 08b5bdda27 fixes 2019-07-19 10:47:24 -04:00
InsanityAutomation a9d634fe28 minor tweak 2019-07-19 10:23:45 -04:00
InsanityAutomation 4198b14e2f Bump to head, some tweaks 2019-07-19 10:21:38 -04:00
InsanityAutomation 615ac13a52 bump to head, misc fixes 2019-06-23 12:06:21 -04:00
InsanityAutomation 8d23b85b47 Update Creality_DWIN.cpp 2019-06-23 11:38:16 -04:00
InsanityAutomation ad17b23fc8 SD Print Working 2019-05-27 23:57:46 -04:00
InsanityAutomation 3ef237cece More progress 2019-05-18 14:56:14 -04:00
InsanityAutomation 4c2fe3bad8 Bump and fix mesh define issue 2019-05-15 23:00:26 -04:00
InsanityAutomation 0822bcbff8 Bump in the night 2019-04-25 23:35:43 -04:00
InsanityAutomation 672f1c60fb progress 2019-04-25 23:23:01 -04:00
InsanityAutomation 3a8c87b511 Update Creality_DWIN.cpp 2019-04-24 21:18:29 -04:00
InsanityAutomation a43dd70976 Update Configuration.h 2019-04-23 18:39:02 -04:00
InsanityAutomation e890bdffeb disable some mesh and bed leveling stuff until API is fixed 2019-04-23 17:57:19 -04:00
InsanityAutomation eb54bf155a Bump to head, another couple steps 2019-04-23 17:37:25 -04:00
InsanityAutomation 53e9e8c7b3 close the night... 2019-03-17 01:00:47 -04:00
InsanityAutomation cddbd1c6b4 Updates 2019-03-17 00:41:55 -04:00
InsanityAutomation 77db45432b Update Creality_DWIN.cpp 2019-03-17 00:39:00 -04:00
InsanityAutomation 68240d398f IT COMPILES!!!!
without sd card to screen
2019-03-17 00:23:55 -04:00
InsanityAutomation 6a3532bc71 Another Step 2019-03-17 00:05:31 -04:00
InsanityAutomation a94dedd2cb Compile fixes 2019-03-16 23:36:26 -04:00
InsanityAutomation 2108715fa6 Update Configuration.h 2019-03-16 22:49:55 -04:00
InsanityAutomation 614c9c6c9d more 2019-03-16 19:02:40 -04:00
InsanityAutomation 1c658401de bump 2019-03-16 16:29:28 -04:00
InsanityAutomation 97379d5d53 More updates 2019-03-16 16:03:56 -04:00
InsanityAutomation 3e5a957872 Updates 2019-03-16 13:31:19 -04:00
InsanityAutomation e9588824bb 10s pro support and basic dwin files to start changes 2019-03-16 13:31:19 -04:00
3908 changed files with 809234 additions and 299816 deletions
+274
View File
@@ -0,0 +1,274 @@
# Python CircleCI 2.0 configuration file
#
# Check https://circleci.com/docs/2.0/language-python/ for more details
#
version: 2
jobs:
build:
docker:
# specify the version you desire here
# use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
- image: circleci/python:2.7.13
# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/postgres:9.4
environment:
TEST_PLATFORM: "-e megaatmega2560"
working_directory: ~/Marlin
steps:
- checkout
- restore_cache:
paths:
- ~/.platformio
- ~/Marlin/.piolibdeps
keys:
- v1-dependencies-{{ checksum "~/Marlin/platformio.ini" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-
- run:
name: install dependencies
command: |
sudo pip install -U platformio
# run tests!
- run:
name: run tests
command: |
#
#
# Fetch the tag information for the current branch
ls -la
git fetch origin --tags
#
# Publish the buildroot script folder
chmod +x buildroot/bin/*
export PATH=`pwd`/buildroot/bin/:${PATH}
# Generate custom version include
generate_version ./Marlin/src/inc
cat ./Marlin/src/inc/_Version.h
#
# Back up pins_RAMPS.h
#
backup_ramps
env_backup
#################################
# Build all sample configurations
#################################
echo testing megaatmega2560 targets...
export TEST_PLATFORM="-e megaatmega2560"
echo use_example_configs adafruit/ST7565
use_example_configs adafruit/ST7565
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs BQ/Hephestos
use_example_configs BQ/Hephestos
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs BQ/Hephestos_2
use_example_configs BQ/Hephestos_2
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs BQ/WITBOX
use_example_configs BQ/WITBOX
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs AliExpress/CL-260
use_example_configs AliExpress/CL-260
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
#echo use_example_configs Cartesio
#use_example_configs Cartesio
#build_marlin_pio ./ ${TEST_PLATFORM}
#restore_configs
echo use_example_configs delta/FLSUN/auto_calibrate
use_example_configs delta/FLSUN/auto_calibrate
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs delta/FLSUN/kossel_mini
use_example_configs delta/FLSUN/kossel_mini
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs delta/generic
use_example_configs delta/generic
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs delta/kossel_mini
use_example_configs delta/kossel_mini
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs delta/kossel_xl
use_example_configs delta/kossel_xl
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Felix
use_example_configs Felix
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Felix/DUAL
use_example_configs Felix/DUAL
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs FolgerTech/i3-2020
use_example_configs FolgerTech/i3-2020
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs gCreate/gMax1.5+
use_example_configs gCreate/gMax1.5+
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Geeetech/GT2560
use_example_configs Geeetech/GT2560
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
#echo use_example_configs Geeetech/I3_Pro_X-GT2560
#use_example_configs Geeetech/I3_Pro_X-GT2560
#build_marlin_pio ./ ${TEST_PLATFORM}
#restore_configs
echo use_example_configs Infitary/i3-M508
use_example_configs Infitary/i3-M508
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
use_example_configs Malyan/M200
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Micromake/C1/basic
use_example_configs Micromake/C1/basic
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Micromake/C1/enhanced
use_example_configs Micromake/C1/enhanced
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs RepRapWorld/Megatronics
use_example_configs RepRapWorld/Megatronics
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs RigidBot
use_example_configs RigidBot
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs SCARA
use_example_configs SCARA
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Velleman/K8200
use_example_configs Velleman/K8200
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Velleman/K8400/Dual-head
use_example_configs Velleman/K8400/Dual-head
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Velleman/K8400
use_example_configs Velleman/K8400
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Wanhao/Duplicator6
use_example_configs Wanhao/Duplicator6
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
# Requires manual load of https://github.com/stawel/SlowSoftI2CMaster
#use_example_configs wt150
#build_marlin_pio ./ ${TEST_PLATFORM}
#restore_configs
echo testing melzi targets...
export TEST_PLATFORM="-e melzi"
echo use_example_configs Anet/A6
use_example_configs Anet/A6
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Anet/A8
use_example_configs Anet/A8
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Creality/CR-10
use_example_configs Creality/CR-10
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Malyan/M150
use_example_configs Malyan/M150
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs Sanguinololu
use_example_configs Sanguinololu
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs TinyBoy2
use_example_configs TinyBoy2
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo testing rambo targets...
export TEST_PLATFORM="-e rambo"
echo use_example_configs AlephObjects/TAZ4
use_example_configs AlephObjects/TAZ4
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo testing at90usb1286_* targets...
export TEST_PLATFORM="-e at90usb1286_dfu"
#echo se_example_configs delta/kossel_pro
#use_example_configs delta/kossel_pro
#build_marlin_pio ./ ${TEST_PLATFORM}
#restore_configs
echo use_example_configs makibox
use_example_configs makibox
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo testing sanguino_atmega644p targets...
export TEST_PLATFORM="-e sanguino_atmega644p"
echo use_example_configs tvrrug/Round2
use_example_configs tvrrug/Round2
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo testing LPC1768 targets...
export TEST_PLATFORM="-e LPC1768"
echo use_example_configs Mks/Sbase
use_example_configs Mks/Sbase
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo testing STM32F1 targets...
export TEST_PLATFORM="-e STM32F1"
restore_configs
echo use_example_configs STM32/STM32F10
use_example_configs STM32/STM32F10
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs STM32/stm32f103ret6
use_example_configs STM32/stm32f103ret6
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo testing DUE targets...
export TEST_PLATFORM="-e DUE"
#echo use_example_configs UltiMachine/Archim2
#use_example_configs UltiMachine/Archim2
#build_marlin_pio ./ ${TEST_PLATFORM}
#restore_configs
#
# Remove temp files from dependencies tree prior to caching
rm -rf ~/Marlin/.piolibdeps/_tmp_*
#
# Restore the environment
#
env_restore
- save_cache:
paths:
- ~/.platformio
- ~/Marlin/.piolibdeps
key: v1-dependencies-{{ checksum "~/Marlin/platformio.ini" }}
-19
View File
@@ -1,19 +0,0 @@
# editorconfig.org
root = true
[{*.patch,syntax_test_*}]
trim_trailing_whitespace = false
[{*.c,*.cpp,*.h}]
charset = utf-8
[{*.c,*.cpp,*.h,Makefile}]
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
indent_style = space
indent_size = 2
[{*.py,*.conf,*.sublime-project}]
indent_style = tab
indent_size = 4
-2
View File
@@ -17,5 +17,3 @@
*.png binary
*.jpg binary
*.fon binary
*.bin binary
*.woff binary
+1 -3
View File
@@ -1,3 +1 @@
github: [thinkyhead]
patreon: thinkyhead
custom: ["https://www.thinkyhead.com/donate-to-marlin"]
custom: http://www.thinkyhead.com/donate-to-marlin
+11 -10
View File
@@ -34,15 +34,16 @@ This project and everyone participating in it is governed by the [Marlin Code of
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
* [Marlin RepRap forum](https://reprap.org/forum/list.php?415)
* [Marlin RepRap forum](http://forums.reprap.org/list.php?415)
* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
If chat is more your speed, you can join the MarlinFirmware Discord server:
If chat is more your speed, you can join the MarlinFirmware Slack team:
* Use the link https://discord.gg/n5NJ59y to join up as a General User.
* Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
* Use the `#general` channel for general questions or discussion about Marlin.
* Other channels exist for certain topics or are limited to Patrons. Check the channel list.
* Join the Marlin Slack Team
* To obtain group access, please [send a request](http://www.thinkyhead.com/contact/9) to @thinkyhead.
* Even though Slack is a chat service, sometimes it takes several hours for community members to respond — please be patient!
* Use the `#general` channel for general questions or discussion about Marlin.
* Other channels exist for certain topics. Check the channel list.
## How Can I Contribute?
@@ -92,7 +93,7 @@ Before creating a suggestion, please check [this list](#before-submitting-a-sugg
#### Before Submitting a Feature Request
* **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
* **Check the [Marlin website](http://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](http://marlinfw.org/docs/configuration/configuration.html).
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
#### How Do I Submit A (Good) Feature Request?
@@ -116,12 +117,12 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
### Pull Requests
Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](http://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
* Fill in [the required template](pull_request_template.md).
* Don't include issue numbers in the PR title.
* Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed.
* Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website.
* Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website.
* Document new code with clear and concise comments.
* End all files with a newline.
@@ -136,7 +137,7 @@ Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x
### C++ Coding Standards
* Please read and follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
* Please read and follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
### Documentation
+2 -6
View File
@@ -2,13 +2,9 @@
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 use one of the following options:
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.
- The Marlin Firmware forum at https://reprap.org/forum/list.php?415
- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/
- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y.
Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.
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.
-->
-40
View File
@@ -1,40 +0,0 @@
#
# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
#
# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 60
# Skip issues and pull requests created before a given timestamp. Timestamp must
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
skipCreatedBefore: false
# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
exemptLabels: [ 'no-locking' ]
# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: false
# Comment to post before locking. Set to `false` to disable
lockComment: >
This thread has been automatically locked since there has not been
any recent activity after it was closed. Please open a new issue for
related bugs.
# Assign `resolved` as the reason for locking. Set to `false` to disable
setLockReason: true
# Limit to only `issues` or `pulls`
# only: issues
# Optionally, specify configuration settings just for `issues` or `pulls`
# issues:
# exemptLabels:
# - help-wanted
# lockLabel: outdated
# pulls:
# daysUntilLock: 30
# Repository to extend settings from
# _extends: repo
-4
View File
@@ -14,10 +14,6 @@ We must be able to understand your proposed change from this description. If we
<!-- What does this fix or improve? -->
### Configurations
<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
### Related Issues
<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->
-123
View File
@@ -1,123 +0,0 @@
#
# test-builds.yml
# Do test builds to catch compile errors
#
name: CI
on:
pull_request:
branches:
- bugfix-2.0.x
paths-ignore:
- config/**
- data/**
- docs/**
- '**/*.md'
push:
branches:
- bugfix-2.0.x
paths-ignore:
- config/**
- data/**
- docs/**
- '**/*.md'
jobs:
test_builds:
name: Run All Tests
if: github.repository == 'MarlinFirmware/Marlin'
runs-on: ubuntu-latest
strategy:
matrix:
test-platform:
# Base Environments
- DUE
- DUE_archim
- esp32
- linux_native
- mega2560
- at90usb1286_dfu
- teensy31
- teensy35
- teensy41
- SAMD51_grandcentral_m4
# Extended AVR Environments
- FYSETC_F6
- mega1280
- rambo
- sanguino1284p
- sanguino644p
# STM32F1 (Maple) Environments
- STM32F103RC_btt
- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RC_fysetc
- STM32F103RC_meeb
- jgaurora_a5s_a1
- STM32F103VE_longer
- mks_robin
- mks_robin_lite
- mks_robin_pro
- STM32F103RET6_creality
- mks_robin_nano35
# STM32 (ST) Environments
- STM32F407VE_black
- STM32F401VE_STEVAL
- BIGTREE_BTT002
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin_stm32
- ARMED
- FYSETC_S6
- STM32F070CB_malyan
- STM32F070RB_malyan
- malyan_M300
- FLYF407ZG
- rumba32
- LERDGEX
- mks_robin_nano35_stm32
- NUCLEO_F767ZI
- REMRAM_V1
- BTT_SKR_SE_BX
# Put lengthy tests last
- LPC1768
- LPC1769
# Non-working environment tests
#- at90usb1286_cdc
#- STM32F103CB_malyan
#- STM32F103RE
#- mks_robin_mini
steps:
- name: Select Python 3.7
uses: actions/setup-python@v1
with:
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
- name: Install PlatformIO
run: |
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
platformio update
- name: Check out the PR
uses: actions/checkout@v2
- name: Run ${{ matrix.test-platform }} Tests
run: |
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}
+12 -20
View File
@@ -1,6 +1,6 @@
#
# Marlin 3D Printer Firmware
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -16,12 +16,12 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Generated files
# Our automatic versioning scheme generates the following file
# NEVER put it in the repository
_Version.h
bdf2u8g
#
# OS
@@ -77,6 +77,7 @@ tags
*.out
*.app
#
# C
#
@@ -108,6 +109,7 @@ tags
*.app
*.i*86
*.x86_64
*.hex
# Debug files
*.dSYM/
@@ -144,10 +146,7 @@ Marlin/*/*/readme.txt
Marlin/*/*/*/readme.txt
Marlin/*/*/*/*/readme.txt
# Secure Credentials
Configuration_Secure.h
# Visual Studio
#Visual Studio
*.sln
*.vcxproj
*.vcxproj.user
@@ -158,34 +157,27 @@ __vm/
.vs/
vc-fileutils.settings
# Visual Studio Code
#Visual Studio Code
.vscode
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/*.db
# cmake
#cmake
CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
# CLion
#CLion
cmake-build-*
# Eclipse
#Eclipse
.project
.cproject
.pydevproject
.settings
.classpath
# Python
#Python
__pycache__
# IOLogger logs
*_log.csv
# Simulation / Native
eeprom.dat
imgui.ini
+51
View File
@@ -0,0 +1,51 @@
dist: bionic
sudo: false
language: python
python:
- "3.7"
notifications:
email: false
env:
- TEST_PLATFORM="megaatmega2560"
- TEST_PLATFORM="DUE"
- TEST_PLATFORM="LPC1768"
- TEST_PLATFORM="LPC1769"
- TEST_PLATFORM="STM32F1"
- TEST_PLATFORM="teensy31"
- TEST_PLATFORM="teensy35"
- TEST_PLATFORM="linux_native"
- TEST_PLATFORM="esp32"
- TEST_PLATFORM="alfawise_U20"
- TEST_PLATFORM="black_stm32f407ve"
- TEST_PLATFORM="adafruit_grandcentral_m4"
before_install:
#
# Fetch the tag information for the current branch
- git fetch origin --tags
#
# Publish the buildroot script folder
- chmod +x ${TRAVIS_BUILD_DIR}/buildroot/bin/*
- chmod +x ${TRAVIS_BUILD_DIR}/buildroot/share/tests/*
- export PATH=${TRAVIS_BUILD_DIR}/buildroot/bin/:${TRAVIS_BUILD_DIR}/buildroot/share/tests/:${PATH}
install:
#- pip install -U platformio
- pip install -U https://github.com/platformio/platformio-core/archive/master.zip
before_script:
# Update PlatformIO packages
- platformio update
#
# Change current working directory to the build dir
- 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
#
script:
- run_tests ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
Binary file not shown.
Binary file not shown.
Binary file not shown.
+9606
View File
File diff suppressed because it is too large Load Diff
+11403
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large Load Diff
+11598
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More