CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 00e4bc9f54 Merge pull request #1311 from i-make-robots/Development Bo Herrmannsen 2015-01-04 21:29:29 +0100
  • 9472bbe51d issue 968 for dev branch Dan Royer 2015-01-04 12:17:46 -0800
  • d2b6e62996 Merge pull request #1309 from philfifi/fix_temp_runaway alexborro 2015-01-04 12:55:58 -0200
  • 30248214c7 temp runaway: proper cast to prevent any overflow. Philippe L 2015-01-03 15:45:06 +0100
  • c5f138ea07 Merge pull request #1291 from alhirzel/Development Bo Herrmannsen 2015-01-04 12:53:41 +0100
  • efca4afab2 Merge pull request #1304 from monkeydave/Travis-CI Bo Herrmannsen 2015-01-04 12:52:38 +0100
  • 652895d656 try different proproc for CI failure odewdney 2015-01-04 11:15:23 +0000
  • 3d9f4ac757 Merge pull request #1303 from wgm4321/Development Bo Herrmannsen 2015-01-04 01:29:26 +0100
  • 9d57c376db Commented out configs that are failing with no easy fixes for the moment monkeydave 2015-01-03 22:46:15 +0000
  • 04fb34c7ff Add English defines for filament menu to non-English to prevent compile errors until translated wgm4321 2015-01-03 17:28:05 -0500
  • f8aa5ff771 Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined wgm4321 2015-01-03 17:10:13 -0500
  • 39fae9e3a3 Fix progmem warning odewdney 2015-01-03 21:30:16 +0000
  • 07b85f8b92 Added compile checks for lots of defines in Configuration.h monkeydave 2015-01-03 19:29:04 +0000
  • be81dfa3de Updated .travis.yml so others forks will also compile monkeydave 2015-01-03 16:50:05 +0000
  • b5c6f11e41 Merge pull request #1297 from monkeydave/Readd-Travis-CI Bo Herrmannsen 2015-01-03 14:22:07 +0100
  • 206b7f4e92 Update .gitignore Bo Herrmannsen 2015-01-03 13:52:52 +0100
  • 9d9a2d75ef Merge pull request #1295 from monkeydave/Re-add_gitignore Bo Herrmannsen 2015-01-03 13:51:31 +0100
  • 21cc188272 Updated .travis.yml for ErikZalm branch pull request monkeydave 2015-01-03 12:09:12 +0000
  • 86cc22d639 Readd .travis.yml, change build enviroment to use ino instead of gcc monkeydave 2015-01-03 11:43:40 +0000
  • 3f9707aa33 Added .gitignore back into repo monkeydave 2015-01-03 10:56:10 +0000
  • f36fd3ddec Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development Alexander Hirzel 2015-01-02 12:39:39 -0500
  • 912ed155c5 Merge pull request #1292 from thinkyhead/docs_and_scripts alexborro 2015-01-02 14:56:39 -0200
  • b5e50cdd4e Move scripts and documentation to subfolders Scott Lahteine 2015-01-02 08:53:09 -0800
  • eed451e034 rework analogInputToDigitalPin definition Alexander Hirzel 2015-01-02 11:11:18 -0500
  • f3209bba34 Merge branch 'Development' of https://github.com/alhirzel/Marlin into Development Alexander Hirzel 2015-01-02 11:13:38 -0500
  • 1f520a5a8c Due to the fix for #1248, X and Y probe offsets must not be floats. Lane Roberts 2014-12-31 12:34:59 -0600
  • b32be2dc64 Fix syntax error caused by previous changes. wgm4321 2014-12-28 20:47:59 -0500
  • edac64e7d2 Add Filament menu and add Filament/Retract settings to config store. wgm4321 2014-12-28 20:43:14 -0500
  • ecda6cdc0a Fix typo, PID_BED_POWER -> MAX_BED_POWER Alexander Hirzel 2015-01-02 01:36:27 -0500
  • f3e503e725 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed. David Forrest 2015-01-01 19:24:42 -0500
  • 1d5d853c9a temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER. David Forrest 2015-01-01 19:11:42 -0500
  • 63da6900b0 Merge pull request #1282 from vandarin/Development Bo Herrmannsen 2015-01-02 15:35:40 +0100
  • a18b625534 Merge pull request #1261 from wgm4321/Development Bo Herrmannsen 2015-01-02 15:35:29 +0100
  • 975810fb4a Merge pull request #1286 from alhirzel/Development alexborro 2015-01-02 09:48:20 -0200
  • ae12ad0d6c Fix typo, PID_BED_POWER -> MAX_BED_POWER Alexander Hirzel 2015-01-02 01:36:27 -0500
  • 80b17ab573 Merge pull request #1285 from drf5n/PID_CI_v2 alexborro 2015-01-01 22:56:21 -0200
  • 625860f086 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed. David Forrest 2015-01-01 19:24:42 -0500
  • 6583bb781d temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER. David Forrest 2015-01-01 19:11:42 -0500
  • 2701dd8a17 Due to the fix for #1248, X and Y probe offsets must not be floats. Lane Roberts 2014-12-31 12:34:59 -0600
  • 217186d7bc Merge pull request #1281 from Grogyan/patch-2 Bo Herrmannsen 2014-12-31 11:58:43 +0100
  • 6b82415c81 Update pins.h Grogyan 2014-12-31 13:04:16 +1300
  • 692a01b1c7 Merge pull request #1277 from thinkyhead/fix_regressions Bo Herrmannsen 2014-12-30 16:49:08 +0100
  • 878b5557a1 Merge pull request #1276 from thinkyhead/lcd_z_reformat Bo Herrmannsen 2014-12-30 16:48:29 +0100
  • 2ec2bf1564 Fix regressions affecting compilation Scott Lahteine 2014-12-30 07:36:18 -0800
  • 6c591a97a1 Merge branch 'lcd_z_reformat' of https://github.com/thinkyhead/Marlin into lcd_z_reformat Scott Lahteine 2014-12-30 07:26:58 -0800
  • e7db8ee9e5 ftostr32np > ftostr32sp Scott Lahteine 2014-12-22 17:11:35 -0800
  • 10e1b6ef8b Least stack-usage self-contained ftostr32np() Scott Lahteine 2014-12-08 01:43:44 -0800
  • d1f21d1189 As it should be Scott Lahteine 2014-12-22 17:04:22 -0800
  • 449dad71f2 Least stack-usage self-contained ftostr32np() Scott Lahteine 2014-12-08 01:43:44 -0800
  • a2109cb492 Patch to make Z look more like X and Y on UltraLCD Scott Lahteine 2014-12-06 20:59:06 -0800
  • 3d1da45f3e Update Marlin.h Bernhard Kubicek 2014-12-30 08:30:37 +0100
  • d02daec08f fixed compilation bkubicek 2014-12-30 08:04:06 +0100
  • 0268c03a75 Merge pull request #1271 from RobotCaleb/DeltaCalMenu alexborro 2014-12-29 23:10:20 -0200
  • 991a74b75b Move delta calibration menu to sample delta configuration. Turn off by default. Caleb Anderson 2014-12-29 18:03:56 -0700
  • 2bf6d804c4 Merge pull request #1269 from Wurstnase/Development Bo Herrmannsen 2014-12-29 23:20:05 +0100
  • 9453bb13c2 Logic error correction Wurstnase 2014-12-29 23:17:42 +0100
  • 67fd8f0727 Merge pull request #1267 from RobotCaleb/LanguageFix Bo Herrmannsen 2014-12-29 19:49:11 +0100
  • 2309c9f43a Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix Caleb Anderson 2014-12-29 10:48:56 -0700
  • 236db44669 Fix spacing Caleb Anderson 2014-12-21 19:57:41 -0700
  • e6774fb7d2 Using the new language implementation wasn't behaving as expected. Caleb Anderson 2014-12-29 10:43:19 -0700
  • f4ce235589 Merge pull request #1266 from RobotCaleb/DeltaCalMenu Bo Herrmannsen 2014-12-29 18:42:40 +0100
  • cb047e9070 Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently) Caleb Anderson 2014-12-29 10:19:25 -0700
  • 5b336a4cdb Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051 To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h Caleb Anderson 2014-12-29 10:13:00 -0700
  • 10ad9f1062 Addes servo0 pin ultimaker Bernhard Kubicek 2014-12-29 17:27:14 +0100
  • f24c5d82e3 Update Marlin_main.cpp Bernhard Kubicek 2014-12-29 17:17:30 +0100
  • 053b541de8 Merge pull request #1265 from Wurstnase/Development Bernhard Kubicek 2014-12-29 17:14:35 +0100
  • 8a6f098cc6 Expand manage_inactivity #1264 Wurstnase 2014-12-29 17:07:22 +0100
  • 78167ce439 Merge pull request #1264 from Wurstnase/Development Bernhard Kubicek 2014-12-29 16:48:18 +0100
  • d1995aec7a Rename ignore_blocks_queued Wurstnase 2014-12-29 16:47:08 +0100
  • 4122de9d17 change filament issue Wurstnase 2014-12-29 16:31:00 +0100
  • d60efc3b5d Fix syntax error caused by previous changes. wgm4321 2014-12-28 20:47:59 -0500
  • cb12161191 Add Filament menu and add Filament/Retract settings to config store. wgm4321 2014-12-28 20:43:14 -0500
  • c1df713e4d Merge pull request #1258 from fmalpartida/Development Bo Herrmannsen 2014-12-28 19:56:32 +0100
  • ec33df0554 Merge branch 'SAV-MkI_merge' into Development fmalpartida 2014-12-28 19:54:06 +0100
  • a5ed3e96f2 Update README.md Bo Herrmannsen 2014-12-28 18:26:16 +0100
  • 60959f196f Delete .gitignore Bo Herrmannsen 2014-12-28 18:25:33 +0100
  • 95429a4108 Delete .travis.yml Bo Herrmannsen 2014-12-28 18:25:27 +0100
  • a0959366af Update README.md Bo Herrmannsen 2014-12-28 17:59:18 +0100
  • b2000b7055 Merge pull request #1255 from mattsch/503_fwretract_dev_branch Bo Herrmannsen 2014-12-28 17:52:18 +0100
  • 0468f81950 Update for pull request #837 Matthew Schick 2014-04-04 11:37:46 -0400
  • 6e42c9e305 Add fwretract settings to M503 output Matthew Schick 2014-03-16 12:00:02 -0400
  • 0504c02153 Update README.md Bo Herrmannsen 2014-12-28 16:34:38 +0100
  • 3afe66bb0c Fix issues #1248, #1240 alexborro 2014-12-28 13:27:39 -0200
  • 73b7b08f2c Merge pull request #1253 from lobermann/Development_AutoLevelOffset Bo Herrmannsen 2014-12-28 12:52:16 +0100
  • 9eb6df17a7 Consider negative Z Offsets when auto bed leveling is active Lukas Obermann 2014-10-15 16:59:41 +0200
  • c9f60183a9 Merge pull request #1233 from NarimaanV/Development Bo Herrmannsen 2014-12-28 10:13:21 +0100
  • 0d957872a0 Merge pull request #1234 from gregrebholz/issue_1069 Bo Herrmannsen 2014-12-28 10:12:08 +0100
  • 9c07d28bd6 Merge pull request #1249 from drf5n/PID_CI_v2 Bo Herrmannsen 2014-12-28 10:09:25 +0100
  • 23e768dffa Merge pull request #1250 from chertykov/Development Bo Herrmannsen 2014-12-28 10:09:08 +0100
  • f7ffd53bac Merge pull request #1251 from thinkyhead/progress_bar Bo Herrmannsen 2014-12-28 10:08:49 +0100
  • 2f467e2797 LCD Progress Bar Scott Lahteine 2014-12-27 22:26:14 -0800
  • 050ca9ca13 Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp Denis Chertykov 2014-12-28 09:09:42 +0300
  • cf52c48d19 Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX. David Forrest 2014-06-24 17:03:55 -0400
  • 984177c40c temperature.cpp:Add PID Conditional integration on heated bed. David Forrest 2014-06-08 01:05:11 -0400
  • c9b8435749 heater.c: Limit PID I term with conditional integration. David Forrest 2014-03-31 03:16:00 -0400
  • f00a202246 Update README.md Bo Herrmannsen 2014-12-27 11:33:25 +0100
  • 6efc4f3abf Merge pull request #1239 from ErikZalm/Marlin_v1 Bo Herrmannsen 2014-12-26 14:32:15 +0100
  • 45336bb6c0 Update README.md Bo Herrmannsen 2014-12-26 11:29:29 +0100
  • 5f555140be Update README.md Bo Herrmannsen 2014-12-24 13:18:29 +0100
  • 7ecb7cbd46 Added "auto fan" checks to PID_autotune Greg Rebholz 2014-12-23 23:35:54 -0500