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

Commit Graph

  • 3e6ae25481 Merge branch 'Development' of https://github.com/tommil/Marlin into Development Tommi Lamberg 2015-02-15 12:21:57 +0200
  • 513ff94b89 Merge remote-tracking branch 'upstream/Development' into Development Tommi Lamberg 2015-02-15 12:21:45 +0200
  • 83cb702e72 Config sections, multi-field values, toggles, etc Scott Lahteine 2015-02-14 23:44:01 -0800
  • 07a9165ca2 Merge remote-tracking branch 'upstream/Development' into Development Tommi Lamberg 2015-02-13 21:09:52 +0200
  • afc737ca0c Fix CoreXY Homing Routine. alexborro 2015-02-13 14:38:05 -0200
  • ec53c6309a More fields, options in config, fix tooltips Scott Lahteine 2015-02-13 03:02:56 -0800
  • 68184af57b Merge branch 'Development' into marlin_configurator Latest upstream commits Scott Lahteine 2015-02-12 21:59:26 -0800
  • 7866fa161f Merge pull request #1476 from Natealus/Development Scott Lahteine 2015-02-12 16:56:55 -0800
  • 8cfdd3e8a4 Merge pull request #1423 from MoonCactus/Development Scott Lahteine 2015-02-12 16:29:30 -0800
  • ea9e49b20d ARRAY_BY_EXTRUDERS 4th hotend PID parameters Natealus 2015-02-12 00:56:47 -0700
  • d0ad8a978c Megatronics 3 servo pins Scott Lahteine 2015-02-11 23:46:27 -0800
  • e74138b2be More robust fetch code, download buttons Scott Lahteine 2015-02-11 04:59:07 -0800
  • 622a531d9c Fixed error in translation Tommi Lamberg 2015-02-11 08:50:48 +0200
  • 290ab42d22 Updated Finnish translations Tommi Lamberg 2015-02-11 08:37:07 +0200
  • 22a7985445 reverted to upstream Jérémie FRANCOIS 2015-02-11 07:12:55 +0100
  • b3bda57ca2 reverted to upstream Jérémie FRANCOIS 2015-02-11 07:12:02 +0100
  • 9d75a56b56 Merge remote-tracking branch 'upstream/Development' into Development Jérémie FRANCOIS 2015-02-11 06:38:36 +0100
  • 0a59fee763 Merge remote-tracking branch 'upstream/Development' into Development Tommi Lamberg 2015-02-11 06:53:43 +0200
  • d75cd69de4 Merge pull request #1488 from Wurstnase/Development Scott Lahteine 2015-02-10 16:02:55 -0800
  • eb5889b3da Merge pull request #1479 from AnHardt/en_first Scott Lahteine 2015-02-10 15:33:45 -0800
  • b9ed873827 Enable PID debugging for heated bed kieranc 2015-02-10 14:13:06 +0100
  • 0a19109476 Enable PID debugging for heated bed kieranc 2015-02-10 14:11:44 +0100
  • a4f939cc27 Updated Finnish language file Tommi Lamberg 2015-02-10 10:48:33 +0200
  • 4546c92f5b X and Y must be Integers not Float! Wurstnase 2015-02-10 09:00:48 +0100
  • 32d4dd073f Merge pull request #1487 from AnHardt/iss1485 Scott Lahteine 2015-02-09 21:41:07 -0800
  • f92b0dc6c7 Merge pull request #1486 from Souko/patch-1 Scott Lahteine 2015-02-09 21:32:54 -0800
  • c246026bda Sorry. AnHardt 2015-02-10 00:23:39 +0100
  • 07e488cfae Fix for #1485 AnHardt 2015-02-10 00:13:46 +0100
  • e7ecf14d0c Update ultralcd_st7920_u8glib_rrd.h Souko 2015-02-09 21:46:06 +0100
  • 8be25389f2 Merge pull request #1477 from AnHardt/languagetoconfig Scott Lahteine 2015-02-09 05:36:57 -0800
  • 52c3cf6d34 Fix a logging error Scott Lahteine 2015-02-09 05:07:05 -0800
  • ba24a09f24 Use api.github to get Configurations Scott Lahteine 2015-02-09 04:34:57 -0800
  • f4b0a40abb Additional fixes to temperature.cpp and found another missing line Natealus 2015-02-08 15:43:58 -0700
  • 3aac2df057 Now the oter way around. AnHardt 2015-02-08 20:41:20 +0100
  • 488633bf44 #include "language_en.h" before the national language in language.h AnHardt 2015-02-08 14:26:24 +0100
  • 8e92729141 Make display language configurable in Configuration.h AnHardt 2015-02-08 13:45:22 +0100
  • 38a500d05c Viki 2 Implementation Natealus 2015-02-08 03:14:59 -0700
  • 697ee2dc50 Compiling errors with 4 Extruders defined Natealus 2015-02-08 01:05:05 -0700
  • 85e5aa4011 Generalized enqueue_commands_P, and moved them to Marlin_main as they should Jérémie FRANCOIS 2015-02-07 23:24:20 +0100
  • 4228758f1d Clean up and improve tooltips, show the name Scott Lahteine 2015-02-07 11:58:19 -0800
  • 0116320d2c Strip slashes off the front of tooltips Scott Lahteine 2015-02-07 11:04:10 -0800
  • 69240d41b0 Offset the timing of the pulsing animation Scott Lahteine 2015-02-07 10:45:56 -0800
  • 78b9428f4e Avoid capturing disabled items in comments Scott Lahteine 2015-02-07 10:34:16 -0800
  • 5d159851e5 Fix positioning of tooltip Scott Lahteine 2015-02-07 09:03:00 -0800
  • c99f1de9f3 Fix tooltips blocking clicks Scott Lahteine 2015-02-07 07:39:10 -0800
  • 1a548c1bc1 Find nearby comments and make them into tooltips Scott Lahteine 2015-02-07 06:20:04 -0800
  • c093ea36e6 Merge pull request #1472 from thinkyhead/issue_1471_fix Scott Lahteine 2015-02-07 03:03:04 -0800
  • 90fa1345b0 Fix purge + refresh of define info Scott Lahteine 2015-02-07 03:02:26 -0800
  • aa67b38a44 Fan speed and 4th extruder on graphical LCD Scott Lahteine 2015-02-07 02:44:35 -0800
  • 7850ae2f4f Merge branch 'Development' into marlin_configurator Merge latest Development Scott Lahteine 2015-02-07 02:20:25 -0800
  • 2647402095 Use info.repl in updateDefineFromField, fix regex Scott Lahteine 2015-02-07 02:04:44 -0800
  • 12a3975341 Close section tag, add String.prototype.lineCount Scott Lahteine 2015-02-07 00:46:14 -0800
  • 4bb72f9480 Highlight the edited line Scott Lahteine 2015-02-06 23:46:16 -0800
  • 37c43a7ab3 Scroll to reveal on switches as well Scott Lahteine 2015-02-06 18:09:14 -0800
  • 9c0adae3cd Scroll to setting position in file when edited Scott Lahteine 2015-02-06 17:57:31 -0800
  • 4d341bb758 Copy configs into subfolder Scott Lahteine 2015-02-06 14:58:47 -0800
  • 1a3c7d91f1 Merge pull request #1470 from thinkyhead/fix_eeprom_typo Scott Lahteine 2015-02-06 14:44:28 -0800
  • 72856166a9 Fix bad typo in ConfigurationStore.cpp Scott Lahteine 2015-02-06 14:43:58 -0800
  • b51204cc1c Add fieldsets and make them into tabs Scott Lahteine 2015-02-05 20:28:39 -0800
  • 56769ba4f8 Make comment/uncomment a little neater Scott Lahteine 2015-02-05 19:39:42 -0800
  • 94bebf31ac Pre-collect info about options on field init Scott Lahteine 2015-02-05 19:30:11 -0800
  • 32aaadc301 Include minimized jQuery 2.1.3 Scott Lahteine 2015-02-05 11:50:42 -0800
  • 53f6bbdfe0 Try a stepper for the serial port Scott Lahteine 2015-02-05 11:44:43 -0800
  • ac7a4358d6 Add a responsive file uploader Scott Lahteine 2015-02-05 11:14:31 -0800
  • 09a385d9b0 Add "use strict" to the top. Scott Lahteine 2015-02-05 08:22:51 -0800
  • b2627200ea Get thermistors from config, add temp sensors Scott Lahteine 2015-02-05 08:19:09 -0800
  • ef18bfdd3f An in-place browser-based configurator utility Scott Lahteine 2015-02-05 07:05:29 -0800
  • 3490a19103 Merge pull request #1466 from CONSULitAS/Development_K8200_de Scott Lahteine 2015-02-04 17:28:04 -0800
  • cfbb94a2a8 K8200: Example Configuration.h fixed CONSULitAS 2015-02-04 10:35:10 +0100
  • b65c5d8ec6 Merge pull request #1464 from AnHardt/iss1448-Menu Scott Lahteine 2015-02-03 22:43:29 -0800
  • 6250cc9a8d Merge pull request #1465 from CONSULitAS/Development_K8200_de Scott Lahteine 2015-02-03 22:38:57 -0800
  • 0de5083aff K8200: Example Configurations readme.md updated CONSULitAS 2015-02-04 00:24:51 +0100
  • c421ffd520 K8200: Example Configuration_adv.h back in sync CONSULitAS 2015-02-04 00:19:18 +0100
  • 0575dd10de K8200: Example Configuration.h back in sync CONSULitAS 2015-02-04 00:15:50 +0100
  • f708884808 Introduced new function lcd_implementation_mark_as_selected() AnHardt 2015-02-03 23:35:33 +0100
  • b6ca50a2cc Merge pull request #1463 from thinkyhead/cleanup_recent_merge Scott Lahteine 2015-02-03 12:06:47 -0800
  • cc56f36870 Merge pull request #1461 from thinkyhead/issue_1453_redo Scott Lahteine 2015-02-03 11:52:09 -0800
  • 8663f4bbaf Apply some cleanup for recent merge Scott Lahteine 2015-02-03 11:48:49 -0800
  • fed931afda Merge pull request #1462 from AnHardt/iss1447-Edit Scott Lahteine 2015-02-03 11:36:04 -0800
  • 0cb1029311 remove extra plan_buffer_line Scott Lahteine 2015-02-03 11:26:36 -0800
  • 9381bfe7f9 Fixes issue #1447 - Overlapping of long descriptions with values. AnHardt 2015-02-03 20:15:16 +0100
  • b97a950f53 Apply fix for M600 filament change Scott Lahteine 2015-02-03 09:57:16 -0800
  • 04ce708031 Merge pull request #1457 from AnHardt/bootsplash Scott Lahteine 2015-02-03 09:19:54 -0800
  • 0e41882b5c Merge https://github.com/MarlinFirmware/Marlin into bootsplash AnHardt 2015-02-03 18:05:38 +0100
  • 2abf1ad940 Distribute recent changes in Configuration.h to the examples. AnHardt 2015-02-03 17:59:04 +0100
  • 86c0583525 Merge pull request #1459 from AnHardt/lcd-width Scott Lahteine 2015-02-03 08:29:03 -0800
  • 33f8580255 Merge branch 'lcd-width' into b- AnHardt 2015-02-03 14:45:58 +0100
  • 0c24bb6cfc Adjust LCD_WIDTH to make better use of DOGM LCDs AnHardt 2015-02-03 14:21:43 +0100
  • b1dbd765c6 Centralise definition of fonts for DOGM displays AnHardt 2015-02-03 13:10:09 +0100
  • 65642592ee Added dualline version. AnHardt 2015-02-03 12:25:36 +0100
  • f9cc1df00b Droped URL from bootsplash. AnHardt 2015-02-03 11:14:27 +0100
  • c20606b8d7 Replaced some literal constants with defines AnHardt 2015-02-03 09:52:29 +0100
  • 3602474c25 Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin AnHardt 2015-02-03 09:07:57 +0100
  • f5fd94d62a Kick suspicious loop an win 72 bytes. AnHardt 2015-02-03 08:56:00 +0100
  • 6cce924cd0 Merge pull request #1455 from thinkyhead/fix_hd44780_inversion Scott Lahteine 2015-02-02 22:53:24 -0800
  • b3973ed224 Fix HD44780 misspelled as HD44870 Scott Lahteine 2015-02-02 22:33:58 -0800
  • d8b7f29fa2 Merge pull request #1452 from thinkyhead/fix_M200_bug Scott Lahteine 2015-02-02 21:58:15 -0800
  • 6d81968db5 Merge pull request #1450 from docdawning/Development Scott Lahteine 2015-02-02 21:17:06 -0800
  • 5bb3933b21 Fixed n00bsauce DocDawning 2015-02-02 14:18:53 -0700
  • a507431400 Merge branch 'Development' of https://github.com/docdawning/Marlin into Development DocDawning 2015-02-02 14:13:03 -0700