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

Commit Graph

  • c610471b0c Add PID_PARAMS_PER_EXTRUDER conditional Scott Lahteine 2015-02-20 00:00:19 -08:00
  • 2d6fa9ce80 Proper implementation of PID menu items Scott Lahteine 2015-02-19 23:54:06 -08:00
  • b8e79dce89 Fix compilation errors when encoder multiplier is disabled wgm4321 2015-02-19 21:51:23 -05:00
  • 65e1fc71be Add encoder rate multiplier wgm4321 2015-02-19 21:42:57 -05:00
  • c9465c33cf Merge branch 'thinkyhead-fixup_ramps_boards' into Development Merge resolving conflicts Scott Lahteine 2015-02-19 17:36:49 -08:00
  • 623119619c Merge branch 'fixup_ramps_boards' of https://github.com/thinkyhead/Marlin into thinkyhead-fixup_ramps_boards Scott Lahteine 2015-02-19 17:36:00 -08:00
  • 859c8d3fef Azteeg X3 overrides too Scott Lahteine 2015-02-19 17:28:38 -08:00
  • 7891eacf21 Merge branch 'Development' into fixup_ramps_boards Scott Lahteine 2015-02-19 17:26:22 -08:00
  • b12cd1f841 Merge pull request #1514 from 2PrintBeta/Development Scott Lahteine 2015-02-19 17:17:34 -08:00
  • 1600506545 Merge remote-tracking branch 'upstream/Development' into marlin_configurator Scott Lahteine 2015-02-19 15:15:55 -08:00
  • 5d0c93ae10 Keep config boxes in view on wide screen Scott Lahteine 2015-02-19 03:41:41 -08:00
  • 335b7680c9 Tooltip code, widescreen layout, hide auto-expands Scott Lahteine 2015-02-19 03:11:16 -08:00
  • 15b73386b5 Add pin definitions for the Boards BAM&DICE + BAM&DICE Due domonoky 2015-02-19 11:53:31 +01:00
  • 08c236059e Merge pull request #1505 from thinkyhead/issue_1499 Scott Lahteine 2015-02-19 01:24:17 -08:00
  • ab419795b3 Merge pull request #1511 from MagoKimbra/Reset_Alert_message_M600 Scott Lahteine 2015-02-19 01:19:56 -08:00
  • f238c7428d Merge branch 'Development' into marlin_configurator Latest upstream changes Scott Lahteine 2015-02-18 21:56:17 -08:00
  • da275c72ab Cleanup Github reply.data.content before atob() Scott Lahteine 2015-02-18 21:45:38 -08:00
  • 159196d1e9 Reset Alert message when finish M600 command MagoKimbra 2015-02-18 21:33:38 +01:00
  • 266ff227cf Merge pull request #1510 from docdawning/Development daid 2015-02-17 20:59:32 +01:00
  • dfd4e74a5c Trivial spelling correction DocDawning 2015-02-17 12:37:05 -07:00
  • 6cdcd6c6d1 Fix iss#1492 AnHardt 2015-02-16 13:53:58 +01:00
  • c033904693 Updated config file section markers Scott Lahteine 2015-02-15 23:25:57 -08:00
  • 84a87a5b1c Fix up configs a little Scott Lahteine 2015-02-15 23:19:22 -08:00
  • 63a5ff7ab9 Merge pull request #1489 from tommil/Development Scott Lahteine 2015-02-15 23:02:11 -08:00
  • efb0491d40 Merge branch 'Development' into issue_1499 Merging latest upstream changes Scott Lahteine 2015-02-15 22:59:07 -08:00
  • 8309b4f408 Merge branch 'Development' into marlin_configurator Merging latest upstream changes Scott Lahteine 2015-02-15 22:58:04 -08:00
  • 961998cf91 Merge pull request #1496 from thinkyhead/issue_1493 Scott Lahteine 2015-02-15 22:00:14 -08:00
  • 59e92a2db4 Merge pull request #1506 from thinkyhead/issue_1504 Scott Lahteine 2015-02-15 21:59:30 -08:00
  • b71322e793 Issue #1504 – K8200 Z_ENABLE_PIN Scott Lahteine 2015-02-15 21:56:23 -08:00
  • 978d114c73 Bed leveling probe behavior issue? Scott Lahteine 2015-02-15 20:51:27 -08:00
  • 7c6236761a Merge branch 'Development' into issue_1493 Merging latest upstream changes Scott Lahteine 2015-02-15 20:45:35 -08:00
  • 9875352dd8 Merge branch 'Development' into marlin_configurator Merging latest upstream changes Scott Lahteine 2015-02-15 20:44:21 -08:00
  • d28f5b9e82 Support for simple customisable AutoZProbing area MarcelMo 2015-02-15 15:58:29 +01:00
  • 3e6ae25481 Merge branch 'Development' of https://github.com/tommil/Marlin into Development Tommi Lamberg 2015-02-15 12:21:57 +02:00
  • 513ff94b89 Merge remote-tracking branch 'upstream/Development' into Development Tommi Lamberg 2015-02-15 12:21:45 +02:00
  • 83cb702e72 Config sections, multi-field values, toggles, etc Scott Lahteine 2015-02-14 23:44:01 -08:00
  • 07a9165ca2 Merge remote-tracking branch 'upstream/Development' into Development Tommi Lamberg 2015-02-13 21:09:52 +02:00
  • afc737ca0c Fix CoreXY Homing Routine. alexborro 2015-02-13 14:38:05 -02:00
  • ec53c6309a More fields, options in config, fix tooltips Scott Lahteine 2015-02-13 03:02:56 -08:00
  • 68184af57b Merge branch 'Development' into marlin_configurator Latest upstream commits Scott Lahteine 2015-02-12 21:59:26 -08:00
  • 7866fa161f Merge pull request #1476 from Natealus/Development Scott Lahteine 2015-02-12 16:56:55 -08:00
  • 8cfdd3e8a4 Merge pull request #1423 from MoonCactus/Development Scott Lahteine 2015-02-12 16:29:30 -08:00
  • ea9e49b20d ARRAY_BY_EXTRUDERS 4th hotend PID parameters Natealus 2015-02-12 00:56:47 -07:00
  • d0ad8a978c Megatronics 3 servo pins Scott Lahteine 2015-02-11 23:46:27 -08:00
  • e74138b2be More robust fetch code, download buttons Scott Lahteine 2015-02-11 04:59:07 -08:00
  • 622a531d9c Fixed error in translation Tommi Lamberg 2015-02-11 08:50:48 +02:00
  • 290ab42d22 Updated Finnish translations Tommi Lamberg 2015-02-11 08:37:07 +02:00
  • 22a7985445 reverted to upstream Jérémie FRANCOIS 2015-02-11 07:12:55 +01:00
  • b3bda57ca2 reverted to upstream Jérémie FRANCOIS 2015-02-11 07:12:02 +01:00
  • 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development Jérémie FRANCOIS 2015-02-11 06:38:36 +01:00
  • 0a59fee763 Merge remote-tracking branch 'upstream/Development' into Development Tommi Lamberg 2015-02-11 06:53:43 +02:00
  • d75cd69de4 Merge pull request #1488 from Wurstnase/Development Scott Lahteine 2015-02-10 16:02:55 -08:00
  • eb5889b3da Merge pull request #1479 from AnHardt/en_first Scott Lahteine 2015-02-10 15:33:45 -08:00
  • b9ed873827 Enable PID debugging for heated bed kieranc 2015-02-10 14:13:06 +01:00
  • 0a19109476 Enable PID debugging for heated bed kieranc 2015-02-10 14:11:44 +01:00
  • a4f939cc27 Updated Finnish language file Tommi Lamberg 2015-02-10 10:48:33 +02:00
  • 4546c92f5b X and Y must be Integers not Float! Wurstnase 2015-02-10 09:00:48 +01:00
  • 32d4dd073f Merge pull request #1487 from AnHardt/iss1485 Scott Lahteine 2015-02-09 21:41:07 -08:00
  • f92b0dc6c7 Merge pull request #1486 from Souko/patch-1 Scott Lahteine 2015-02-09 21:32:54 -08:00
  • c246026bda Sorry. AnHardt 2015-02-10 00:23:39 +01:00
  • 07e488cfae Fix for #1485 AnHardt 2015-02-10 00:13:46 +01:00
  • e7ecf14d0c Update ultralcd_st7920_u8glib_rrd.h Souko 2015-02-09 21:46:06 +01:00
  • 8be25389f2 Merge pull request #1477 from AnHardt/languagetoconfig Scott Lahteine 2015-02-09 05:36:57 -08:00
  • 52c3cf6d34 Fix a logging error Scott Lahteine 2015-02-09 05:07:05 -08:00
  • ba24a09f24 Use api.github to get Configurations Scott Lahteine 2015-02-09 04:34:57 -08:00
  • f4b0a40abb Additional fixes to temperature.cpp and found another missing line Natealus 2015-02-08 15:43:58 -07:00
  • 3aac2df057 Now the oter way around. AnHardt 2015-02-08 20:41:20 +01:00
  • 488633bf44 #include "language_en.h" before the national language in language.h AnHardt 2015-02-08 14:26:24 +01:00
  • 8e92729141 Make display language configurable in Configuration.h AnHardt 2015-02-08 13:45:22 +01:00
  • 38a500d05c Viki 2 Implementation Natealus 2015-02-08 03:14:59 -07:00
  • 697ee2dc50 Compiling errors with 4 Extruders defined Natealus 2015-02-08 01:05:05 -07:00
  • 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should Jérémie FRANCOIS 2015-02-07 23:24:20 +01:00
  • 4228758f1d Clean up and improve tooltips, show the name Scott Lahteine 2015-02-07 11:58:19 -08:00
  • 0116320d2c Strip slashes off the front of tooltips Scott Lahteine 2015-02-07 11:04:10 -08:00
  • 69240d41b0 Offset the timing of the pulsing animation Scott Lahteine 2015-02-07 10:45:56 -08:00
  • 78b9428f4e Avoid capturing disabled items in comments Scott Lahteine 2015-02-07 10:34:16 -08:00
  • 5d159851e5 Fix positioning of tooltip Scott Lahteine 2015-02-07 09:03:00 -08:00
  • c99f1de9f3 Fix tooltips blocking clicks Scott Lahteine 2015-02-07 07:39:10 -08:00
  • 1a548c1bc1 Find nearby comments and make them into tooltips Scott Lahteine 2015-02-07 06:20:04 -08:00
  • c093ea36e6 Merge pull request #1472 from thinkyhead/issue_1471_fix Scott Lahteine 2015-02-07 03:03:04 -08:00
  • 90fa1345b0 Fix purge + refresh of define info Scott Lahteine 2015-02-07 03:02:26 -08:00
  • aa67b38a44 Fan speed and 4th extruder on graphical LCD Scott Lahteine 2015-02-07 02:44:35 -08:00
  • 7850ae2f4f Merge branch 'Development' into marlin_configurator Merge latest Development Scott Lahteine 2015-02-07 02:20:25 -08:00
  • 2647402095 Use info.repl in updateDefineFromField, fix regex Scott Lahteine 2015-02-07 02:04:44 -08:00
  • 12a3975341 Close section tag, add String.prototype.lineCount Scott Lahteine 2015-02-07 00:46:14 -08:00
  • 4bb72f9480 Highlight the edited line Scott Lahteine 2015-02-06 23:46:16 -08:00
  • 37c43a7ab3 Scroll to reveal on switches as well Scott Lahteine 2015-02-06 18:09:14 -08:00
  • 9c0adae3cd Scroll to setting position in file when edited Scott Lahteine 2015-02-06 17:57:31 -08:00
  • 4d341bb758 Copy configs into subfolder Scott Lahteine 2015-02-06 14:58:47 -08:00
  • 1a3c7d91f1 Merge pull request #1470 from thinkyhead/fix_eeprom_typo Scott Lahteine 2015-02-06 14:44:28 -08:00
  • 72856166a9 Fix bad typo in ConfigurationStore.cpp Scott Lahteine 2015-02-06 14:43:58 -08:00
  • b51204cc1c Add fieldsets and make them into tabs Scott Lahteine 2015-02-05 20:28:39 -08:00
  • 56769ba4f8 Make comment/uncomment a little neater Scott Lahteine 2015-02-05 19:39:42 -08:00
  • 94bebf31ac Pre-collect info about options on field init Scott Lahteine 2015-02-05 19:30:11 -08:00
  • 32aaadc301 Include minimized jQuery 2.1.3 Scott Lahteine 2015-02-05 11:50:42 -08:00
  • 53f6bbdfe0 Try a stepper for the serial port Scott Lahteine 2015-02-05 11:44:43 -08:00
  • ac7a4358d6 Add a responsive file uploader Scott Lahteine 2015-02-05 11:14:31 -08:00
  • 09a385d9b0 Add "use strict" to the top. Scott Lahteine 2015-02-05 08:22:51 -08:00
  • b2627200ea Get thermistors from config, add temp sensors Scott Lahteine 2015-02-05 08:19:09 -08:00
  • ef18bfdd3f An in-place browser-based configurator utility Scott Lahteine 2015-02-05 07:05:29 -08:00