jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 4315c2547a Update Marlin_main.cpp John Davis 2014-12-19 17:41:29 -05:00
  • f21c65918f Update Servo.h John Davis 2014-12-19 17:20:09 -05:00
  • 58c4473bea Update Servo.cpp John Davis 2014-12-19 17:18:55 -05:00
  • 825c46024d Update vector_3.cpp John Davis 2014-12-19 17:16:31 -05:00
  • cfe80e1def Update vector_3.h John Davis 2014-12-19 17:14:35 -05:00
  • 7464d3c96a Update ConfigurationStore.cpp John Davis 2014-12-19 17:08:43 -05:00
  • 81568c3c6d Update Configuration.h John Davis 2014-12-19 17:06:56 -05:00
  • 4ebeb14026 Update README.md John Davis 2014-12-19 17:01:49 -05:00
  • 03e489aaad Merge pull request #1197 from foosel/fix/issue_1147 Bo Herrmannsen 2014-12-19 14:39:05 +01:00
  • acc0e75279 Fixes commands not being acknowledged in the same order they are received in Gina Häußge 2014-12-19 14:20:36 +01:00
  • a5c059dcf5 Merge branch 'revert-1154-sd_sorting' into Marlin_v1 daid 2014-12-18 23:14:15 +01:00
  • 17de96ace7 Merge branch 'Marlin_v1' into revert-1154-sd_sorting daid 2014-12-18 23:13:50 +01:00
  • 7458bfe297 Merge pull request #1195 from thinkyhead/board_defines Bo Herrmannsen 2014-12-18 23:06:47 +01:00
  • 6880e93b75 Happy configs Scott Lahteine 2014-12-18 14:02:47 -08:00
  • 61d8e40712 Merge branch 'board_defines' of https://github.com/thinkyhead/Marlin into board_defines Scott Lahteine 2014-12-18 13:59:39 -08:00
  • 3b1f186c0c Clean up configs Scott Lahteine 2014-12-18 12:07:26 -08:00
  • f83d0f2a68 Defines for electronics boards Scott Lahteine 2014-12-18 12:02:36 -08:00
  • bd25e7393b Merge pull request #1192 from thinkyhead/split_language Bo Herrmannsen 2014-12-18 22:26:55 +01:00
  • d201fe74c6 Clean up configs Scott Lahteine 2014-12-18 12:07:26 -08:00
  • 0e23105e1e Defines for electronics boards Scott Lahteine 2014-12-18 12:02:36 -08:00
  • 72da53c613 Merge pull request #1194 from boelle/Marlin_v1 Bo Herrmannsen 2014-12-18 20:41:48 +01:00
  • 174f8d3631 Added example configs for printers from http://tvrrug.org.uk/ Bo Herrmannsen 2014-12-18 20:34:24 +01:00
  • e970461adb Clean up, move unused to the bottom, add headings Scott Lahteine 2014-12-18 10:33:00 -08:00
  • 0c06e97e98 Split up languages.h, use ISO codes Scott Lahteine 2014-12-18 09:31:19 -08:00
  • a9c334e8bc Merge pull request #1191 from thinkyhead/code_shrink Bo Herrmannsen 2014-12-18 17:23:11 +01:00
  • 842da54e68 Merge pull request #1187 from thinkyhead/fix_constants Bo Herrmannsen 2014-12-18 17:21:46 +01:00
  • 07c6b5ab71 Using axis constants Scott Lahteine 2014-12-18 08:13:08 -08:00
  • 1857e611d3 Other small tweaks Scott Lahteine 2014-12-18 07:49:16 -08:00
  • 63e1665fa9 Reduce ultralcd.cpp redundancies Scott Lahteine 2014-12-18 07:30:05 -08:00
  • e69313fc2b Reduce dogm lcd code Scott Lahteine 2014-12-18 07:03:40 -08:00
  • bd22405412 Merge pull request #1190 from thinkyhead/sd_sorting Bo Herrmannsen 2014-12-18 12:50:55 +01:00
  • 49791949af Wrap call to flush_presort Scott Lahteine 2014-12-18 03:47:12 -08:00
  • 140ce06692 Merge pull request #1188 from thinkyhead/lcd_longname Bo Herrmannsen 2014-12-18 09:59:18 +01:00
  • 28c3ad291a Merge branch 'sd_freemem' of https://github.com/thinkyhead/Marlin into sd_freemem Scott Lahteine 2014-12-17 23:27:21 -08:00
  • 0450e83fa5 Use SdFatUtil::FreeRam() for freeMemory() if there Scott Lahteine 2014-12-03 05:19:42 -08:00
  • f21cce0b28 Rebase to Marlin_v1 Scott Lahteine 2014-12-17 23:07:36 -08:00
  • 39b47ef5b0 Merge branch 'fix_constants' of https://github.com/thinkyhead/Marlin into fix_constants Scott Lahteine 2014-12-17 23:02:23 -08:00
  • e4b98011cf And one more... Scott Lahteine 2014-12-17 20:29:34 -08:00
  • 60598b4cdd A few constants where they belong Scott Lahteine 2014-12-17 20:22:33 -08:00
  • f074706d2e And one more... Scott Lahteine 2014-12-17 20:29:34 -08:00
  • b726511a3b A few constants where they belong Scott Lahteine 2014-12-17 20:22:33 -08:00
  • 4d61287807 Merge pull request #1186 from boelle/Marlin_v1 Bo Herrmannsen 2014-12-17 23:28:30 +01:00
  • b17b8583af adding hardware files for OMC Bo Herrmannsen 2014-12-17 23:01:30 +01:00
  • 280504e2e0 Merge pull request #908 from alromh87/Marlin_v1 Bo Herrmannsen 2014-12-17 22:28:07 +01:00
  • 341c7d080d Merge pull request #996 from cbane/arduino-1.5 Bo Herrmannsen 2014-12-17 21:46:18 +01:00
  • 31ca3de72f Merge pull request #819 from neildarlow/Marlin_v1 Bo Herrmannsen 2014-12-17 21:42:53 +01:00
  • e83cfc0a62 Merge pull request #1163 from thinkyhead/lcd_abort_message Bo Herrmannsen 2014-12-17 21:30:19 +01:00
  • 3ac8bd8de7 Merge pull request #1013 from mattrobbo10/Marlin_v1 Bo Herrmannsen 2014-12-17 21:21:18 +01:00
  • 0b310ab6c5 Merge pull request #1153 from xinfab/negative_values_in_menu Bo Herrmannsen 2014-12-17 20:58:01 +01:00
  • 91d740e128 Merge pull request #1141 from filipmu/Filament-Sensor Bo Herrmannsen 2014-12-17 20:38:30 +01:00
  • 00f279376f Merge pull request #1173 from boelle/Marlin_v1 Bo Herrmannsen 2014-12-17 20:21:05 +01:00
  • ab355a90d3 Revert "SD Sort and Buffer" alexborro 2014-12-17 14:50:59 -02:00
  • 4297bcc89f Merge pull request #1154 from thinkyhead/sd_sorting alexborro 2014-12-16 10:17:13 -02:00
  • d088b5f30f Remove debug echo Scott Lahteine 2014-12-13 06:33:12 -08:00
  • 1fad8e6a81 Proper long file name var Scott Lahteine 2014-12-13 06:17:00 -08:00
  • 467f0ea6b7 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting Scott Lahteine 2014-12-13 06:13:18 -08:00
  • 29e854c535 Disable SDCARD_SORT_ALPHA by default Scott Lahteine 2014-12-06 04:16:45 -08:00
  • 6599adc184 Polish up a little... Scott Lahteine 2014-12-06 03:40:39 -08:00
  • a12eec33e2 Completed SORT_USES_MORE_RAM implementation Scott Lahteine 2014-11-30 21:28:16 -08:00
  • c9486ebb85 Improvements, more SORT_USES_MORE_RAM Scott Lahteine 2014-11-26 07:17:47 -08:00
  • b6ffea612a Expand on More RAM concept, address minor bugs Scott Lahteine 2014-11-24 20:26:27 -08:00
  • 8196b36ad9 SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -08:00
  • cf749dbeda Completed SORT_USES_MORE_RAM implementation Scott Lahteine 2014-11-26 08:51:31 -08:00
  • ae081d0fe0 Improvements, more SORT_USES_MORE_RAM Scott Lahteine 2014-11-26 07:17:47 -08:00
  • 785143a013 Expand on More RAM concept, address minor bugs Scott Lahteine 2014-11-24 20:26:27 -08:00
  • 0cbbba08bd SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -08:00
  • af0549bfd2 Merge branch 'sd_freemem' of https://github.com/thinkyhead/Marlin into sd_freemem Scott Lahteine 2014-12-13 06:03:15 -08:00
  • ae1a698263 Use SdFatUtil::FreeRam() for freeMemory() if there Scott Lahteine 2014-12-03 05:19:42 -08:00
  • 600b4f0590 Merge branch 'lcd_abort_message' of https://github.com/thinkyhead/Marlin into lcd_abort_message Scott Lahteine 2014-12-13 06:01:56 -08:00
  • 3ebfd29312 Print a message when printing is aborted Scott Lahteine 2014-11-30 19:56:06 -08:00
  • 2ef0669b19 Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded Martin Prazak 2014-12-07 15:31:46 +00:00
  • 485ca10bc3 Disable SDCARD_SORT_ALPHA by default Scott Lahteine 2014-12-06 04:16:45 -08:00
  • 599530902d Polish up a little... Scott Lahteine 2014-12-06 03:40:39 -08:00
  • 1ba7c31395 Adding Melzi board Bo Herrmannsen 2014-12-04 23:45:51 +01:00
  • 64139f5e5a Merge https://github.com/ErikZalm/Marlin into Marlin_v1 Neil Darlow 2014-12-04 21:09:03 +00:00
  • 2f9ed1777d Merge pull request #1168 from boelle/Marlin_v1 galexander1 2014-12-03 09:32:23 -05:00
  • edfcf3b527 Toshiba Stepper Driver support Bo Herrmannsen 2014-12-03 15:01:52 +01:00
  • c429a4b3ec Toshiba Stepper Driver support Bo Herrmannsen 2014-12-03 14:37:16 +01:00
  • e5a334b83a Use SdFatUtil::FreeRam() for freeMemory() if there Scott Lahteine 2014-12-03 05:19:42 -08:00
  • f05928d886 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting Scott Lahteine 2014-11-30 21:38:26 -08:00
  • b4e287fe8e Completed SORT_USES_MORE_RAM implementation Scott Lahteine 2014-11-30 21:28:16 -08:00
  • de725bd408 # This is a combination of 4 commits. # The first commit's message is: SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -08:00
  • 061c1fcd93 Merge branch 'lcd_abort_message' of https://github.com/thinkyhead/Marlin into lcd_abort_message Scott Lahteine 2014-11-30 19:58:10 -08:00
  • 181e487f13 Print a message when printing is aborted Scott Lahteine 2014-11-30 19:56:06 -08:00
  • ff38d7c293 Print a message when printing is aborted Scott Lahteine 2014-11-30 19:56:06 -08:00
  • 1977b4490f Merge pull request #1159 from thinkyhead/lcd_wait_better nothinman 2014-11-28 16:44:29 +00:00
  • 7562183efc Skip over spaces first Scott Lahteine 2014-11-28 08:09:28 -08:00
  • 5a8b3a84ae Merge pull request #1155 from thinkyhead/lcd_wait_better nothinman 2014-11-28 11:01:24 +00:00
  • 1b7c065055 Merge pull request #1158 from elgambitero/patch-2 nothinman 2014-11-28 10:57:50 +00:00
  • 433ac29d31 Updated a bit of spanish language elgambitero 2014-11-27 22:02:49 +01:00
  • 2427d0b683 Merge branch 'sd_sorting' of https://github.com/thinkyhead/Marlin into sd_sorting Scott Lahteine 2014-11-26 21:09:09 -08:00
  • 8ebefe6d35 Completed SORT_USES_MORE_RAM implementation Scott Lahteine 2014-11-26 08:51:31 -08:00
  • 725ba8d01e Improvements, more SORT_USES_MORE_RAM Scott Lahteine 2014-11-26 07:17:47 -08:00
  • 2b54eeb897 Expand on More RAM concept, address minor bugs Scott Lahteine 2014-11-24 20:26:27 -08:00
  • 14187dae6c SD Card Alpha Sorting Scott Lahteine 2014-11-24 14:03:20 -08:00
  • 662fe8288b kill DEADJOE Scott Lahteine 2014-11-26 21:07:48 -08:00
  • aad336eb81 Merge branch 'lcd_wait_better' of https://github.com/thinkyhead/Marlin into lcd_wait_better Scott Lahteine 2014-11-26 21:06:13 -08:00
  • 5874852501 get latest Marlin_v1 changes Scott Lahteine 2014-11-26 21:00:02 -08:00
  • 12b51d6060 Ignore S and P if no value >0 is included. Scott Lahteine 2014-11-26 09:21:37 -08:00
  • d12b24758a Clear LCD to welcome_msg if not printing Scott Lahteine 2014-11-24 18:50:11 -08:00