Commit Graph

eef3c7f69 (HEAD -> hacknology) Enable manual probing and some other settings by Manuel Vögele 2018-08-21 14:26:47 +0200
50d486335 (refs/pull/8214/merge) Merge 50eb282e86 into e5de565987 by Stuart Penberthy 2018-08-21 12:18:58 +0000
65ce6f811 (refs/pull/11475/merge) Merge d04064a46c into b5537dde7f by Marcio Teixeira 2018-08-21 12:17:39 +0000
5a47a0978 (refs/pull/11209/merge) Merge a218d42953 into b5537dde7f by Hadrien Jouet 2018-08-21 11:45:48 +0000
3f37ce3ac (refs/pull/11584/merge) Merge 75209c75e2 into b5537dde7f by JackDaFlow 2018-08-21 11:13:07 +0000
75209c75e (refs/pull/11584/head) Fix formatting, stepper order, whitespace, etc. by Scott Lahteine 2018-08-21 05:51:05 -0500
4e1c9ced5 TMC2130: MSLUT/Linearity Correction by Scott Lahteine 2018-08-21 05:02:29 -0500
bd15ca4d9 (refs/pull/9331/merge) Merge 80ca5ffb3b into e5de565987 by paierh 2018-08-21 09:52:43 +0000
96d8ec9ee (refs/pull/11578/merge) Merge 4507d9c890 into b5537dde7f by Thomas Moore 2018-08-21 09:24:39 +0000
4507d9c89 (refs/pull/11578/head) Move firmware retraction to the planner by Thomas Moore 2018-08-17 16:11:30 -0400
e6fb7ce81 (refs/pull/11062/merge) Merge e2befb19c2 into b5537dde7f by TheLongAndOnly 2018-08-21 08:13:15 +0000
eeb45e2f5 (refs/pull/11302/merge) Merge d370fb70de into b5537dde7f by TheLongAndOnly 2018-08-21 08:11:41 +0000
a37423427 (refs/pull/11356/merge) Merge 45c075a517 into e5de565987 by Richard W 2018-08-21 07:19:08 +0000
a4bea6cea (refs/pull/11386/merge) Merge cf5578995c into e5de565987 by Zach Welch 2018-08-21 07:16:42 +0000
b5537dde7 (bugfix-2.0.x) need to add E2END to pins_RAMPS_FD_V2.h (#11564) by Scott Alfter 2018-08-21 00:16:31 -0700
0e819e396 (refs/pull/11560/merge) Merge 828470360b into e5de565987 by ajfxlvmf 2018-08-21 07:14:13 +0000
8f0bbdcc9 Fix up Max7219 orientations (#11596) by Scott Lahteine 2018-08-21 02:06:18 -0500
8d7a2e991 (refs/pull/11596/head) Fix up Max7219 orientations by Scott Lahteine 2018-08-19 22:33:56 -0500
d05b23941 Tweak env build test scripts by Scott Lahteine 2018-08-20 20:52:25 -0500
5f0a1d665 (refs/pull/10819/merge) Merge 48b26efd2f into a77f8c6dd5 by David Bates 2018-08-21 06:23:42 +0000
e2befb19c (refs/pull/11062/head) Add Z_TRIPLE_STEPPER_DRIVERS to example configs by Scott Lahteine 2018-08-20 22:34:23 -0500
6a2ed0402 Add support for triple z-stepper / z-endstop by Holger Müller 2018-06-19 18:55:49 +0200
5eeee19aa (refs/pull/11211/merge) Merge 00db77714e into a77f8c6dd5 by Alexander Amelkin 2018-08-21 02:50:51 +0000
a77f8c6dd Implement servo support for STM32F1 (#11580) by jmz52 2018-08-21 05:13:51 +0300
0456caf0a Consolidate shared HALs and isolate HAL compile (#11552) by Dave Johnson 2018-08-20 19:11:12 -0700
dfe18ac63 Fix compilation error for STM32F1 with U8GLIB_SSD1306 or U8GLIB_SH1106 enabled (#11583) by jmz52 2018-08-21 04:37:56 +0300
e5de56598 (bugfix-1.1.x) Fix up Max7219 orientations (#11597) by Scott Lahteine 2018-08-20 20:31:40 -0500
b0a8ce59b Update Boards.h to include Formbot support by Roxy-3D 2018-08-20 16:46:27 -0500
62ce93754 Update pins.h to include the Formbot board by Roxy-3D 2018-08-20 16:44:54 -0500
a82be36d5 Create pins_FORMBOT.h by Roxy-3D 2018-08-20 16:43:42 -0500
42b95f6b7 (refs/pull/11597/head) Fix up Max7219 orientations by Scott Lahteine 2018-08-19 23:07:48 -0500
06b41d95e (refs/pull/8686/merge) Merge 4745f7925f into 00d24a8219 by Mateusz Krawczuk 2018-08-19 20:06:41 +0000
affea9c93 (refs/pull/10360/merge) Merge 841fd8f401 into 00d24a8219 by Marcio Teixeira 2018-08-19 12:04:23 +0000
de65d0634 (refs/pull/11191/merge) Merge d572e58a7a into 00d24a8219 by Robert Mendon 2018-08-19 04:03:04 +0000
00d24a821 Don't call __delay_4cycles for 0 cycle delay - takes a really long time. (#11586) by ghent360 2018-08-18 20:50:11 -0700
3078e4d08 (refs/pull/11586/head) Confirm non-zero before call by Scott Lahteine 2018-08-18 22:49:06 -0500
84f368234 Have consistent brackets style. by Venelin Efremov 2018-08-18 12:13:29 -0700
022df7575 One of these days I'll get it right. by Venelin Efremov 2018-08-18 12:08:49 -0700
aa43c1cd6 Place the fix in the correct CPU architecture. by Venelin Efremov 2018-08-18 12:07:14 -0700
bb99df0cb Don't call __delay_4cycles for 0 cycle delay - takes a really long time. by Venelin Efremov 2018-08-18 11:30:52 -0700
df4f8d562 (refs/pull/11193/merge) Merge ae4e740faa into 56f1e17a25 by Marcio Teixeira 2018-08-18 17:00:45 +0000
27fbaa2d7 (refs/pull/11583/head) Fix compilation error for STM32F1 with U8GLIB_SSD1306 or U8GLIB_SH1106 enabled by jmz52 2018-08-18 12:52:21 +0300
96b7da6c3 (refs/pull/8311/merge) Merge 3c056bbe7b into feb55517af by Scott Lahteine 2018-08-18 06:58:20 +0000
feb55517a [1.1.x] Max7219 cleanup, simplify, and extend (#11574) by Scott Lahteine 2018-08-18 01:48:28 -0500
942141f8a (refs/pull/11574/head) Refactor as a singleton by Scott Lahteine 2018-08-17 06:18:44 -0500
56f1e17a2 [2.0.x] Max7219 cleanup, simplify, and extend (#11575) by Scott Lahteine 2018-08-18 01:33:13 -0500
af8723be7 (refs/pull/11580/head) Implement servo support for STM32F1 by jmz52 2018-08-17 23:50:00 +0300
0b2d68616 Fix "SD init fail" problem for STM32F1 (#11579) by jmz52 2018-08-18 07:27:10 +0300
4e3ffa87d (refs/pull/11115/merge) Merge fc83d6131b into a98f21ec5e by Marcio Teixeira 2018-08-17 20:14:08 +0000
f69dd92f7 (refs/pull/11579/head) Fix "SD init fail" problem for STM32F1 by jmz52 2018-08-17 22:07:16 +0300
6a59f26aa (refs/pull/10745/merge) Merge 55173e35ff into a98f21ec5e by mb300sd 2018-08-17 14:53:04 +0000
c3f92c271 (refs/pull/10366/merge) Merge 10abec9e70 into 2f2f16c340 by silentninja1 2018-08-17 12:13:09 +0000
add10835e Max7219 cleanup, simplify, and extend by Scott Lahteine 2018-08-15 23:35:56 -0500
5d5185155 (refs/pull/11575/head) Refactor as a singleton by Scott Lahteine 2018-08-17 06:35:12 -0500
bd01c521b Max7219 cleanup, simplify, and extend by Scott Lahteine 2018-08-17 01:24:36 -0500
a98f21ec5 Marlin assumes signed chars by Scott Lahteine 2018-08-15 16:09:10 -0500
2f2f16c34 Marlin assumes signed chars by Scott Lahteine 2018-08-16 20:11:47 -0500
57dab1abb (refs/pull/11499/head) Merge branch '1.1.x' into bugfix-2.0.x by ModMike 2018-08-16 15:53:54 -0400
10028fecb (refs/pull/8601/merge) Merge 115b677f29 into 3ef6cf0bfb by Rob Power 2018-08-16 18:44:48 +0000
57398d3c9 (refs/pull/9310/merge) Merge 4a94546b69 into 3ef6cf0bfb by Luc Van Daele 2018-08-16 18:42:25 +0000
fa6391233 (refs/pull/9790/merge) Merge 62ea879abf into db30650731 by Roman Moravčík 2018-08-16 18:40:28 +0000
582df273c (refs/pull/11177/merge) Merge 9d655cc649 into db30650731 by Axel 2018-08-16 18:31:39 +0000
20b924036 (refs/pull/11499/merge) Merge a84a9adcca into db30650731 by Michael Triffon 2018-08-16 14:46:26 +0000
e138b4aa6 (refs/pull/11480/head, 1.1.x) [1.1.x] Fix Homing/UBL (#11567) by Kevin 2018-08-16 15:29:15 +0200
db3065073 Fix UBL/Homing (#11566) by Kevin 2018-08-16 15:28:40 +0200
576fe1258 (refs/pull/11567/head) [1.1.x] Fix Homing/UBL by Kevin 2018-08-16 14:13:58 +0200
3670a2595 (refs/pull/11566/head) Fix UBL/Homing by Kevin 2018-08-16 14:09:28 +0200
828470360 (refs/pull/11560/head) fixing by ajfxlvmf 2018-08-16 02:08:55 -0400
b7665dd94 redfined by ajfxlvmf 2018-08-16 02:07:21 -0400
9d9943d23 redefined some functions by ajfxlvmf 2018-08-16 02:02:44 -0400
4af9244bb Typo fixed by ajfxlvmf 2018-08-16 01:57:15 -0400
6687ac099 undfined fuction fixed by ajfxlvmf 2018-08-16 01:49:20 -0400
96a748895 (refs/pull/11564/head) need to add E2END to pins_RAMPS_FD_V2.h by Scott Alfter 2018-08-15 22:22:30 -0700
9e46a0825 fixed redfining problem by ajfxlvmf 2018-08-16 01:42:34 -0400
66f6976f1 Fix including problem by ajfxlvmf 2018-08-16 01:30:36 -0400
c3cd237db Adafruit_dotstar added by ajfxlvmf 2018-08-16 01:25:41 -0400
aae4c67e5 Max7219 Clean Up (#11563) by Roxy-3D 2018-08-15 21:22:28 -0500
f35def502 (refs/pull/11563/head) Max7219 Clean Up by Roxy-3D 2018-08-15 21:09:24 -0500
9de730b2b Update tool_change.cpp (#11559) by InsanityAutomation 2018-08-15 20:30:52 -0400
c940e7d42 (refs/pull/11559/head) Update tool_change.cpp by InsanityAutomation 2018-08-15 17:07:24 -0400
a218d4295 (refs/pull/11209/head) Wrap some cpp in conditionals, apply code style by Scott Lahteine 2018-07-06 22:16:19 -0500
f15d1d6f9 basic web ui with console by Hadrien Jouet 2018-06-21 16:48:53 -0700
f2017a74a serve web content through spiffs by Hadrien Jouet 2018-06-20 11:55:32 -0700
b7d7579e8 add basic webserver support by Hadrien Jouet 2018-06-20 07:48:23 -0700
fb3f4032c add mdns host name advertising by Hadrien Jouet 2018-06-17 15:12:40 -0700
6c948cbfc make wifi, ota and web support optional in conf by Hadrien Jouet 2018-06-17 14:09:04 -0700
ba4844639 implement serial over websocket for esp32 by Hadrien Jouet 2018-06-17 08:07:16 -0700
b2dda3926 (tag: 1.1.9) Version 1.1.9 by Scott Lahteine 2018-08-13 03:12:03 -0500
16c33f3db Merge bugfix-1.1.x by Scott Lahteine 2018-08-15 15:17:16 -0500
d370fb70d (refs/pull/11302/head) Merge branch 'triplez-ms-2.0.x' into g34-triple-2.0.x by Holger Müller 2018-08-15 21:45:25 +0200
dc4a110b2 Merge branch 'triplez-2.0.x' into triplez-ms-2.0.x by Holger Müller 2018-08-15 21:42:17 +0200
bc1b9004d Merge remote-tracking branch 'upstream/bugfix-2.0.x' into triplez-2.0.x by Holger Müller 2018-08-15 21:41:33 +0200
c2553f988 2.0.x - Idex match119 (#11556) by InsanityAutomation 2018-08-15 14:26:11 -0400
ecca64fb6 (refs/pull/11556/head) Update ultralcd.cpp by InsanityAutomation 2018-08-15 12:31:37 -0400
a0bc50297 Update ubl_G29.cpp by InsanityAutomation 2018-08-15 12:23:29 -0400
ed1a17c7f Merge pull request #9 from MarlinFirmware/bugfix-2.0.x by InsanityAutomation 2018-08-15 12:21:57 -0400
3ef6cf0bf (refs/pull/11555/head) declare void Max7219_register_setup(); by Roxy-3D 2018-08-15 10:39:08 -0500
e9de321ac declare void Max7219_register_setup(); by Roxy-3D 2018-08-15 10:36:51 -0500
3c056bbe7 (refs/pull/8311/head) Add G93/94/95 Path Control Modes (work-in-progress) by Scott Lahteine 2017-04-12 00:07:35 -0500
73033007e APA102 Control Added by ajfxlvmf 2018-08-14 23:42:00 -0400

1 2 3 4 5 ...