bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Commit Graph

  • 78167ce439 Merge pull request #1264 from Wurstnase/Development Bernhard Kubicek 2014-12-29 16:48:18 +01:00
  • d1995aec7a Rename ignore_blocks_queued Wurstnase 2014-12-29 16:47:08 +01:00
  • 4122de9d17 change filament issue Wurstnase 2014-12-29 16:31:00 +01:00
  • d60efc3b5d Fix syntax error caused by previous changes. wgm4321 2014-12-28 20:47:59 -05:00
  • cb12161191 Add Filament menu and add Filament/Retract settings to config store. wgm4321 2014-12-28 20:43:14 -05:00
  • c1df713e4d Merge pull request #1258 from fmalpartida/Development Bo Herrmannsen 2014-12-28 19:56:32 +01:00
  • ec33df0554 Merge branch 'SAV-MkI_merge' into Development fmalpartida 2014-12-28 19:54:06 +01:00
  • a5ed3e96f2 Update README.md Bo Herrmannsen 2014-12-28 18:26:16 +01:00
  • 60959f196f Delete .gitignore Bo Herrmannsen 2014-12-28 18:25:33 +01:00
  • 95429a4108 Delete .travis.yml Bo Herrmannsen 2014-12-28 18:25:27 +01:00
  • a0959366af Update README.md Bo Herrmannsen 2014-12-28 17:59:18 +01:00
  • b2000b7055 Merge pull request #1255 from mattsch/503_fwretract_dev_branch Bo Herrmannsen 2014-12-28 17:52:18 +01:00
  • 0468f81950 Update for pull request #837 Matthew Schick 2014-04-04 11:37:46 -04:00
  • 6e42c9e305 Add fwretract settings to M503 output Matthew Schick 2014-03-16 12:00:02 -04:00
  • 0504c02153 Update README.md Bo Herrmannsen 2014-12-28 16:34:38 +01:00
  • 3afe66bb0c Fix issues #1248, #1240 alexborro 2014-12-28 13:27:39 -02:00
  • 73b7b08f2c Merge pull request #1253 from lobermann/Development_AutoLevelOffset Bo Herrmannsen 2014-12-28 12:52:16 +01:00
  • 9eb6df17a7 Consider negative Z Offsets when auto bed leveling is active Lukas Obermann 2014-10-15 16:59:41 +02:00
  • c9f60183a9 Merge pull request #1233 from NarimaanV/Development Bo Herrmannsen 2014-12-28 10:13:21 +01:00
  • 0d957872a0 Merge pull request #1234 from gregrebholz/issue_1069 Bo Herrmannsen 2014-12-28 10:12:08 +01:00
  • 9c07d28bd6 Merge pull request #1249 from drf5n/PID_CI_v2 Bo Herrmannsen 2014-12-28 10:09:25 +01:00
  • 23e768dffa Merge pull request #1250 from chertykov/Development Bo Herrmannsen 2014-12-28 10:09:08 +01:00
  • f7ffd53bac Merge pull request #1251 from thinkyhead/progress_bar Bo Herrmannsen 2014-12-28 10:08:49 +01:00
  • 2f467e2797 LCD Progress Bar Scott Lahteine 2014-12-27 22:26:14 -08:00
  • 050ca9ca13 Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp Denis Chertykov 2014-12-28 09:09:42 +03:00
  • cf52c48d19 Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX. David Forrest 2014-06-24 17:03:55 -04:00
  • 984177c40c temperature.cpp:Add PID Conditional integration on heated bed. David Forrest 2014-06-08 01:05:11 -04:00
  • c9b8435749 heater.c: Limit PID I term with conditional integration. David Forrest 2014-03-31 03:16:00 -04:00
  • f00a202246 Update README.md Bo Herrmannsen 2014-12-27 11:33:25 +01:00
  • 6efc4f3abf Merge pull request #1239 from ErikZalm/Marlin_v1 Bo Herrmannsen 2014-12-26 14:32:15 +01:00
  • 45336bb6c0 Update README.md Bo Herrmannsen 2014-12-26 11:29:29 +01:00
  • 5f555140be Update README.md Bo Herrmannsen 2014-12-24 13:18:29 +01:00
  • 7ecb7cbd46 Added "auto fan" checks to PID_autotune Greg Rebholz 2014-12-23 23:35:54 -05:00
  • 7667949aca Fixed BABYSTEPPING feature NarimaanV 2014-12-23 12:49:54 -05:00
  • 529c937943 Merge pull request #1230 from thinkyhead/readme_tweak Bo Herrmannsen 2014-12-23 13:18:32 +01:00
  • 7250ec4337 Some clarification and markdown for boelle notes Scott Lahteine 2014-12-23 04:05:47 -08:00
  • f05225a271 Update README.md Bo Herrmannsen 2014-12-23 11:37:08 +01:00
  • d080027ff4 ftostr32np > ftostr32sp Scott Lahteine 2014-12-22 17:11:35 -08:00
  • bdf2c94bff Least stack-usage self-contained ftostr32np() Scott Lahteine 2014-12-08 01:43:44 -08:00
  • e83ecec809 As it should be Scott Lahteine 2014-12-22 17:04:22 -08:00
  • f80a602783 Least stack-usage self-contained ftostr32np() Scott Lahteine 2014-12-08 01:43:44 -08:00
  • f390b3f314 Patch to make Z look more like X and Y on UltraLCD Scott Lahteine 2014-12-06 20:59:06 -08:00
  • d254651146 Fix spacing Caleb Anderson 2014-12-21 19:57:41 -07:00
  • 7db943b147 Language change implementation revamped. Didn't work as intended with Arduino IDE. Caleb Anderson 2014-12-21 14:45:34 -07:00
  • fe8d8beb7a Merge pull request #1216 from ErikZalm/Marlin-v1-stable Bo Herrmannsen 2014-12-21 15:11:40 +01:00
  • 5f36ed2c4c Merge pull request #1215 from ErikZalm/Marlin-v1-bug-fixing Bo Herrmannsen 2014-12-21 15:11:21 +01:00
  • af7fbcc026 Merge pull request #1213 from ErikZalm/Marlin_v1 Bo Herrmannsen 2014-12-21 15:10:03 +01:00
  • 203df3533d Merge pull request #1214 from ErikZalm/Marlin_v1 Bo Herrmannsen 2014-12-21 15:09:51 +01:00
  • b792b74036 added note about stale branches Bo Herrmannsen 2014-12-21 15:05:41 +01:00
  • dc64175d77 Update README.md Bo Herrmannsen 2014-12-21 13:42:11 +01:00
  • a8d8ef7534 Merge pull request #1208 from ErikZalm/revert-1199-Marlin_v1 alexborro 2014-12-21 10:08:26 -02:00
  • d74aabf259 Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation" alexborro 2014-12-21 10:06:05 -02:00
  • 60628864ca Merge pull request #1167 from thinkyhead/sd_freemem Bo Herrmannsen 2014-12-20 18:31:21 +01:00
  • 889d7ba218 Merge pull request #1177 from martin-pr/probing_z_speed Bo Herrmannsen 2014-12-20 18:30:35 +01:00
  • 5e7bd2dc87 Merge pull request #1200 from chertykov/Marlin_v1 Bo Herrmannsen 2014-12-20 18:29:39 +01:00
  • 1e865e5df7 Merge pull request #1199 from ei8htohms/Marlin_v1 Bo Herrmannsen 2014-12-20 18:29:28 +01:00
  • b086394178 Fix syntax errors in #ifdef. Denis Chertykov 2014-12-20 19:33:43 +03:00
  • 39d28a9bbf Update qr_solve.h John Davis 2014-12-19 17:53:55 -05:00
  • 6325968a39 Update qr_solve.cpp John Davis 2014-12-19 17:52:13 -05:00
  • e99f24ff2f Update planner.h John Davis 2014-12-19 17:51:14 -05:00
  • ac204028e7 Update planner.cpp John Davis 2014-12-19 17:49:22 -05:00
  • 4315c2547a Update Marlin_main.cpp John Davis 2014-12-19 17:41:29 -05:00
  • f21c65918f Update Servo.h John Davis 2014-12-19 17:20:09 -05:00
  • 58c4473bea Update Servo.cpp John Davis 2014-12-19 17:18:55 -05:00
  • 825c46024d Update vector_3.cpp John Davis 2014-12-19 17:16:31 -05:00
  • cfe80e1def Update vector_3.h John Davis 2014-12-19 17:14:35 -05:00
  • 7464d3c96a Update ConfigurationStore.cpp John Davis 2014-12-19 17:08:43 -05:00
  • 81568c3c6d Update Configuration.h John Davis 2014-12-19 17:06:56 -05:00
  • 4ebeb14026 Update README.md John Davis 2014-12-19 17:01:49 -05:00
  • 03e489aaad Merge pull request #1197 from foosel/fix/issue_1147 Bo Herrmannsen 2014-12-19 14:39:05 +01:00
  • acc0e75279 Fixes commands not being acknowledged in the same order they are received in Gina Häußge 2014-12-19 14:20:36 +01:00
  • a5c059dcf5 Merge branch 'revert-1154-sd_sorting' into Marlin_v1 daid 2014-12-18 23:14:15 +01:00
  • 17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting daid 2014-12-18 23:13:50 +01:00
  • 7458bfe297 Merge pull request #1195 from thinkyhead/board_defines Bo Herrmannsen 2014-12-18 23:06:47 +01:00
  • 6880e93b75 Happy configs Scott Lahteine 2014-12-18 14:02:47 -08:00
  • 61d8e40712 Merge branch 'board_defines' of https://github.com/thinkyhead/Marlin into board_defines Scott Lahteine 2014-12-18 13:59:39 -08:00
  • 3b1f186c0c Clean up configs Scott Lahteine 2014-12-18 12:07:26 -08:00
  • f83d0f2a68 Defines for electronics boards Scott Lahteine 2014-12-18 12:02:36 -08:00
  • bd25e7393b Merge pull request #1192 from thinkyhead/split_language Bo Herrmannsen 2014-12-18 22:26:55 +01:00
  • d201fe74c6 Clean up configs Scott Lahteine 2014-12-18 12:07:26 -08:00
  • 0e23105e1e Defines for electronics boards Scott Lahteine 2014-12-18 12:02:36 -08:00
  • 72da53c613 Merge pull request #1194 from boelle/Marlin_v1 Bo Herrmannsen 2014-12-18 20:41:48 +01:00
  • 174f8d3631 Added example configs for printers from http://tvrrug.org.uk/ Bo Herrmannsen 2014-12-18 20:34:24 +01:00
  • e970461adb Clean up, move unused to the bottom, add headings Scott Lahteine 2014-12-18 10:33:00 -08:00
  • 0c06e97e98 Split up languages.h, use ISO codes Scott Lahteine 2014-12-18 09:31:19 -08:00
  • a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink Bo Herrmannsen 2014-12-18 17:23:11 +01:00
  • 842da54e68 Merge pull request #1187 from thinkyhead/fix_constants Bo Herrmannsen 2014-12-18 17:21:46 +01:00
  • 07c6b5ab71 Using axis constants Scott Lahteine 2014-12-18 08:13:08 -08:00
  • 1857e611d3 Other small tweaks Scott Lahteine 2014-12-18 07:49:16 -08:00
  • 63e1665fa9 Reduce ultralcd.cpp redundancies Scott Lahteine 2014-12-18 07:30:05 -08:00
  • e69313fc2b Reduce dogm lcd code Scott Lahteine 2014-12-18 07:03:40 -08:00
  • bd22405412 Merge pull request #1190 from thinkyhead/sd_sorting Bo Herrmannsen 2014-12-18 12:50:55 +01:00
  • 49791949af Wrap call to flush_presort Scott Lahteine 2014-12-18 03:47:12 -08:00
  • 140ce06692 Merge pull request #1188 from thinkyhead/lcd_longname Bo Herrmannsen 2014-12-18 09:59:18 +01:00
  • 28c3ad291a Merge branch 'sd_freemem' of https://github.com/thinkyhead/Marlin into sd_freemem Scott Lahteine 2014-12-17 23:27:21 -08:00
  • 0450e83fa5 Use SdFatUtil::FreeRam() for freeMemory() if there Scott Lahteine 2014-12-03 05:19:42 -08:00
  • f21cce0b28 Rebase to Marlin_v1 Scott Lahteine 2014-12-17 23:07:36 -08:00
  • 39b47ef5b0 Merge branch 'fix_constants' of https://github.com/thinkyhead/Marlin into fix_constants Scott Lahteine 2014-12-17 23:02:23 -08:00
  • e4b98011cf And one more... Scott Lahteine 2014-12-17 20:29:34 -08:00
  • 60598b4cdd A few constants where they belong Scott Lahteine 2014-12-17 20:22:33 -08:00