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

Commit Graph

  • ffaf1b4f22 Add pin configuration for Brainwave Pro Chris Petersen 2015-04-09 22:11:50 -0700
  • dee6840c50 Merge pull request #1907 from thinkyhead/some_fixes Scott Lahteine 2015-04-13 18:04:53 -0700
  • 642f6a92bc fix type of code_has_value Scott Lahteine 2015-04-13 18:02:17 -0700
  • 6b51305c4b Merge pull request #1906 from thinkyhead/some_fixes Scott Lahteine 2015-04-13 17:59:48 -0700
  • 17ad80c1e1 Spacing in XYZ_CONSTS Scott Lahteine 2015-04-13 17:58:47 -0700
  • 09d60e0128 Naming and code comments Scott Lahteine 2015-04-13 17:17:36 -0700
  • c05b347617 Merge pull request #1902 from msutas/Development Scott Lahteine 2015-04-13 14:31:57 -0700
  • 5a9e45cc4a Fix Syntax Error Filament Runout Statement Mehmet Sutas 2015-04-13 22:37:18 +0300
  • 0908c41156 Merge pull request #1899 from thinkyhead/squash_fixups Scott Lahteine 2015-04-12 23:31:31 -0700
  • 257a907456 Fix typo in next_bed_check_ms Scott Lahteine 2015-04-12 23:17:28 -0700
  • e4b1e8651b next_ vars faster than previous_ Scott Lahteine 2015-04-12 23:06:50 -0700
  • cfa60bdb97 Merge branch 'Development' into squash_fixups Scott Lahteine 2015-04-12 22:51:18 -0700
  • ccddc280be Apply three more commits Scott Lahteine 2015-04-12 18:07:08 -0700
  • 666f9cd7b4 Merge pull request #1897 from epatel/Development Scott Lahteine 2015-04-12 21:26:36 -0700
  • e7aae314de Merge pull request #1896 from thinkyhead/cold_extrude Scott Lahteine 2015-04-12 17:50:19 -0700
  • 74e4b42f7e Default MACHINE_NAME to "3D Printer" Scott Lahteine 2015-04-12 17:17:41 -0700
  • 8857b9e921 Use the extruder argument in plan_buffer_line Scott Lahteine 2015-04-12 16:57:00 -0700
  • a37c7ff16d Manual bed leveling menu fixes. Edward Patel 2015-04-12 16:56:17 +0200
  • ac2b23f574 Homing fixes Scott Lahteine 2015-04-11 20:06:48 -0700
  • b089eb42eb Merge pull request #1893 from thinkyhead/cold_extrude Scott Lahteine 2015-04-11 04:57:00 -0700
  • 055b11814a Additional cleanup of ultralcd.cpp Scott Lahteine 2015-04-11 04:56:08 -0700
  • 388dd0cfa5 Fix doubled lcd_quick_feedback Scott Lahteine 2015-04-11 04:45:04 -0700
  • f8b4ee079b Merge pull request #1891 from thinkyhead/cold_extrude Scott Lahteine 2015-04-11 01:37:07 -0700
  • c6bb98abad machine name for hephestos too Scott Lahteine 2015-04-11 01:36:24 -0700
  • 79a5b14eb7 Merge pull request #1890 from thinkyhead/cold_extrude Scott Lahteine 2015-04-11 00:04:46 -0700
  • ccbe2c4ea3 Apply CUSTOM_MACHINE_NAME to configurations Scott Lahteine 2015-04-10 21:29:42 -0700
  • 71adb1ee59 Merge branch 'Development' into cold_extrude Latest upstream commits Scott Lahteine 2015-04-10 21:13:50 -0700
  • f1a03c5447 Merge pull request #1887 from thinkyhead/cold_extrude Scott Lahteine 2015-04-10 16:16:52 -0700
  • 5fe382949b Some G-Codes comment cleanup Scott Lahteine 2015-04-10 16:16:13 -0700
  • 8f164f4c83 Clean up M85 in GCodes.md Scott Lahteine 2015-04-10 16:04:32 -0700
  • a327d876fe Document G92 arguments in GCodes.md Scott Lahteine 2015-04-10 16:02:00 -0700
  • 652d59cd80 Spacing of g-codes in GCodes.md Scott Lahteine 2015-04-10 15:59:55 -0700
  • fe912f44dc Smaller headings Scott Lahteine 2015-04-10 15:58:32 -0700
  • 93eb63238f Move G Codes into categories with M Codes Scott Lahteine 2015-04-10 15:57:54 -0700
  • a3b13eb5ac Organize M Codes by Category Scott Lahteine 2015-04-10 15:54:36 -0700
  • 3105ebc562 Restore M928, M999 Scott Lahteine 2015-04-10 15:05:00 -0700
  • 01654bdec1 Cleanup formatting of some M codes Scott Lahteine 2015-04-10 15:03:41 -0700
  • 907e8e98e5 Add GCodes from Marlin 1.0.3 dev, format as pre Scott Lahteine 2015-04-10 14:55:21 -0700
  • 8b16ebe705 Break out prevent_dangerous_extrude feature Scott Lahteine 2015-04-09 22:40:37 -0700
  • 67c0e8323e Merge pull request #1879 from thinkyhead/cold_extrude Scott Lahteine 2015-04-09 22:06:06 -0700
  • 740152ee70 Merge branch 'Development' into cold_extrude Latest upstream commits Scott Lahteine 2015-04-09 20:23:47 -0700
  • 5914d9d7de Shuffling declarations.. Scott Lahteine 2015-04-09 20:21:30 -0700
  • b328c6e6b6 Shuffling declarations. Scott Lahteine 2015-04-09 20:05:10 -0700
  • fb4cefc91d Define lcd_move_[xyz] ahead of lcd_move_menu_axis Scott Lahteine 2015-04-09 19:33:16 -0700
  • 4c3736ed43 Feature: Add RAMPS CNC Controller Board Richard Miles 2015-04-09 16:32:56 +0100
  • 9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING Scott Lahteine 2015-04-09 04:32:14 -0700
  • 56fc3a4835 bgr -> bg AnHardt 2015-04-09 13:09:18 +0200
  • 7a1aef1450 Merge pull request #1877 from AnHardt/display-only Scott Lahteine 2015-04-09 03:54:05 -0700
  • 6096164d79 Merge pull request #1878 from thinkyhead/cold_extrude Scott Lahteine 2015-04-09 03:41:54 -0700
  • a488445cbe Fix spelling of "too" Scott Lahteine 2015-04-09 03:41:31 -0700
  • b1950a7f25 Merge pull request #1875 from Natealus/Development Scott Lahteine 2015-04-09 03:37:24 -0700
  • df50523605 Made encoderPosition and quick_feedback dependant on NEWPANEL AnHardt 2015-04-09 12:26:45 +0200
  • dcde09fdff Merge remote-tracking branch 'upstream/Development' into Development Latest upstream commits Scott Lahteine 2015-04-09 03:21:36 -0700
  • 2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude Scott Lahteine 2015-04-09 03:21:19 -0700
  • 837ceb9abb Merge pull request #1867 from epatel/Development Scott Lahteine 2015-04-09 02:29:47 -0700
  • a95544f92a Spell adjustment Scott Lahteine 2015-04-09 02:04:06 -0700
  • a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR Scott Lahteine 2015-04-09 01:56:23 -0700
  • 7f22464353 Merge remote-tracking branch 'upstream/Development' into Development Latest upstream commits Scott Lahteine 2015-04-09 01:41:10 -0700
  • 1269c445ab Catch dangerous extrude before trying several Scott Lahteine 2015-04-09 01:40:48 -0700
  • 4abd23ae9e Merge pull request #1866 from AnHardt/contrast Scott Lahteine 2015-04-09 00:34:25 -0700
  • 585eee6549 Z Probe inverting not present in example configs, causes error Natealus 2015-04-08 18:57:30 -0600
  • c5961892e3 Bulgarian for all the Configuration.h's AnHardt 2015-04-09 01:52:13 +0200
  • 6248c93f37 Introduction of Bulgarian - language_bgr.h AnHardt 2015-04-09 01:26:48 +0200
  • 540dbb35e2 And an other MSG_BED in Marlin_main.cpp AnHardt 2015-04-09 01:16:06 +0200
  • 14d4419e16 Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed") AnHardt 2015-04-08 23:59:01 +0200
  • ea897654a4 Moved the definitions of the LCD_STR_* to Conditionals.h AnHardt 2015-04-08 21:53:58 +0200
  • 7dc64efe67 Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS Edward Patel 2015-04-08 20:52:48 +0200
  • 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp AnHardt 2015-04-08 13:26:29 +0200
  • a76fb42ca6 Merge https://github.com/MarlinFirmware/Marlin into contrast AnHardt 2015-04-08 13:05:21 +0200
  • bcc04192fc Remove Contrast Menu for U8GLIB_ST7920 AnHardt 2015-04-08 12:56:38 +0200
  • 98f3130a5c Merge pull request #1865 from thinkyhead/configurator_values Scott Lahteine 2015-04-08 03:13:27 -0700
  • 4788b59300 Thermistor values for configurator Scott Lahteine 2015-04-08 03:12:21 -0700
  • bb917ecda8 Merge pull request #1853 from thinkyhead/dev_version Scott Lahteine 2015-04-08 01:57:51 -0700
  • caa7734402 Merge pull request #1864 from thinkyhead/is_running Scott Lahteine 2015-04-08 01:10:36 -0700
  • c82da64d10 Merge pull request #1863 from lcfm1/patch-3 Scott Lahteine 2015-04-08 01:07:12 -0700
  • 3162971cd6 current_position not static Scott Lahteine 2015-04-08 01:05:39 -0700
  • 27cb90da8b IsStopped / IsRunning inline Scott Lahteine 2015-04-08 00:56:19 -0700
  • 07fc2b5b70 Update language_ru.h Max 2015-04-08 13:18:45 +0600
  • 756bb5e268 Cleanup formatting in hitachi & dogm lcd Scott Lahteine 2015-04-07 22:04:10 -0700
  • 7431ef7e2d Merge branch 'Development' into dev_version Latest upstream commits Scott Lahteine 2015-04-07 21:14:00 -0700
  • 43773ff735 Formatting and lcd contrast masking Scott Lahteine 2015-04-07 21:11:03 -0700
  • eb6e3886f4 Set version to "1.0.3 dev" Scott Lahteine 2015-04-07 20:38:43 -0700
  • cf9b58452c Minimum delay in menu click feedback Scott Lahteine 2015-04-07 20:20:30 -0700
  • 419f3ebc03 Merge pull request #1850 from OpCode1300/docs Scott Lahteine 2015-04-07 20:14:53 -0700
  • ff429cdd8a Fix typo in readme Administrator 2015-04-07 23:03:46 -0500
  • 1d291be2ba Fix de after PREVENT_DANGEROUS_EXTRUDE Scott Lahteine 2015-04-07 20:01:08 -0700
  • e03da4805b Merge pull request #1774 from epatel/Development Scott Lahteine 2015-04-07 19:24:46 -0700
  • 5b2c67f4c3 Merge pull request #1847 from thinkyhead/more_configurator Scott Lahteine 2015-04-07 15:41:02 -0700
  • f7c4e7e19f Fix G29 not deploying in some instances Scott Lahteine 2015-04-07 15:38:29 -0700
  • a9ed39b12d Moved checks into SanityCheck.h + removed previous added checks. Edward Patel 2015-04-07 22:58:08 +0200
  • 002340f32c Merge branch 'Development-Marlin' into Development Edward Patel 2015-04-07 22:49:12 +0200
  • 3db4e0fb5d Merge pull request #1842 from thinkyhead/more_configurator Scott Lahteine 2015-04-06 23:38:20 -0700
  • c379f17117 Encapsulate setting of homing_bump_feedrate Scott Lahteine 2015-04-06 23:21:33 -0700
  • 7d2c2f1790 Updates for the configurator Scott Lahteine 2015-04-06 23:16:01 -0700
  • 967db181d0 Latest upstream commits Scott Lahteine 2015-04-06 21:46:18 -0700
  • e502144eda Fixup formatting of last commit Scott Lahteine 2015-04-06 21:28:14 -0700
  • d05efa008d Merge pull request #1825 from shaggythesheep/bugfix_no_heaters Scott Lahteine 2015-04-06 21:25:22 -0700
  • d20f42c883 Don't stow the probe until the last grid point! Scott Lahteine 2015-04-06 20:58:09 -0700
  • 5c2bb05af3 Merge pull request #1839 from AnHardt/fix-statusmessage Scott Lahteine 2015-04-06 19:08:25 -0700
  • d70a4a3847 Merge pull request #1823 from AnHardt/splashscreen Scott Lahteine 2015-04-06 18:48:48 -0700