Commit Graph

  • 380c9abf16 removed note on Ramps Bo Herrmannsen 2015-01-06 21:15:46 +01:00
  • 501fe97c00 changed some stuff near IDE Bo Herrmannsen 2015-01-06 21:12:21 +01:00
  • 5de8cce7bf Merge pull request #2 from MarlinFirmware/development Wurstnase 2015-01-06 21:07:47 +01:00
  • c7e2d73039 Merge branch 'development' Dino Del Favero 2015-01-06 20:18:03 +01:00
  • 422a958a34 Fix CoreXY speed calculation Alex Borro 2015-01-06 16:39:48 -02:00
  • 038fccd7a1 I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp. There is the possibility of turn on this features adding "#define SLOW_PWM_HEATERS" in Configuration.h Dino Del Favero 2015-01-06 18:32:17 +01:00
  • 6730335657 Update Configuration.h DinoMesina 2015-01-06 18:06:02 +01:00
  • 1a57644b0c Update README.md Bo Herrmannsen 2015-01-06 17:12:17 +01:00
  • 80afded132 Update README.md Bo Herrmannsen 2015-01-06 17:10:05 +01:00
  • 028fe129a5 Update README.md Bo Herrmannsen 2015-01-06 17:09:19 +01:00
  • d7a2dd676e Update README.md Bo Herrmannsen 2015-01-06 15:45:51 +01:00
  • b3f2b30347 Update README.md Bo Herrmannsen 2015-01-06 15:44:26 +01:00
  • 4ffecdbf7d Merge pull request #1313 from wgm4321/Development Bo Herrmannsen 2015-01-06 13:47:49 +01:00
  • 2dfdf4b55c Merge pull request #1320 from stv0g/Development Bo Herrmannsen 2015-01-06 12:30:54 +01:00
  • 358759cb52 Update README.md Bo Herrmannsen 2015-01-06 12:02:42 +01:00
  • 93c8b2a40b added irc channel Bo Herrmannsen 2015-01-06 11:59:11 +01:00
  • 672f764b4d replaced ASCII GPL v3 license by markdown version moved new COPYING file to top-level directory to make it more visible and remove clutter from Marlin subduer Steffen Vogel 2015-01-06 11:35:53 +01:00
  • 5a5b95edbf Merge pull request #1319 from stv0g/Development Bo Herrmannsen 2015-01-06 11:25:07 +01:00
  • f25e793cff rename stepper lookup table scipt to be consistent with termistor lookup table script Steffen Vogel 2015-01-06 10:30:20 +01:00
  • df17a6a1b4 fix #1305 by proposed workaround (thanks gaby64) Steffen Vogel 2015-01-06 10:29:26 +01:00
  • f7e65935fb make use of power operator Steffen Vogel 2015-01-06 10:28:43 +01:00
  • 4e02aff9b5 automatically determine min/max temp for terminator Steffen Vogel 2015-01-06 10:28:19 +01:00
  • 81363bc441 more cleanups Steffen Vogel 2015-01-06 10:27:40 +01:00
  • 95f4a55820 refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients Steffen Vogel 2015-01-06 08:24:59 +01:00
  • 21205cc3d8 more cleanups in the termistorTable generation script Steffen Vogel 2015-01-06 08:23:51 +01:00
  • fb0996b5db improved output aligment and precision Steffen Vogel 2015-01-06 08:20:52 +01:00
  • 538231edfd cosmetic whitespace cleanup and comments added/updated Steffen Vogel 2015-01-06 08:20:20 +01:00
  • 067b509479 Re-enable filament menu with recalc fix when enabling/disabling mm3 wgm4321 2015-01-05 22:29:29 -05:00
  • a19f2f8ae7 Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled wgm4321 2015-01-04 22:15:16 -05:00
  • f24dda9700 Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3" wgm4321 2015-01-04 22:08:41 -05:00
  • ec4681ab6b Revert "Add "Detailed Z Probe" menu item with ABL is defined." wgm4321 2015-01-04 21:53:37 -05:00
  • dd7e4ee97f Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3 wgm4321 2015-01-04 21:44:55 -05:00
  • 2b9722f387 Add "Detailed Z Probe" menu item with ABL is defined. wgm4321 2015-01-04 21:42:16 -05:00
  • 00e4bc9f54 Merge pull request #1311 from i-make-robots/Development Bo Herrmannsen 2015-01-04 21:29:29 +01:00
  • 9472bbe51d issue 968 for dev branch Dan Royer 2015-01-04 12:17:46 -08:00
  • d2b6e62996 Merge pull request #1309 from philfifi/fix_temp_runaway alexborro 2015-01-04 12:55:58 -02:00
  • 30248214c7 temp runaway: proper cast to prevent any overflow. Philippe L 2015-01-03 15:45:06 +01:00
  • c5f138ea07 Merge pull request #1291 from alhirzel/Development Bo Herrmannsen 2015-01-04 12:53:41 +01:00
  • efca4afab2 Merge pull request #1304 from monkeydave/Travis-CI Bo Herrmannsen 2015-01-04 12:52:38 +01:00
  • 652895d656 try different proproc for CI failure odewdney 2015-01-04 11:15:23 +00:00
  • 3d9f4ac757 Merge pull request #1303 from wgm4321/Development Bo Herrmannsen 2015-01-04 01:29:26 +01:00
  • 9d57c376db Commented out configs that are failing with no easy fixes for the moment monkeydave 2015-01-03 22:46:15 +00:00
  • 04fb34c7ff Add English defines for filament menu to non-English to prevent compile errors until translated wgm4321 2015-01-03 17:28:05 -05:00
  • f8aa5ff771 Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined wgm4321 2015-01-03 17:10:13 -05:00
  • 39fae9e3a3 Fix progmem warning odewdney 2015-01-03 21:30:16 +00:00
  • 07b85f8b92 Added compile checks for lots of defines in Configuration.h monkeydave 2015-01-03 19:29:04 +00:00
  • be81dfa3de Updated .travis.yml so others forks will also compile monkeydave 2015-01-03 16:50:05 +00:00
  • b5c6f11e41 Merge pull request #1297 from monkeydave/Readd-Travis-CI Bo Herrmannsen 2015-01-03 14:22:07 +01:00
  • 206b7f4e92 Update .gitignore Bo Herrmannsen 2015-01-03 13:52:52 +01:00
  • 9d9a2d75ef Merge pull request #1295 from monkeydave/Re-add_gitignore Bo Herrmannsen 2015-01-03 13:51:31 +01:00
  • 21cc188272 Updated .travis.yml for ErikZalm branch pull request monkeydave 2015-01-03 12:09:12 +00:00
  • 86cc22d639 Readd .travis.yml, change build enviroment to use ino instead of gcc monkeydave 2015-01-03 11:43:40 +00:00
  • 3f9707aa33 Added .gitignore back into repo monkeydave 2015-01-03 10:56:10 +00:00
  • f36fd3ddec Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development Alexander Hirzel 2015-01-02 12:39:39 -05:00
  • 912ed155c5 Merge pull request #1292 from thinkyhead/docs_and_scripts alexborro 2015-01-02 14:56:39 -02:00
  • b5e50cdd4e Move scripts and documentation to subfolders Scott Lahteine 2015-01-02 08:53:09 -08:00
  • eed451e034 rework analogInputToDigitalPin definition Alexander Hirzel 2015-01-02 11:11:18 -05:00
  • f3209bba34 Merge branch 'Development' of https://github.com/alhirzel/Marlin into Development Alexander Hirzel 2015-01-02 11:13:38 -05:00
  • 1f520a5a8c Due to the fix for #1248, X and Y probe offsets must not be floats. Lane Roberts 2014-12-31 12:34:59 -06:00
  • b32be2dc64 Fix syntax error caused by previous changes. wgm4321 2014-12-28 20:47:59 -05:00
  • edac64e7d2 Add Filament menu and add Filament/Retract settings to config store. wgm4321 2014-12-28 20:43:14 -05:00
  • ecda6cdc0a Fix typo, PID_BED_POWER -> MAX_BED_POWER Alexander Hirzel 2015-01-02 01:36:27 -05:00
  • f3e503e725 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed. David Forrest 2015-01-01 19:24:42 -05:00
  • 1d5d853c9a temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER. David Forrest 2015-01-01 19:11:42 -05:00
  • 63da6900b0 Merge pull request #1282 from vandarin/Development Bo Herrmannsen 2015-01-02 15:35:40 +01:00
  • a18b625534 Merge pull request #1261 from wgm4321/Development Bo Herrmannsen 2015-01-02 15:35:29 +01:00
  • 975810fb4a Merge pull request #1286 from alhirzel/Development alexborro 2015-01-02 09:48:20 -02:00
  • ae12ad0d6c Fix typo, PID_BED_POWER -> MAX_BED_POWER Alexander Hirzel 2015-01-02 01:36:27 -05:00
  • 80b17ab573 Merge pull request #1285 from drf5n/PID_CI_v2 alexborro 2015-01-01 22:56:21 -02:00
  • 625860f086 temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed. David Forrest 2015-01-01 19:24:42 -05:00
  • 6583bb781d temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER. David Forrest 2015-01-01 19:11:42 -05:00
  • 2701dd8a17 Due to the fix for #1248, X and Y probe offsets must not be floats. Lane Roberts 2014-12-31 12:34:59 -06:00
  • 217186d7bc Merge pull request #1281 from Grogyan/patch-2 Bo Herrmannsen 2014-12-31 11:58:43 +01:00
  • 6b82415c81 Update pins.h Grogyan 2014-12-31 13:04:16 +13:00
  • 692a01b1c7 Merge pull request #1277 from thinkyhead/fix_regressions Bo Herrmannsen 2014-12-30 16:49:08 +01:00
  • 878b5557a1 Merge pull request #1276 from thinkyhead/lcd_z_reformat Bo Herrmannsen 2014-12-30 16:48:29 +01:00
  • 2ec2bf1564 Fix regressions affecting compilation Scott Lahteine 2014-12-30 07:36:18 -08:00
  • 6c591a97a1 Merge branch 'lcd_z_reformat' of https://github.com/thinkyhead/Marlin into lcd_z_reformat Scott Lahteine 2014-12-30 07:26:58 -08:00
  • e7db8ee9e5 ftostr32np > ftostr32sp Scott Lahteine 2014-12-22 17:11:35 -08:00
  • 10e1b6ef8b Least stack-usage self-contained ftostr32np() Scott Lahteine 2014-12-08 01:43:44 -08:00
  • d1f21d1189 As it should be Scott Lahteine 2014-12-22 17:04:22 -08:00
  • 449dad71f2 Least stack-usage self-contained ftostr32np() Scott Lahteine 2014-12-08 01:43:44 -08:00
  • a2109cb492 Patch to make Z look more like X and Y on UltraLCD Scott Lahteine 2014-12-06 20:59:06 -08:00
  • 3d1da45f3e Update Marlin.h Bernhard Kubicek 2014-12-30 08:30:37 +01:00
  • d02daec08f fixed compilation bkubicek 2014-12-30 08:04:06 +01:00
  • 0268c03a75 Merge pull request #1271 from RobotCaleb/DeltaCalMenu alexborro 2014-12-29 23:10:20 -02:00
  • 991a74b75b Move delta calibration menu to sample delta configuration. Turn off by default. Caleb Anderson 2014-12-29 18:03:56 -07:00
  • 2bf6d804c4 Merge pull request #1269 from Wurstnase/Development Bo Herrmannsen 2014-12-29 23:20:05 +01:00
  • 9453bb13c2 Logic error correction Wurstnase 2014-12-29 23:17:42 +01:00
  • 67fd8f0727 Merge pull request #1267 from RobotCaleb/LanguageFix Bo Herrmannsen 2014-12-29 19:49:11 +01:00
  • 2309c9f43a Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix Caleb Anderson 2014-12-29 10:48:56 -07:00
  • 236db44669 Fix spacing Caleb Anderson 2014-12-21 19:57:41 -07:00
  • e6774fb7d2 Using the new language implementation wasn't behaving as expected. Caleb Anderson 2014-12-29 10:43:19 -07:00
  • f4ce235589 Merge pull request #1266 from RobotCaleb/DeltaCalMenu Bo Herrmannsen 2014-12-29 18:42:40 +01:00
  • 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 -07:00
  • 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 -07:00
  • 10ad9f1062 Addes servo0 pin ultimaker Bernhard Kubicek 2014-12-29 17:27:14 +01:00
  • f24c5d82e3 Update Marlin_main.cpp Bernhard Kubicek 2014-12-29 17:17:30 +01:00
  • 053b541de8 Merge pull request #1265 from Wurstnase/Development Bernhard Kubicek 2014-12-29 17:14:35 +01:00
  • 8a6f098cc6 Expand manage_inactivity #1264 Wurstnase 2014-12-29 17:07:22 +01:00