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

Commit Graph

  • 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
  • a22efc5f11 Merge pull request #1597 from Wurstnase/g29_auto_script Scott Lahteine 2015-03-28 20:54:17 -07:00
  • 62a3da9618 Merge pull request #1723 from thinkyhead/tweak_g92 Scott Lahteine 2015-03-28 20:53:37 -07:00
  • cc7a081cae Merge pull request #1722 from Natealus/Development Scott Lahteine 2015-03-28 20:45:55 -07:00
  • afff968e88 ARRAY_BY_EXTRUDERS, shorthand to sync planner Scott Lahteine 2015-03-28 20:33:21 -07:00
  • 2b0c25a091 Tweak G92 to call plan_set_position only once, yes? Scott Lahteine 2015-03-28 19:18:24 -07:00
  • 22bea37393 Azteeg X3 Pro Pin Revisions Natealus 2015-03-28 20:14:42 -06:00
  • 93dc0d0518 Merge pull request #1718 from AnHardt/blink Scott Lahteine 2015-03-28 16:20:33 -07:00
  • 4f399bf1fb Merge pull request #1721 from thinkyhead/fixup_1699 Scott Lahteine 2015-03-28 16:15:09 -07:00
  • edb67ea165 Patch generic delta config Scott Lahteine 2015-03-28 14:13:25 -07:00
  • c481c3b180 Move variable blink from ultralcd.h to dogm_lcd_implementation.h AnHardt 2015-03-28 13:14:38 +01:00
  • 059052889f Further Sanity Checks for Z_PROBE_AND_ENDSTOP. Chris Roadfeldt 2015-03-28 06:08:04 -05:00
  • 8b81f20c61 Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to be. Added Sanity Check for it. Added hook so it's enabled. Chris Roadfeldt 2015-03-28 05:55:42 -05:00
  • fd823449ad Added serial message for Z Probe trigger. Chris Roadfeldt 2015-03-28 05:42:38 -05:00
  • 92eb8109ab Fix declaration of old_z_probe_endstop. Chris Roadfeldt 2015-03-28 05:09:48 -05:00
  • 44b88b41a2 Added credit for code. Chris Roadfeldt 2015-03-28 05:01:04 -05:00
  • 2979b40a7a Fixed typo in Z Probe and Endstop section. Chris Roadfeldt 2015-03-28 04:41:03 -05:00
  • 9f3ff14008 Enabled separate Z Probe and Z Axis endstop use at same time. Typo fixes in comments in existing code. Chris Roadfeldt 2015-03-28 04:31:51 -05:00
  • f47fc879fe Merge pull request #1717 from thinkyhead/fixup_warnings Scott Lahteine 2015-03-27 22:59:49 -07:00
  • 29a713ea5e Merge branch 'Development' into fixup_warnings Scott Lahteine 2015-03-27 20:50:45 -07:00
  • b14be7235e Merge pull request #1585 from galexander1/strtod_e_fix Scott Lahteine 2015-03-27 20:49:03 -07:00
  • ba871e46bf Fix compiler warnings Scott Lahteine 2015-03-27 20:29:05 -07:00
  • ffe0df4b36 Latest upstream commits Scott Lahteine 2015-03-27 18:30:56 -07:00
  • bc2f249cc6 Merge pull request #1622 from AnHardt/tm-utf-minus-kanji Scott Lahteine 2015-03-27 18:24:19 -07:00
  • abfcbd793f Merge pull request #1693 from chris-bo/rework_lcd_beeper Scott Lahteine 2015-03-27 17:03:38 -07:00
  • 72510b75d2 Merge pull request #1716 from thinkyhead/fixup_leveling Scott Lahteine 2015-03-27 17:02:54 -07:00
  • 55739a4efe Fix Z_APPLY_STEP Scott Lahteine 2015-03-27 17:02:11 -07:00
  • 1aec2f437c Merge pull request #1700 from thinkyhead/fixup_leveling Scott Lahteine 2015-03-27 16:37:47 -07:00
  • df02b992b0 Fix redundant_temperatrure_raw setting Scott Lahteine 2015-03-27 16:37:22 -07:00
  • fe29bdd72b Also fix temperature externs Scott Lahteine 2015-03-27 16:26:07 -07:00
  • 578f93bc26 Fixup temp arrays and leveling equation, prepare for merge Scott Lahteine 2015-03-27 16:20:23 -07:00
  • 7d472367e2 Merge pull request #1713 from epatel/Development Scott Lahteine 2015-03-27 16:14:55 -07:00
  • d841028805 Merge pull request #1714 from thinkyhead/fixup_temperature Scott Lahteine 2015-03-27 16:11:57 -07:00
  • ce485175eb Give all temp arrays 4 indices Scott Lahteine 2015-03-27 16:11:28 -07:00
  • 782464ea4d Parentheses need here otherwise sanitycheck.h does wrong thing on line 222 Edward Patel 2015-03-27 20:22:59 +01:00
  • 460f73056b Fix ECHOPAIR ambiguity Scott Lahteine 2015-03-27 00:46:39 -07:00
  • 19d418cd6a Fix up the code to eliminate warnings Scott Lahteine 2015-03-27 00:32:58 -07:00
  • b2496533c6 Put " M" into pmem Scott Lahteine 2015-03-26 20:30:14 -07:00
  • 267d6bef15 Eliminate most warnings Scott Lahteine 2015-03-26 20:07:17 -07:00
  • 3fd7790a15 Merge branch 'Development' into fixup_leveling Latest upstream commits Scott Lahteine 2015-03-26 19:56:58 -07:00
  • b76a352d41 Fix the planeNormal calculation Scott Lahteine 2015-03-26 17:14:07 -07:00
  • 4385ac4f9d Merge pull request #1707 from thinkyhead/fixup_temperature Scott Lahteine 2015-03-26 17:02:11 -07:00
  • 410f64782a Always 4 temp sensors Scott Lahteine 2015-03-26 16:22:21 -07:00
  • 0b32431551 Remove abs() from planeNormal.z Scott Lahteine 2015-03-26 16:20:23 -07:00
  • 53169d96e8 Set temp_meas_ready in set_current_temp_raw Scott Lahteine 2015-03-26 16:02:15 -07:00
  • 06eb7f5b3c Latest upstream commits Scott Lahteine 2015-03-26 15:30:51 -07:00
  • 04328d7537 Add zprobe_zoffset in set_bed_level_equation_* Scott Lahteine 2015-03-26 15:29:16 -07:00
  • d2e73545ba Merge pull request #1705 from AnHardt/ddt Scott Lahteine 2015-03-26 15:16:37 -07:00
  • 81aec66d21 Merge pull request #1704 from AnHardt/firstAid1703 Scott Lahteine 2015-03-26 15:12:40 -07:00
  • 78090275a9 Fix probe range editing Scott Lahteine 2015-03-26 13:52:48 -07:00