3d-print/anadyr-marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • a57862e29f Cleaning up code in prep for merge with upstream. Chris Roadfeldt 2015-04-01 11:40:24 -05:00
  • ca40921bf1 Merge branch 'Merge_cleanup' into Development Chris Roadfeldt 2015-04-01 10:34:36 -05:00
  • 745d9fe1a4 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup Chris Roadfeldt 2015-04-01 10:31:02 -05:00
  • 488666832b Remove the previously introduced () AnHardt 2015-04-01 13:40:05 +02:00
  • 443468df8d Merge pull request #1771 from AnHardt/iss1770 Scott Lahteine 2015-04-01 02:13:30 -07:00
  • 9593f09b99 Merge pull request #1764 from thinkyhead/probe_leveling Scott Lahteine 2015-04-01 02:00:39 -07:00
  • 7bf31cc8a1 Merge pull request #1768 from atfield90/atfield90-patch-1 Scott Lahteine 2015-04-01 01:59:39 -07:00
  • 72c7de3570 Cleanup M48 Scott Lahteine 2015-04-01 01:48:45 -07:00
  • 97a258b0b0 Clean up, document home_axis Scott Lahteine 2015-04-01 01:44:13 -07:00
  • 831016b09f Added new - changed entries from Fix up LCD_PROGRESS_BAR AnHardt 2015-04-01 10:17:17 +02:00
  • a508d835db Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP. Updated documentation in Configuration.h. Cleaned up and commented some code relating to Z_PROBE_ENDSTOP. Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely. Chris Roadfeldt 2015-04-01 02:14:55 -05:00
  • fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development Chris Roadfeldt 2015-04-01 00:52:08 -05:00
  • d273c90d53 Added support for Atmega 1281 chip atfield90 2015-04-01 05:15:27 +02:00
  • 1c7391717e Include sync_plan_position_delta for SCARA also Scott Lahteine 2015-03-31 19:58:03 -07:00
  • 8231fb166d Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM Scott Lahteine 2015-03-31 19:29:48 -07:00
  • 0b57a2ab8b Merge pull request #1757 from bq/Translation-strings Scott Lahteine 2015-03-31 18:56:25 -07:00
  • 18bb6be80e Fix homing and leveling Scott Lahteine 2015-03-31 18:52:19 -07:00
  • 3f2e863206 Improve conditions for HAS_TEMP AnHardt 2015-04-01 02:56:14 +02:00
  • 85f8a26ba4 Fix MIN&MAX temperatures again AnHardt 2015-04-01 00:48:04 +02:00
  • 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM AnHardt 2015-03-31 18:29:16 +02:00
  • c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development Chris Roadfeldt 2015-03-31 11:08:36 -05:00
  • d08782386b Added new trasnslatable labels. Ivan Galvez Junquera 2015-03-31 16:59:43 +02:00
  • be593b600b Merge pull request #1756 from thinkyhead/fixup_config Scott Lahteine 2015-03-31 05:08:41 -07:00
  • 97a69d9b1c Correct XYZ after obtaining plan_bed_level_matrix Scott Lahteine 2015-03-31 04:24:13 -07:00
  • 5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config Scott Lahteine 2015-03-31 03:47:01 -07:00
  • ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS Scott Lahteine 2015-03-31 03:45:21 -07:00
  • 9a5a7a3f68 Raise when not retracting Scott Lahteine 2015-03-31 03:38:03 -07:00
  • 6ff1620fcb Merge pull request #1753 from thinkyhead/fix_extruder_offset Scott Lahteine 2015-03-31 03:21:45 -07:00
  • 8a4ed3c241 Merge pull request #1754 from thinkyhead/fixup_config Scott Lahteine 2015-03-31 03:20:57 -07:00
  • cda4bd4ad9 Correct the comment about M206 Scott Lahteine 2015-03-31 03:20:15 -07:00
  • db4d8e835c Merge pull request #1752 from thinkyhead/fix_lcd_click Scott Lahteine 2015-03-31 02:52:17 -07:00
  • 935592cf6a offsets off by default Scott Lahteine 2015-03-31 02:50:52 -07:00
  • 2a45922afe Restore extruder_offset, init more simply Scott Lahteine 2015-03-31 02:49:47 -07:00
  • 28792e5731 Fix typo in assignment Scott Lahteine 2015-03-31 02:10:49 -07:00
  • bb6174524f Fix EXTRUDER_OFFSET compiler error Scott Lahteine 2015-03-31 02:08:57 -07:00
  • 571652c49b Fix LCD click Scott Lahteine 2015-03-31 01:41:24 -07:00
  • 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development Chris Roadfeldt 2015-03-31 03:07:57 -05:00
  • 17707e7479 Fixed Z_PROBE_PIN pullup bug. Documented some additional areas that should be addressed if Z_PROBE is fully separated from Z_MIN or Z_MAX. Fixed a documentation error in sanity checks. Servos start at 0 not 1. Chris Roadfeldt 2015-03-31 02:56:41 -05:00
  • 21ab44cfa7 Merge pull request #1750 from thinkyhead/fixup_config Scott Lahteine 2015-03-30 23:49:04 -07:00
  • 50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing Scott Lahteine 2015-03-30 23:37:41 -07:00
  • a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak Scott Lahteine 2015-03-30 23:37:28 -07:00
  • 3348b3bf0c Allow SD_FINISHED_RELEASECOMMAND to be undefined Scott Lahteine 2015-03-30 23:31:48 -07:00
  • 82794fa5f7 Add delta generic not renaming Scott Lahteine 2015-03-30 23:25:04 -07:00
  • ba2c7cb467 Update configs with all the latest Scott Lahteine 2015-03-30 23:24:33 -07:00
  • ec1d9c0b8f Use Z_PROBE_ENDSTOP_INVERTING when checking pin status. Chris Roadfeldt 2015-03-31 01:06:01 -05:00
  • 3175c70c79 Manually synching back up with MarlinFirmware/Development. Chris Roadfeldt 2015-03-31 00:11:11 -05:00
  • faac2af4af Merge remote-tracking branch 'origin/Development' into Development Chris Roadfeldt 2015-03-31 00:03:07 -05:00
  • 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development Chris Roadfeldt 2015-03-30 23:59:01 -05:00
  • e08f8eed05 Revert 06f767d..cba5692 Chris Roadfeldt 2015-03-30 23:51:36 -05:00
  • 2e7a4bd7db Merge pull request #1749 from thinkyhead/fixup_config Scott Lahteine 2015-03-30 21:15:44 -07:00
  • 5e82ed4f30 Restore ENDSTOPPULLUPS in Configuration.h Scott Lahteine 2015-03-30 21:15:16 -07:00
  • b8973051c3 Merge pull request #1746 from thinkyhead/power_supply Scott Lahteine 2015-03-30 21:00:40 -07:00
  • 992b07ca57 Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled. Chris Roadfeldt 2015-03-30 22:58:10 -05:00
  • cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development Chris Roadfeldt 2015-03-30 22:33:05 -05:00
  • 8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY Scott Lahteine 2015-03-30 20:22:21 -07:00
  • 92b54aa27e #define HAS_POWER_SWITCH Scott Lahteine 2015-03-30 19:44:53 -07:00
  • 5519882eea Fix up LCD_PROGRESS_BAR Scott Lahteine 2015-03-30 18:00:54 -07:00
  • 6864280803 Use elif and parentheses in conditionals Scott Lahteine 2015-03-30 16:52:27 -07:00
  • 8c136a5ab5 Conditionals and comments for PS = 0 Scott Lahteine 2015-03-30 16:50:05 -07:00
  • 2faed961ce Allow POWER_SUPPLY 0 for no power switch Scott Lahteine 2015-03-30 16:39:47 -07:00
  • baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing Scott Lahteine 2015-03-30 15:45:33 -07:00
  • 346c07cc1a Merge pull request #1743 from AnHardt/extrudemultiply Scott Lahteine 2015-03-30 15:45:10 -07:00
  • 9ac7dc675e Make filament display on dogm_... same as hitachi... AnHardt 2015-03-30 16:56:21 +02:00
  • 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder] AnHardt 2015-03-30 13:35:03 +02:00
  • e63076504d Merge pull request #1733 from AnHardt/c20 Scott Lahteine 2015-03-30 01:57:00 -07:00
  • 41d258697a Pass the z for after probing to retract_z_probe Scott Lahteine 2015-03-30 00:45:02 -07:00
  • 06f767d608 Merge remote-tracking branch 'upstream/development' into development croadfeldt 2015-03-30 02:10:49 -05:00
  • b47fa8c064 Merge pull request #1735 from AnHardt/compilerCandy Scott Lahteine 2015-03-29 23:55:19 -07:00
  • e96db1cd6c Make G29 shared function inline Scott Lahteine 2015-03-29 23:21:39 -07:00
  • d73b169de3 Apply leveling for DELTA, Scott Lahteine 2015-03-29 23:16:12 -07:00
  • 85b67e5223 Merge pull request #1738 from thinkyhead/fixup_homing Scott Lahteine 2015-03-29 20:08:19 -07:00
  • ce44bee28b Small code reduction Scott Lahteine 2015-03-29 19:45:14 -07:00
  • 0213f7f016 Cleanup case for M666 Scott Lahteine 2015-03-29 19:39:43 -07:00
  • 803425e12c Fix G29 E and M48 n Scott Lahteine 2015-03-29 18:56:09 -07:00
  • 1e9999711c Merge pull request #1736 from thinkyhead/fixup_homing Scott Lahteine 2015-03-29 18:27:17 -07:00
  • d738b7acdd Merge pull request #1724 from Natealus/Development Scott Lahteine 2015-03-29 18:26:32 -07:00
  • e8ae51bfe3 Fix G28 homing Y with X Scott Lahteine 2015-03-29 18:06:59 -07:00
  • 7b2550a604 Times can't be negative. AnHardt 2015-03-30 01:58:46 +02:00
  • 507efa771b Remove unused variable fan_rot AnHardt 2015-03-30 01:46:38 +02:00
  • 2b959a7752 Some additional {} to make the compiler happy. AnHardt 2015-03-30 01:42:35 +02:00
  • 0f1bd6e4a7 In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned AnHardt 2015-03-30 01:40:58 +02:00
  • 81bab8739d Get back folder symbols on Hitachi displays AnHardt 2015-03-29 17:29:48 +02:00
  • a9802c95b3 Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is. Chris Roadfeldt 2015-03-29 04:18:37 -05:00
  • 62834a1c43 Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled, unless Z_SAFE_HOMING is. Chris Roadfeldt 2015-03-29 03:55:41 -05:00
  • 666fad3494 Typo fixed in sanity check. Chris Roadfeldt 2015-03-29 03:25:03 -05:00
  • 08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. Chris Roadfeldt 2015-03-29 03:21:48 -05:00
  • 80285251cc More config cleanup work for Z_PROBE_AND_ENDSTOP. Chris Roadfeldt 2015-03-29 03:06:20 -05:00
  • fe4549cd83 Config file Z_PROBE_AND_ENDSTOP description clean up. Chris Roadfeldt 2015-03-29 03:04:59 -05:00
  • 82d2f11129 More additional sanity checks for Z_PROBE_AND_ENDSTOP Chris Roadfeldt 2015-03-29 02:53:55 -05:00
  • 05134f0807 Additional Sanity Checks for Z_PROBE_AND_ENDSTOP Chris Roadfeldt 2015-03-29 02:51:51 -05:00
  • c75a5e8c55 Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h. Confirmed Sanity checks are working..... Chris Roadfeldt 2015-03-29 02:38:08 -05:00
  • a98ac4033b Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support. Chris Roadfeldt 2015-03-29 02:36:26 -05:00
  • 6125124d6c Config file cleanup for Z_PROBE_AND_ENDSTOP support. Chris Roadfeldt 2015-03-29 02:29:16 -05:00
  • 324c14943b Bug fixes for Z_PROBE_AND_ENDSTOP. Code cleanup for Z_PROBE_AND_ENDSTOP. Added Z_PROBE_PIN to pins_RAMPS_13.h Chris Roadfeldt 2015-03-29 02:16:09 -05:00
  • ca5821aa57 Made #ifdef DELTA branch instead Natealus 2015-03-29 01:08:00 -06:00
  • 04fda6b3e9 Undesired behavior with endstops swapped Natealus 2015-03-29 00:55:47 -06:00
  • ca1477d830 Revert "Undesired behavior with endstops swapped" Natealus 2015-03-29 00:52:53 -06:00
  • 15028e9b08 Undesired behavior with endstops swapped Natealus 2015-03-29 00:42:12 -06:00
  • 18245c6cd2 Update pins_RAMBO.h Nate Stokes 2015-03-28 22:29:54 -06:00
  • 234a9d0b12 Viki 2 Pins from Manual Natealus 2015-03-28 22:11:12 -06:00