zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
7329 commits 1 branch 0 tags 156 MiB
Commit graph

6059 commits

Author SHA1 Message Date
Scott Lahteine 38466b1d2f Merge pull request #5271 from esenapaj/Fix-for-the-PR-#5267 
Fix for thePR #5267 (Introduce a +1234.56 format for over 999 steps/mm)
 2016-11-21 13:55:56 -06:00
Scott Lahteine 9b96a4a53b Merge pull request #5246 from thinkyhead/rc_some_cleanup 
Minor stepper cleanup
 2016-11-21 13:55:25 -06:00
Sebastianv650 8190483eeb Improvement for ENSURE_SMOOTH_MOVES 
Instead of waiting for a single long block, compare the complete block
buffer runtime for the long_move() check.
 2016-11-21 17:58:24 +01:00
esenapaj da67037550 Fix for thePR #5267 (Introduce a +1234.56 format for over 999 steps/mm) 
・Fix memory leak
 2016-11-21 22:31:01 +09:00
Scott Lahteine 0f891e848b Merge pull request #5268 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-11-21 03:18:36 -06:00
esenapaj 190a04c467 Update Japanese translation 
・Change translation for 16 width LCD
 2016-11-21 17:51:43 +09:00
esenapaj 7b836a4000 Introduce a +1234.56 format for over 999 steps/mm 2016-11-21 17:45:07 +09:00
Scott Lahteine 3e0376b45e Reorder M114 and M119 gcode cases 2016-11-21 00:52:19 -06:00
Scott Lahteine 644fac5d34 Reduce all stepper_indirection init code with macros 2016-11-21 00:52:18 -06:00
Scott Lahteine 4e4f37b6c2 Code formatting for TMC and L6470 config options 2016-11-21 00:52:18 -06:00
Scott Lahteine 127e21ae00 Extend M122 for all steppers 2016-11-21 00:52:18 -06:00
Scott Lahteine bf5f5f44cc Make TMC2130 init code auto-configure 
Simply apply enabled settings instead of requiring users to edit
stepper_indirection.cpp
 2016-11-21 00:52:17 -06:00
Moritz d67c1d825f Add TMC2130 support 2016-11-21 00:17:45 -06:00
Scott Lahteine 11effeee2c Add an option for delta to home to the top 2016-11-20 23:12:07 -06:00
Sebastianv650 50059690e0 Allow UART ISRs inside the stepper ISR 
If the stepper ISR takes too long, chars are lost which leads to serial
communication errors like "Line number not +1" or "Wrong checksum". In
worst case, the printer can even do crazy moves.

With this changes, UART interrupts are handled inside the stepper ISR.
This way, no chars should be lost.
 2016-11-20 13:09:12 +01:00
Moshen Chan 29b174bfb9 Fix z feedrate value when doing mesh bed leveling. probe feedrate uses XY_PROBE_SPEED 2016-11-19 16:34:41 -08:00
AnHardt 88b38eafd8 Endstop interrupt refinement 
At the start of a move, check if the endstops are already triggered.
The 'change' interrupts will not see a change if already triggered.
 2016-11-19 13:30:49 +01:00
Scott Lahteine 79c8591192 Merge pull request #5253 from thinkyhead/rc_smooth_move_ex-lax 
Ensure smooth print moves even with LCD enabled
 2016-11-19 01:38:41 -06:00
Scott Lahteine 0215cacb30 Merge pull request #5247 from esenapaj/Re-follow-the-PR-#4634 
Re-follow the PR #4634 (Set language display charset in language.h)
 2016-11-19 01:32:40 -06:00
Scott Lahteine 2cc32d85a3 Adjust ENSURE_SMOOTH_MOVES coding style 2016-11-19 01:28:48 -06:00
Scott Lahteine 072541f286 Update ENSURE_SMOOTH_MOVES in all configs 2016-11-19 01:28:47 -06:00
Sebastianv650 de89dc9f04 Ensure smooth print moves even with LCD enabled 
lcd_update can take so much time that the block buffer gets drained if
there are only short segments. This leads to jerky printer movements for
example in circles and a bad print quality.

This change implements a simple check: Only if the block currently
executed is long enough, run lcd_update.
This also means the printer will not show actual values on the LCD nor
will it respond to buttons pressed. A option that keeps the menu
accessible is also available.
Aditionaly, slow down if a block would be so fast that adding a new
block to the buffer would take more time. In this case, the buffer would
drain until it's empty in worst case.
 2016-11-19 01:28:47 -06:00
Scott Lahteine 87b6b19256 Patch CASE_LIGHT typo 2016-11-18 23:49:12 -06:00
Scott Lahteine 0be6167f14 Merge pull request #5250 from CONSULitAS/RCBugFix_K8200_backinsync_2016-11-18 
K8200: Example configuration back in sync
 2016-11-18 22:49:18 -06:00
Scott Lahteine eb714ee873 Move dummy thermistor opts, fix redundant sensor comment 2016-11-18 22:24:48 -06:00
Scott Lahteine 7a99c6ce4f Reformat temp sensor listing 2016-11-18 22:24:47 -06:00
Scott Lahteine 181cdb3cfe Move GCode list above include lines 2016-11-18 22:24:46 -06:00
Scott Lahteine 25d0c167bd More detailed static_assert messages 2016-11-18 22:24:46 -06:00
Scott Lahteine eb120e518c Followup to new endstop interrupts feature 
- Fix typos, verbiage
- Fix naming of `setup_endstop_interrupts`
- Some formatting, indentation, spacing
 2016-11-18 21:53:45 -06:00
Scott Lahteine 832fe284b4 Merge pull request #5184 from AnHardt/endstop_interrupts 
Introduce endstop interrupts
 2016-11-18 20:50:24 -06:00
CONSULitAS cbae44df64 K8200: Example configuration back in sync 
Configuration.h: back in sync, new features configured
Configuration_adv.h: back in sync, new features configured
README.md: text updated
 2016-11-18 22:55:02 +01:00
esenapaj 5db3738fe7 Re-follow the PR #4634 (Set language display charset in language.h) 2016-11-18 17:44:49 +09:00
Scott Lahteine 6eb6f12c64 Patch up some language formatting 2016-11-18 01:16:58 -06:00
Bo Herrmannsen 8cffa60cc5 Update to Danish language 10/11-2016 2016-11-18 01:16:57 -06:00
Scott Lahteine 98600e1433 Minor stepper cleanup 2016-11-18 01:15:57 -06:00
Florian Heilmann d08867986e Add autotemp capabilities to M104 
This allows M104 to pass the F and B parameters to enable autotemp as well
 2016-11-17 11:28:19 -06:00
Sebastianv650 c11b2bb777 Bugfix LIN_ADV 
Advance has nothing todo with Z_AXIS, strange copy&paste error?
 2016-11-17 11:28:19 -06:00
Scott Lahteine ee0765e872 Merge pull request #5233 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-11-17 03:38:19 -06:00
Scott Lahteine 2330619da0 Merge pull request #5191 from petrzjunior/const 
Replace const bool with #define for consistency
 2016-11-17 03:37:32 -06:00
esenapaj b278b7a395 Update Japanese translation 
Only adjust spacing
 2016-11-17 09:05:51 +09:00
Petr Zahradník junior d7ce5d271b
Replace const bool with #define for consistency 2016-11-16 18:55:21 +01:00
Scott Lahteine d63230d73e Merge pull request #5192 from Kaibob2/patch-7 
Printer Stats / Completed prints line doesn't fit in display (when german)
 2016-11-16 00:16:36 -06:00
Scott Lahteine 548b45026d Merge pull request #5214 from Sebastianv650/RCBugFix_planner_opt 
Save some cycle inside the planner
 2016-11-16 00:06:55 -06:00
Scott Lahteine 5d23e52d75 Merge pull request #5228 from thinkyhead/rc_keep_last_mix 
Fix DIRECT_MIXING_IN_G1 to preserve the previous mix
 2016-11-15 19:12:01 -06:00
Scott Lahteine db47aa983d Merge pull request #5226 from mtowara/RCBugFix 
bump -std in Makefile to c++11
 2016-11-15 16:13:32 -06:00
Scott Lahteine 99b0c1fe56 Fix DIRECT_MIXING_IN_G1 to preserve the previous mix 2016-11-15 16:12:26 -06:00
Markus Towara 23a675f621 reduce binary size of .hex 
still a few bytes bigger than with arduino but nothing major
 2016-11-15 21:57:15 +01:00
Markus Towara 5b6e2cecf5 bump c/c++ standard to gnu11 
needed for constexpr
 2016-11-15 21:54:12 +01:00
Scott Lahteine 410657b050 Fix G30 with limits, print correct probe XY 2016-11-15 14:10:28 -06:00
AnHardt f3eee02596 Introduce endstop interrupts 
If ENDSTOP_INTERRUPTS_FEATURE is enabled this tries to set up interrupt routines
for all used endstop pins. If this worked without errors, `endstops.update()` is called
only if one of the endstops changed its state.

The new interrupt routines do not really check the endstops and react upon them. All what they
do, is to set a flag if it makes sense to call the endstop test we are used to.

This can be used on:
* ARM (DUE) based boards - all pins can raise interrupts,
* RAMPS - all 6 endstop pins plus some other on EXT-2 can raise interrupts,
* RAMPS based boards - as long the designers did not change the pins for the endstops or at least left enough,
* all boards, if there are enough pins that can raise interrupts, and you are willing/able to swap with pins dedicated to other purpose.
 2016-11-15 12:07:41 +01:00
Sebastianv650 e3ffb58fbd Save some cycle inside the planner 
planner.h:
fan speed is used to set integer variables, so no need for long.
Basicaly a byte should be enough for all the fan things, as it's 0-255?

planner.cpp:
Save some float multiplications.
We could squeeze out even more by defining feedrate_percentage,
saved_feedrate_percentage and flow_percentage as float instead of int.
Everytime they are used in the time-critical planner, they are casted to
float and multiplied by 0.01. Not done jet, as they are used in LCD menu
functions I don't know well enough.
 2016-11-13 13:34:12 +01:00
Scott Lahteine 665b7f3893 Merge pull request #5212 from thinkyhead/rc_mixing_faster 
Store mix factors as reciprocals and multiply
 2016-11-12 18:47:11 -06:00
Scott Lahteine 60cc9342a4 Merge pull request #5188 from thinkyhead/rc_extended_host_support 
Extended host support: M155 Auto temp report, M115 capabilities
 2016-11-12 15:38:06 -06:00
Scott Lahteine f663220e87 Store Mix factors as reciprocals and multiply 2016-11-12 15:19:18 -06:00
Scott Lahteine ea3c08d249 Merge pull request #5186 from esenapaj/Follow-up-the-PR-#5167-etc 
Follow up the PR #5167 (Add Turkish Language) again, etc
 2016-11-12 13:11:54 -06:00
Scott Lahteine c488378532 Merge pull request #5205 from Sebastianv650/RCBugFix_stepperpatch 
Remove useless line from stepper ISR
 2016-11-12 12:43:07 -06:00
Michael Neumann 8bdf303da0 Update pins_MEGATRONICS_3.h 2016-11-12 12:26:07 +01:00
Michael Neumann 3890366c83 Update pins.h 2016-11-12 12:25:45 +01:00
Michael Neumann c0d45ca7f2 Update boards.h 2016-11-12 12:24:47 +01:00
Sebastianv650 cdc18f8c22 Remove useless line from stepper ISR 
The flag is already set inside planner.get_current_block(). Doing it
twice isn't making it better..
 2016-11-11 19:35:03 +01:00
Kai 8e8b4398f3 Printer Stats / Completed prints line doesn't fit in display (when german) 2016-11-09 22:03:25 +01:00
Scott Lahteine b31a07e261 Stateful M355 with separate P parameter 2016-11-09 03:28:18 -06:00
Scott Lahteine 3c9a838651 Extended capabilities report in M115 2016-11-09 02:32:58 -06:00
Scott Lahteine 68b866b5dd Add M155 - Auto-report temperature with interval 2016-11-09 02:32:58 -06:00
Scott Lahteine 68b46fb2c9 Allow send to i2c address 0 (broadcast) 2016-11-08 17:54:55 -06:00
Scott Lahteine 75bfde9945 M155=>M260, M156=>M261 2016-11-08 17:54:54 -06:00
esenapaj 2ae72b0491 Follow up the PR #5167 (Add Turkish Language) again, etc 
・Update forgotten K8400\Dual-head\Configuration.h
・Adjust spacing
 2016-11-09 06:31:21 +09:00
Scott Lahteine 06f2282f82 Merge pull request #5176 from thinkyhead/rc_filchange_feedback 
Give instant feedback for filament change
 2016-11-07 12:11:54 -06:00
Scott Lahteine dcfd7c69e8 Merge pull request #5163 from nzinov/RCBugFix 
Improve G30 probing command - add optional arguments
 2016-11-07 11:37:13 -06:00
Scott Lahteine e765eebfb0 Patch spacing in bilinear grid report 2016-11-07 04:08:25 -06:00
Scott Lahteine 7780052fb3 Give instant feedback for filament change 2016-11-07 03:48:16 -06:00
esenapaj 24e3f7abe7 Update Turkish translation 
・Add new translation
 2016-11-07 04:59:18 +09:00
esenapaj be48792e9c Follow up the PR #5167 (Add Turkish Language), etc 
・Remove all the #ifndef
・Follow the PR #4603 (Strip never-translated strings from language
files)
・Follow the PR #4634 (Set language display charset in language.h)
・Follow the PR #4936 (Put max_jerk vars in array, clean up jerk code)
・Adjust spacing
 2016-11-06 23:59:02 +09:00
Scott Lahteine 1864b282c5 Implement reversed CORE options 2016-11-05 23:47:51 -05:00
Scott Lahteine e3c8318504 Add reversed CORE options 2016-11-05 23:47:46 -05:00
Rigid3D 2327764980 Add Turkish Language 2016-11-05 21:06:16 -05:00
Nikolay Zinov dea00bbcf1 improve G30 probing 
Add optional parameters
X, Y for probe point
S sets stowing on and off
 2016-11-05 13:22:45 +03:00
Scott Lahteine 00662b8635 Minor babystep cleanup patches 2016-11-03 23:31:45 -05:00
Scott Lahteine cad792e702 Reduce code for invariant lcd_detected 2016-11-03 23:31:45 -05:00
Scott Lahteine b23d255491 Move macros above Stepper::babystep 2016-11-03 23:31:45 -05:00
Scott Lahteine cc57d46158 Fix set_position for CoreYZ 2016-11-03 23:31:45 -05:00
Scott Lahteine 0269347682 Merge pull request #5141 from thinkyhead/rc_old_slowdown_what 
OLD_SLOWDOWN does nothing, so remove it
 2016-11-03 23:30:43 -05:00
Scott Lahteine e92e2b2446 Merge pull request #5144 from Sebastianv650/RCBugFix_LIN_ADV_wipe 
Account for wipe moves
 2016-11-03 23:19:25 -05:00
Scott Lahteine 176aeafc19 Don't define bilinear_line_to_destination on kinematic setups 2016-11-03 14:10:07 -05:00
Sebastianv650 d448500643 Account for moves with negative E movements 
Added a rule so that LIN_ADVANCE isn't used for moves with negative E movements (de_float will be negative in this cases).
I also added a more detailed comment to make it more clear what the if statement does.
 2016-11-03 17:01:17 +01:00
Scott Lahteine 236853df22 Corrections to bilinear_line_to_destination 
- Allow more than 9x9 probe points
- Account for the probe starting position
 2016-11-03 04:43:59 -05:00
Scott Lahteine 0115e495fe Fix up Dual X switch blocks 2016-11-02 21:38:50 -05:00
Scott Lahteine 2495ab7af2 Make dual_x_carriage_mode an enumeration 2016-11-02 21:38:49 -05:00
Scott Lahteine d6c36f5bb9 Fix Z raise with DXC_AUTO_PARK_MODE 2016-11-02 21:36:50 -05:00
Scott Lahteine 0c79553fc5 Cast int to AxisEnum for some accessors 2016-11-02 17:42:24 -05:00
Scott Lahteine adbf1f7dca Add M355 to the GCodes list. 2016-11-02 16:43:52 -05:00
Scott Lahteine 63efc10599 Merge pull request #5134 from thinkyhead/rc_bilinear_split_lines 
Split cartesian moves on grid boundaries with bilinear ABL
 2016-11-02 16:14:55 -05:00
Scott Lahteine 12167bc8f3 OLD_SLOWDOWN does nothing, so remove it 2016-11-02 01:28:19 -05:00
esenapaj c8c1a28f6f Follow-up the PR #5089 (Centralize click-handling in the LCD loop) 
bool feedback is no longer used
 2016-11-02 08:36:02 +09:00
esenapaj c3a105186d Follow-up the PR #5133 (M355 Case light) 
・Add CASE_LIGHT_PIN into pinsDebug.h
 2016-11-02 00:31:50 +09:00
Scott Lahteine ee5b8d6dc8 Split moves on grid boundaries with bilinear ABL on cartesian 2016-11-01 08:25:47 -05:00
Scott Lahteine 66744a6076 Merge pull request #5133 from thinkyhead/rc_M355_case_light 
M355 Case light
 2016-11-01 07:51:27 -05:00
Scott Lahteine 955d14acb0 Patch photo pin code style 2016-11-01 06:30:14 -05:00
Stanley ab3f966f5f Case light G-code M355 
implemented G-Code M355 into Marlin
 2016-11-01 06:30:14 -05:00
Scott Lahteine 8b44413498 Merge pull request #5124 from Sebastianv650/RCBugFix_LIN_ADV-Patch 
BugFix for incorrect E-speed calculation
 2016-11-01 05:13:17 -05:00
Scott Lahteine f418e82b15 Remove redundant definition of EN_C 2016-11-01 05:10:07 -05:00
Sebastianv650 f9bea7968f BugFix for incorrect E-speed calculation 
The extrusion speed was wrong due to a not high enough precision of
esteps to XY steps, therefore now the target float values are used to
calculate the ratio between XY movement and extrusion speed.
The e_speed_multiplier8 was replaced by an absolute multiplier called
abs_adv_steps_multiplier8, therefore one multiplication and bitshift can
be saved inside the stepper ISR. Due to this, also extruder_advance_k is
better suited inside the planner and not the stepper files any more.
 2016-11-01 08:08:47 +01:00
Bob-the-Kuhn c20b4098be 2 bug fixes & some minor changes 
see detailed  description in PR #5118
 2016-11-01 01:29:41 -05:00
Scott Lahteine fa6bf12697 Merge pull request #5118 from thinkyhead/rc_expanded_M43 
Enhancements to M43 pins debugging
 2016-10-31 08:29:53 -05:00
Scott Lahteine 3a107e280d Developer note in pins_MIGHTYBOARD_REVE.h 2016-10-31 08:22:39 -05:00
Scott Lahteine 85e307dcd8 No FAN0_PIN 2016-10-31 08:08:03 -05:00
Scott Lahteine ff3a8ca0d1 Use NUM_DIGITAL_PINS instead of custom DIO_COUNT 2016-10-31 08:08:03 -05:00
Scott Lahteine 04a1fac029 Some cleanup to M43 2016-10-31 08:08:03 -05:00
Scott Lahteine 24f6612551 Reduce and optimize endstop_monitor code 2016-10-31 08:08:03 -05:00
Scott Lahteine b4444e91ae Reduce code and build size of PWM_details 2016-10-31 08:08:02 -05:00
Scott Lahteine dbe414ef03 Squash redundant code in PWM_status 2016-10-31 08:08:02 -05:00
Scott Lahteine af26d22741 Clean up some spacing and semantics 2016-10-31 08:08:02 -05:00
Bob-the-Kuhn 81397d7a9a EXTRUDER_x_AUTO_FAN name change to Ex_AUTO_FAN 
I stumbled across a name change that'll be used a lot so I'm updateing
the name list.
 2016-10-31 08:08:02 -05:00
Bob-the-Kuhn c7f1f0dae6 Add endstop monitor & make pins report pretty 2016-10-31 08:08:02 -05:00
Scott Lahteine d567b426d5 Merge pull request #4894 from thinkyhead/rc_mightyboard_rev_e 
Mightyboard Revision E preliminary support
 2016-10-31 08:01:41 -05:00
Scott Lahteine 43df9ace4e Merge pull request #5110 from thinkyhead/rc_z2_min_allowed 
Support Z2 min in M119 report
 2016-10-31 07:59:45 -05:00
Scott Lahteine 23f05f8be7 Use bit-length types in block_t 2016-10-30 16:16:29 -05:00
Scott Lahteine 8dc7807d85 Add support for CoreYZ to planner.buffer_line 2016-10-30 16:16:28 -05:00
Scott Lahteine 1cf878fdb1 Calculate dm and e-steps earlier in planner 2016-10-30 16:16:28 -05:00
Scott Lahteine 75dbb71dd7 Replace block.busy with a block.flag bit 2016-10-30 16:16:28 -05:00
Scott Lahteine c7f22f688f buffer_line can calculate while it's waiting 2016-10-29 17:08:42 -05:00
Scott Lahteine f3720f4e81 const arguments to test_dual_z_endstops 2016-10-29 16:01:27 -05:00
Scott Lahteine 8cebd2a7db Arrange Z2 min before Z2 max 2016-10-29 01:54:19 -05:00
Scott Lahteine accabf088a Add support for Z2 min endstop to M119 2016-10-29 01:54:02 -05:00
Scott Lahteine 396434a445 Fix compiler warning in M145 2016-10-28 20:57:36 -05:00
Scott Lahteine 8e787304c9 const float ref args in planner.h 2016-10-28 20:57:36 -05:00
Scott Lahteine 07bfc45df8 Adjust spacing in gcode_M149 2016-10-28 20:57:36 -05:00
Scott Lahteine 1a2310c494 Make LCD preheat vars an array to reduce code size 2016-10-28 20:57:36 -05:00
Scott Lahteine 1226ae1912 Some cleanup in ultralcd.h 2016-10-28 20:57:21 -05:00
Scott Lahteine 50ee749082 Centralize click-handling in the LCD loop 2016-10-28 20:57:21 -05:00
Scott Lahteine 47ad97c35e Merge pull request #5109 from thinkyhead/rc_eeprom_M218_tool_offset 
Save hotend_offset array (M218) in EEPROM
 2016-10-28 20:08:29 -05:00
Scott Lahteine bff6bbdb12 Indentation in configuration_store.cpp 2016-10-28 18:55:42 -05:00
Scott Lahteine 97115d56f9 Print error for M500 with disabled EEPROM 2016-10-28 18:53:48 -05:00
Scott Lahteine 67ab54185b Save hotend_offset array (M218) in EEPROM 2016-10-28 18:45:23 -05:00
MagoKimbra dfcdbb437b Fix Command M420 2016-10-28 20:53:48 +02:00
Scott Lahteine c34dbfb248 Merge pull request #5072 from thinkyhead/rc_preset_auto_fans 
Add predefined AUTO_FAN_PINs to pins files
 2016-10-27 17:12:11 -05:00
Scott Lahteine 9a23f73765 Don't trigger endstops that are actually Z2 or probe 2016-10-27 08:12:17 -05:00
Scott Lahteine c07cc9e3f1 Revert changes made to z dual endstop test 
#3631 broke z dual endstops. Solved by @Nocturnal42 in https://github.com/MarlinFirmware/Marlin/issues/5078#issuecomment-256572248
 2016-10-27 07:41:39 -05:00
Scott Lahteine c4c53856a4 Merge pull request #5094 from esenapaj/Fix-for-the-PR-#5088 
Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL)
 2016-10-26 21:51:18 -05:00
Scott Lahteine 2e3110539b Merge pull request #5095 from thinkyhead/rc_fix_bilinear_math 
Fix bilinear grid constraints
 2016-10-26 21:48:19 -05:00
esenapaj d5a5042d23 Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL) 2016-10-27 10:32:20 +09:00
Scott Lahteine 9cbedab91b Use DPM where possible 2016-10-26 18:38:32 -05:00
Scott Lahteine ad38d91692 Sanity check that auto fan pins can do PWM 2016-10-26 18:38:32 -05:00
Scott Lahteine 95275eb9b3 Predefine auto fan pins in some pins files 2016-10-26 18:38:32 -05:00
Scott Lahteine 3f94b15cef Fix bilinear grid constraints 
Followup to #5090
 2016-10-26 18:11:26 -05:00
Scott Lahteine d439fb95f7 Sanity check for the renamed options 2016-10-26 17:51:26 -05:00
Scott Lahteine b6aa894893 Rename auto fan pins and add auto fan flags 2016-10-26 17:51:26 -05:00
Scott Lahteine ada935de87 Allow TEMP_STAT_LEDS with only one LED defined 2016-10-26 17:51:26 -05:00
Scott Lahteine 4b056d8184 Fix warning in ultralcd.cpp 2016-10-26 17:51:26 -05:00
Scott Lahteine 9dfd029911 Fix bug in fastio.h _GET_TIMER 2016-10-26 17:51:25 -05:00
esenapaj 8b1d90e281 Follow-up the PR #5087 (Fixed SERVO pins on Azteeg X3), etc 
・Add header
・Adjust spacing
 2016-10-27 06:46:03 +09:00
Scott Lahteine bfd3b3c604 Merge pull request #5087 from Fulg/azteeg-x3-pins 
Fixed SERVO pins on Azteeg X3
 2016-10-26 06:01:16 -05:00
Scott Lahteine 208d720614 Merge pull request #5082 from Fulg/RCBugFix 
Only issue MAXTEMP when heating
 2016-10-26 05:55:33 -05:00
Scott Lahteine f0d673561f Fix for bilinear grid outside bounds 2016-10-26 05:00:03 -05:00
Scott Lahteine 24bcea6c02 Merge pull request #5088 from thinkyhead/rc_break_m1_fix 
Handle M108 in M1 also with ULTIPANEL
 2016-10-26 00:44:01 -05:00
Scott Lahteine 1ba1ec0db9 Handle M108 in M1 also with ULTIPANEL 2016-10-25 23:25:47 -05:00
Scott Lahteine 7ad33422e3 Clear dir_t size, not pointer size 2016-10-25 22:59:40 -05:00
Benoit Miller 1c716034ec Fixed SERVO pins on Azteeg X3 2016-10-25 17:11:26 -04:00
Benoit Miller 2aa12d78dc Only issue MAXTEMP when heating 2016-10-24 17:09:29 -04:00
Scott Lahteine 3fcf915808 Fix uninitialized var in reset_acceleration_rates 2016-10-24 11:55:41 -05:00
Scott Lahteine 14f824c3de Merge pull request #5071 from esenapaj/Extend-measuring-range-of-thermocouple 
Extend measuring range of thermocouple for MAX31855
 2016-10-24 02:00:12 -05:00
Scott Lahteine 1097a50694 Merge pull request #5070 from gcormier/rcbugfix 
Fix #4995 - M48/G29 on CoreXY maybe others?
 2016-10-24 00:56:36 -05:00
Sebastianv650 c397b9d60a Planner acceleration bugfix and speedup v2 
.) Use already existing inverse_millimeters instead of /
block->millimeters.
.) Prevent overflow during acceleration calculation by checking if float
is necessary. Idea modified from Sailfish.
.) Save two uint32_t or even float multiplications by checking if
step[AXIS] has steps and if max acceleration is lower than accel. If
not, there is no need to check this axis.
 2016-10-23 12:47:46 +02:00
esenapaj 70e287ca8c Extend measuring range of thermocouple for MAX31855 2016-10-23 10:22:39 +09:00
Greg Cormier f0aed9dac7 Fix #4995 - M48/G29 on CoreXY maybe others? 2016-10-22 20:45:13 -04:00
esenapaj e50992694f Fix for the PR #5066 (Updated french translation) 
MSG_INFO_PRINT_TIME is still being used
 2016-10-23 06:09:56 +09:00
Scott Lahteine 483082387c Merge pull request #5022 from esenapaj/Fix-for-the-PR-#4553 
Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD))
 2016-10-22 13:54:09 -05:00
Scott Lahteine 8b967a9ff0 Merge pull request #5058 from thinkyhead/rc_reverse_arrow_buttons 
Apply encoder reverse options to keypad arrows
 2016-10-22 13:52:35 -05:00
esenapaj 523c7eaa6c Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD)) 2016-10-23 03:29:00 +09:00
Scott Lahteine ca48a49fdb Merge pull request #5065 from petrzjunior/transl 
[LANGUAGE] Update Czech (BLTOUCH and DAC strings)
 2016-10-22 12:46:10 -05:00
Scott Lahteine f0744fc815 Merge pull request #5066 from thinkyhead/rc_french_update 
Updated french translation
 2016-10-22 12:45:51 -05:00
Gege2B 88b7f6eb46 Updated french translation 2016-10-22 12:30:22 -05:00
Scott Lahteine 3544c3632f Merge pull request #5062 from thinkyhead/rc_warnings_fix 
Warnings fixed redux
 2016-10-22 12:21:36 -05:00
Petr Zahradník junior 8323d78ed7 Translated BLTOUCH and DAC strings 2016-10-22 19:12:21 +02:00
Scott Lahteine e151f952a3 Apply encoder reverse options to keypad arrows 2016-10-22 11:51:33 -05:00
Scott Lahteine cfb47929ca Merge pull request #5060 from thinkyhead/rc_fix_ugly_code 
Reduce, clean up MINTEMP / MAXTEMP test code
 2016-10-22 11:27:30 -05:00
Josef Pavlik dca50737f5 fixed warning: ISO C++ forbids compound-literals 2016-10-22 11:23:16 -05:00
Josef Pavlik 0bd66807b2 fixed warning: extra ; 2016-10-22 11:12:29 -05:00
Josef Pavlik d35dc407a8 fixed warning: ISO C99 requires rest arguments to be used 2016-10-22 11:12:29 -05:00
Josef Pavlik c2b51af3ba fixed warning: ISO C does not permit named variadic macros 2016-10-22 11:12:29 -05:00
Scott Lahteine 0d3fc7dd89 Merge pull request #5059 from gcormier/fixbaby 
Set defer delay back to false when exiting babystepping.
 2016-10-22 10:59:17 -05:00
Scott Lahteine f888597197 Reduce, clean up code for mintemp/maxtemp tests 2016-10-22 10:31:03 -05:00
Scott Lahteine ad64723354 Move MAX_EXTRUDERS to pins.h 2016-10-22 10:07:51 -05:00
Scott Lahteine 5f5a55a0de Add a ZERO macro to clear arrays 2016-10-22 10:07:18 -05:00
Greg Cormier 0009725637 Set defer delay back to false when exiting babystepping. 2016-10-22 09:43:30 -04:00
Scott Lahteine 627f9d5285 Merge pull request #5056 from thinkyhead/rc_lin_adv_opt 
LIN_ADVANCE optimizations
 2016-10-22 07:06:39 -05:00
Scott Lahteine 0908329d96 Merge pull request #5057 from thinkyhead/rc_mbl_lcd_logical 
Fix manual leveling coordinates
 2016-10-22 06:31:02 -05:00
Scott Lahteine 14e60f0d3b Correct typo in configs 
As pointed out by #5044
 2016-10-22 05:56:32 -05:00
Scott Lahteine 1165e83263 MBL coordinates are logical 2016-10-22 05:55:44 -05:00
Scott Lahteine dbfabb4c0a Merge pull request #5043 from Kaibob2/patch-5 
Correct grammar and translation in language_de.h
 2016-10-22 05:52:54 -05:00
Scott Lahteine b19bba275f No LCD timeout during babystepping 
As requested in #5031
 2016-10-22 05:26:07 -05:00
Scott Lahteine b9109b2875 Improve LIN_ADVANCE commentary (all configs) 2016-10-22 05:03:09 -05:00
Sebastianv650 9818d97587 Fix Z-hops during retract/prime lead to blobs 
We don't want to have retract/prime movements done with LIN_ADVANCE, that's also true with simultaneously executed Z-hops.
 2016-10-22 04:54:59 -05:00
Sebastianv650 599649e45d Add formula for LIN_ADVANCE_K 
With this formula, a start value for K for further fine-calibration can be calculated.
 2016-10-22 04:54:59 -05:00
Scott Lahteine be7d245eff Merge pull request #5008 from thinkyhead/test_endstop_hits 
Save some PROGMEM in MBL G28
 2016-10-22 03:35:52 -05:00
Scott Lahteine 7c0e52256d Merge pull request #5053 from thinkyhead/rc_fix_baud_config 
Patch BAUDRATE line in configs
 2016-10-22 03:27:45 -05:00
Scott Lahteine 2783dcb4cc Save some RAM in MBL's G29 2016-10-22 02:52:56 -05:00
Scott Lahteine 4f5a8c05d5 Tweaks to endstops macros 2016-10-22 02:52:56 -05:00
Scott Lahteine 083d41a2c2 Remove redundant estep rate code from LIN_ADVANCE 
As noted by https://github.com/MarlinFirmware/Marlin/pull/4971#issuecomment-252503295
 2016-10-22 02:19:14 -05:00
Scott Lahteine 4f6bfabaad Patch BAUDRATE line in configs 2016-10-22 00:48:52 -05:00
Kai 2bfedb74d5 Correct grammar and translation in language_de.h 
Made Filament change Text sound like correct german.
 2016-10-19 14:56:46 +02:00
esenapaj 1e1edeadd3 Fix for the commit dc2cb84 (Revert acceleration limiting to avoid overflow) 
・Add forgotten '\'
 2016-10-18 18:07:20 +09:00
Scott Lahteine dc2cb8454c Revert acceleration limiting to avoid overflow 2016-10-17 17:08:41 -05:00
Scott Lahteine 6ae5cf17a9 Merge pull request #5033 from esenapaj/Fix-freezing-with-MAX31855 
Fix freezing and MINTEMP Error with MAX31855 thermocouple
 2016-10-17 16:22:20 -05:00
Scott Lahteine f257c4bcae Merge pull request #5036 from thinkyhead/rc_dac_code_deps 
Fix DAC current code
 2016-10-17 16:19:00 -05:00
Scott Lahteine b80cc0cbb5 Fix DAC current code 2016-10-17 15:17:57 -05:00
esenapaj 385bd8a4a3 Fix freezing and MINTEMP Error with MAX31855 thermocouple 2016-10-16 07:33:14 +09:00
Scott Lahteine ca7275a67a Disable EXTRAPOLATE_FROM_EDGE by default 2016-10-14 14:44:28 -05:00
Scott Lahteine 0921c7da84 Merge pull request #4997 from thinkyhead/rc_jerk_from_mk2 
Adapt Jerk / Speed code from Prusa MK2
 2016-10-12 06:38:50 -05:00
Scott Lahteine 4d89652bc2 Apply minor optimizations to planner.cpp 2016-10-12 04:42:15 -05:00
Scott Lahteine 1092319b19 Adapt speed/jerk code based on Prusa MK2 branch 2016-10-12 04:42:14 -05:00
Scott Lahteine 37643fef63 Merge pull request #4972 from bgort/platformio-improvements 
Move platformio directories out of source tree
 2016-10-12 03:42:33 -05:00
Scott Lahteine 8e1cc9332a Replace block flag bools with flag bits 
…and apply const to some method parameters
 2016-10-10 23:17:49 -05:00
Scott Lahteine d41f2bdbd8 Merge pull request #4991 from thinkyhead/rc_max31855_fix 
Patches for Stepper DAC and MAX31855
 2016-10-10 20:12:06 -05:00
Scott Lahteine e7cf566fc5 Do kinematic segments with buffer_line_kinematic 
This breaks the raw option, but in the future perhaps all planner moves
will be sent in raw form instead of logical.
 2016-10-10 17:14:03 -05:00
Scott Lahteine a10e81dc2a Minor cleanup of set_bed_leveling_enabled 2016-10-10 17:14:03 -05:00
Scott Lahteine 029824bc49 Patch ADJUST_DELTA macro for SCARA 2016-10-10 17:14:03 -05:00
Scott Lahteine 5ce5a9c822 Marlin: planner.h tweak 2016-10-10 17:14:03 -05:00
Scott Lahteine d963020532 Sort out some header dependencies 2016-10-10 17:14:03 -05:00
Scott Lahteine e17f9b8b99 DAC patches 
As suggested by #4985
 2016-10-10 14:08:04 -05:00
Scott Lahteine 2cb5df8a56 Merge pull request #4984 from esenapaj/Small-fix-for-PR-#4980 
Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization)
 2016-10-10 13:30:47 -05:00
Scott Lahteine b6221df3f3 Merge pull request #4983 from MarlinFirmware/revert-4933-rc_drop_pid_func_range 
Revert "Removal of PID functional range"
 2016-10-10 13:29:54 -05:00
Scott Lahteine a07033a6c1 Merge pull request #4974 from esenapaj/Follow-up-the-PR-#4955 
Fix and follow-up the PR #4955 (PINS_DEBUGGING and M43: Read pin states), etc
 2016-10-10 13:27:52 -05:00
Scott Lahteine f8199b2cc1 Merge pull request #4982 from thinkyhead/rc_abl_bugfix 
Fix planner with kinematics, delta ABL
 2016-10-10 13:24:22 -05:00
esenapaj f41c60d4a4 Follow-up the PR #4955, etc 
・More ANALOG NUMBERING to Analog Input
・Add comment header to all the section of all the pins files

・Sort sections as follows:
1. Some special definitions (USBCON, LARGE_FLASH, etc)
2. Servos
3. Limit Switches
4. Z Probe
5. Steppers
6. Temperature Sensors
7. Heaters / Fans
8. Misc. Functions
9. LCD / Controller

・Move MAX6675_SS into "Temperature Sensors" section
・Adjust spacing
 2016-10-10 14:22:43 +09:00
esenapaj 00456b0cb3 Fix compilation errors 2016-10-10 14:22:43 +09:00
esenapaj cfb5c24bc9 Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization) 
・Fix a comment about timer
 2016-10-10 07:48:42 +09:00
Scott Lahteine 149b8d9e4b Handle MAX31855 error conditions 2016-10-09 17:12:50 -05:00
Scott Lahteine f4ec265363 Fix a typo 2016-10-09 16:45:29 -05:00
Scott Lahteine 4ec2d459e6 Fix mcp4728_setVref_all as followup to #4967 2016-10-09 16:45:00 -05:00
Scott Lahteine 1e551c0688 Revert "Squashed - Removal of PID functional range" 2016-10-09 16:27:45 -05:00
Scott Lahteine 4037df82b0 Merge pull request #4981 from esenapaj/Update-Japanese-language 
Update Japanese translation, etc
 2016-10-09 16:11:53 -05:00
Scott Lahteine e4e290d957 Make EXTRUDER_RUNOUT_PREVENT kinematic compatible 2016-10-09 15:58:33 -05:00
Scott Lahteine 847429eff4 Make tool_change kinematic compatible 2016-10-09 15:58:32 -05:00
Scott Lahteine a4a7ca10ca Make USE_DELTA_IK_INTERPOLATION compatible with ABL 2016-10-09 15:58:32 -05:00
Scott Lahteine c5cac486f5 Use a, b, c instead of lx, ly, lz 2016-10-09 14:34:24 -05:00
Josef Pavlik f8c2473a71 Improve planner kinematics, fix delta ABL 2016-10-09 13:32:46 -05:00
Scott Lahteine 48761f2021 Patch delta endstop adjustment config 2016-10-09 13:32:45 -05:00
Josef Pavlik 28d41b48e3 delta endstop adjustment configurable 2016-10-09 13:09:34 -05:00
Scott Lahteine ff6b23cb0f Fix an issue with shifted LCD lines 2016-10-09 13:00:00 -05:00
Scott Lahteine e4d2662d81 Use some macros in M48 2016-10-09 12:21:05 -05:00
Scott Lahteine 3752d9aca8 Fix timer comments 2016-10-09 12:11:00 -05:00
Sebastianv650 a448cedbc5 LIN_ADVANCE bug fix and optimization 
.) long to int: Extruder stalls at 10kHz / 20kHz step limits with long.
.) Take the delta_adv_steps calculation out of the step_loops loop. Wasted calculation performance if done inside.
.) >> 2 replaced by 3: Is divide by 8. Reason: Timer 0 runs at 16/8=2MHz, Timer 1 at 16/64=0.25MHz. ==> 2/0.25=8.
 2016-10-09 11:55:02 -05:00
esenapaj b27080c1dd Update Japanese translation 
・Add new translation
 2016-10-10 01:52:51 +09:00
esenapaj 0780146034 Move DAC section from inside of the changing filament section 2016-10-10 01:17:46 +09:00
Brian 9c0404eae4 Move platformio directories out of source tree 2016-10-08 13:45:26 -04:00
Scott Lahteine a1b50f1102 Cleanup of code style 2016-10-07 15:57:24 -05:00
jaysonkelly 13c9dcc600 Add LCD menu for DAC 2016-10-07 15:13:03 -05:00
Scott Lahteine 00261cbfcb Merge pull request #4933 from thinkyhead/rc_drop_pid_func_range 
Squashed - Removal of PID functional range
 2016-10-07 15:07:55 -05:00
Scott Lahteine ee01def16d Merge pull request #4955 from thinkyhead/rc_debug_pins 
PINS_DEBUGGING and M43: Read pin states
 2016-10-07 14:47:34 -05:00
Scott Lahteine a0df34fd4c Add PINS_DEBUGGING advanced config option 2016-10-07 14:20:13 -05:00
Scott Lahteine e21bab5243 PINS_DEBUGGING and M43 Read Pins 2016-10-07 14:11:48 -05:00
Scott Lahteine 3c97fa6e29 Merge pull request #4963 from esenapaj/Fix-for-advance-algorithm 
Move routine of direction signal of ADVANCE and LIN_ADVANCE from Stepper::isr() to Stepper::advance_isr()
 2016-10-07 00:33:42 -05:00
Scott Lahteine 48e63c4730 Comment some globals 2016-10-06 22:06:33 -05:00
Scott Lahteine 9a6c66602f Fix formatting of extrapolate debug output 2016-10-06 17:04:22 -05:00
Scott Lahteine cd77eb5c40 Clear grid for bilinear G29 2016-10-06 17:00:53 -05:00
Scott Lahteine 53a0856f5c Print Y as int in print_bed_level 2016-10-06 16:46:54 -05:00
esenapaj f8df88f271 Move routine of direction signal of ADVANCE and LIN_ADVANCE from Stepper::isr() to Stepper::advance_isr() 2016-10-07 02:01:29 +09:00
Brian 357854a7ef tweak variables; 2016-10-05 19:49:05 -04:00
Brian 48cf19151a Improve M48 output; Add min, max, range, etc. 2016-10-05 16:09:39 -04:00
Scott Lahteine c63cb45268 Fix thermal runaway timeout 2016-10-05 08:42:39 -05:00
Scott Lahteine e6164d254d Clean up GCode command short comments 2016-10-05 06:13:30 -05:00
Scott Lahteine 47bd142b29 Should marlinAnalogInputToDigitalPin use analogInputToDigitalPin? 2016-10-05 06:13:30 -05:00
Scott Lahteine bd8520e61d Label analog pins in a similar way 
Some other pins formatting also
 2016-10-05 06:13:30 -05:00
Scott Lahteine 0c0deb5194 Common pin_is_protected function 2016-10-05 04:41:27 -05:00
Scott Lahteine 49d77720d5 More support for 4th extruder or heater 2016-10-05 04:40:22 -05:00
Scott Lahteine 46839c222a Comment and clean up some vars 2016-10-04 23:40:45 -05:00
Scott Lahteine 8910bb7c97 Fix buzzer conditional compile 2016-10-04 21:38:41 -05:00
Scott Lahteine de7e798e6f Replace single-char S_ECHOs with S_CHAR 2016-10-04 21:38:41 -05:00
Scott Lahteine 0e83f34174 Tweak debugging of probe_pt 2016-10-04 21:38:00 -05:00
Scott Lahteine cc02f6edf8 Merge pull request #4943 from esenapaj/Small-update-of-language_kana_h 
Small update of language_kana.h
 2016-10-04 03:21:57 -05:00
Scott Lahteine ca26011e3c Merge pull request #4941 from MagoKimbra/rc_fix_M205 
Add note for M205
 2016-10-04 03:21:20 -05:00
Scott Lahteine 9485aa8f13 Include negative Z probe offset in clearance move 2016-10-03 16:18:04 -05:00
Scott Lahteine 5c1eb595e6 Fix for G2/G3 negative radius 
As suggested in #4940
 2016-10-03 14:48:44 -05:00
esenapaj f09ae96f28 Small update of language_kana.h 2016-10-03 23:41:39 +09:00
MagoKimbra 7b37539fe7 Add note for M205 2016-10-03 08:54:15 +02:00
Scott Lahteine d5f598cd82 Tweak probe debug, add newline 2016-10-02 17:35:40 -05:00
Scott Lahteine c592ccb6f5 Patch max_jerk[Z] menu item 2016-10-02 10:12:47 -05:00
Scott Lahteine d80a79eb77 Use right-shift instead of / 2, why not? 2016-10-02 07:01:40 -05:00
Rerouter 02fe9cf558 Removal of functional range constraint 
Also lined up the >> 1 and / 2 mentioned earlier in the unconstrained I term issue,
 2016-10-02 07:01:40 -05:00
Rerouter 5f5d87cad3 Update Configuration.h 2016-10-02 07:01:40 -05:00
Scott Lahteine 761593b74b Cleanup some vars, use of min/max 2016-10-02 06:34:56 -05:00
Scott Lahteine d19cfcfc1d max_jerk array, DEFAULT_XYJERK => DEFAULT_[XY]JERK 2016-10-02 06:34:56 -05:00
Scott Lahteine e7dc174f30 More detailed debugging of G28 delta 2016-10-02 02:18:57 -05:00
Scott Lahteine 473f4a17a8 Merge pull request #4914 from Rerouter/PID-Unconstrained-Itemp 
Pid unconstrained itemp
 2016-10-01 06:58:07 -05:00
Scott Lahteine bad8899ebc Merge pull request #4900 from thinkyhead/rc_g38_changes 
Cleanup of G38.2 / G38.3
 2016-10-01 06:57:17 -05:00
Scott Lahteine 73ce3a61c7 Cleanup, comment zigzag 2016-10-01 05:21:52 -05:00
Scott Lahteine 0d538f3db6 Add to all configurations 2016-10-01 05:00:53 -05:00
Scott Lahteine 919fe3e4b8 Rename feature to G38_PROBE_TARGET 2016-10-01 05:00:53 -05:00
Scott Lahteine a2864ab7fe Patched up, cleaned up 2016-10-01 05:00:53 -05:00
Bob-the-Kuhn 2911aa7ffa code changes to implement G38 commands 
1) modified 3 code files
Marlin.h
Marlin_main.cpp
endstops.cpp

2) modified config files so I could test on my machine

Testing was done on an AzteegX3pro based machine.

The probe was hooked to the Z_MIN endstop.

My controller doesn't have a dedicated Z_PROBE input so I couldn't test
that functionality.

Verified that a large file (without any G38 commands) executed the same
before and after the changes.

Verified that the head moves as expected when G38.2 and G38.3 commands
are issued. Single & multiple axis moves were tested along with + and -
directions.

Code was added to the main ISR. In normal operation only one extra IF
statement is evaluated. I didn't notice any performance degradation
because of the added code.

The G38 commands are expected to be issued manually by the operator
during machine setup. The G38 commands wait until the machine is idle
before proceeding. That way the other commands are minimally impacted
by the extra ISR overhead when a G38 command is in the queue.

The G38 commands are very similar to the G28 commands except 1) only the
Z_PROBE is used and movement can be in the + or - direction.

See issue 4677 for a discussion on adding G38 commands to Marlin.
Feature request: add ability to use G38.2 command (CNC)
MarlinFirmware/Marlin#4677
 2016-10-01 05:00:53 -05:00
Scott Lahteine 74d048e77e Merge pull request #4927 from thinkyhead/rc_bltouch_noraise 
Don't check Z_MAX on raise when the probe pwns the pin
 2016-10-01 04:52:56 -05:00
Scott Lahteine 4afa293289 Say "BLTOUCH" in machine info report 2016-09-30 17:13:27 -05:00
Scott Lahteine ed7d2694fc Don't check Z_MAX on raise when the probe pwns the pin 2016-09-30 16:41:30 -05:00
Scott Lahteine 3bbdd48a4d Merge pull request #4918 from thinkyhead/rc_abl_patchups 
Fix up ABL - Add PROBE_Y_FIRST option. Arduino 1.6.8 required.
 2016-09-29 15:29:01 -05:00
Scott Lahteine fffc9fefa8 Apply changes to all configs 2016-09-29 02:17:33 -05:00
Scott Lahteine 587cb6c283 K8400 has 1xXY an 2xZ endstop plugs 2016-09-29 02:07:22 -05:00
Scott Lahteine d234bc160e Require Arduino 1.6.8 to compile 2016-09-29 02:00:27 -05:00
Scott Lahteine 2d2c9bdf92 Add PROBE_Y_FIRST option for probe order 2016-09-29 02:00:27 -05:00
Scott Lahteine c8c57e59fc Patch the end of G29 to sync plan position 2016-09-29 02:00:27 -05:00
Scott Lahteine 81b8c9f8ec Add XY parameters to G29 for mesh dimensions 2016-09-29 02:00:27 -05:00
Scott Lahteine 56cf674150 M420 can now enable/disable ABL 2016-09-29 02:00:26 -05:00
Scott Lahteine 06790977c4 Use updated position methods 2016-09-29 01:31:05 -05:00
Scott Lahteine e8f2604a6f Patch print_bed_level numbering 2016-09-29 01:31:05 -05:00
Scott Lahteine d066610514 Patch up bilinear_z_offset 2016-09-29 01:31:05 -05:00
Scott Lahteine 850e38d013 G30 will only disable bed leveling 2016-09-29 01:31:04 -05:00
Scott Lahteine 510ef5d14a Standard function to turn bed leveling on/off 2016-09-29 01:27:37 -05:00
Scott Lahteine ecf7cdde65 Augment planner/stepper getters/setters 2016-09-29 01:27:37 -05:00
Scott Lahteine 2febd8ec82 Double-touch debugging 2016-09-29 01:27:37 -05:00
Scott Lahteine b331077c32 Use stepper.get_axis_position_degrees 2016-09-29 01:27:37 -05:00
Scott Lahteine 0d9efb24f3 Fix up bilinear_z_offset 2016-09-29 01:26:22 -05:00
jaysonkelly 3b3d282f8e Adjusted values for Rigidboard Configuration 
Rigidboard differs a little in configuration from the PrinterBoardRevF we modeled the code after.
 2016-09-28 14:14:04 -05:00
Scott Lahteine 850259bb25 Watch bed temp also for Control menu item 2016-09-28 14:14:04 -05:00
esenapaj 92c03a44a9 Fix the PR #4899 (ABL: Enable by type. Bilinear for all.) etc. 
About Configuration.h:
・Fix the PR #4899 (ABL: Enable by type. Bilinear for all.)
Remove Duplicated contents

・Fix the PR #4305 (Custom boot screen feature improvement)
Revert from "during boot" to "during bootup" in all the example
Configuration.h

・Fix the PR #4207 (Clean up, simplify and generalize the Allen-key-probe
code.)
Resolve and relocate the duplicated definitions in Z_PROBE_ALLEN_KEY
section

・Follow-up the PR #4805 (Additional documentation of Configuration.h)
Add forgotten changes to all the example Configuration.h

Adjust spacing

About Configuration_adv.h:
Add missing description of SLOWDOWN for DELTA

Adjust spacing
 2016-09-28 14:14:04 -05:00
Rerouter 50e5ee4de4 Update Configuration.h 2016-09-28 17:38:09 +10:00
Rerouter 1a2f1d4974 Update temperature.cpp 2016-09-28 17:36:53 +10:00
Rerouter a765c98850 Removal of the constraints of the Iterm 2016-09-28 17:26:49 +10:00
Scott Lahteine 8b46eb3766 Fix bilinear interpolation 2016-09-27 03:18:49 -05:00
Scott Lahteine 5100bdac81 Improve Bilinear Grid 
- Extrapolate properly for even numbered grid points
- Extrapolate using average, not median
- Improve bilinear grid report output
- Add debug output for bilinear extrapolation
- Add option to extrapolate from edge, not center
 2016-09-27 00:03:19 -05:00
Scott Lahteine a3e91ec65e Add 'Q' option to G29 when debug leveling is on 2016-09-27 00:03:19 -05:00
Scott Lahteine 1fceda4fb0 Add leveling type and details to machine_info 2016-09-27 00:03:19 -05:00
Scott Lahteine e0e0166075 Fix auto bed leveling - turn on after successful G29 2016-09-27 00:03:19 -05:00
Scott Lahteine 18e40de39c Adjust final Z after bilinear G29 2016-09-26 00:22:22 -05:00
Scott Lahteine ea0dbee3c9 Enable ABL by type, support bilinear on cartesian 2016-09-25 23:35:37 -05:00
Scott Lahteine 9cebbabd05 Merge pull request #4893 from thinkyhead/rc_stat_led_check 
Define status LED pins without condition
 2016-09-25 18:50:47 -05:00
Scott Lahteine 5fff8d148b Clean up digital pots and microsteps 2016-09-25 11:16:22 -05:00
Scott Lahteine 570676d265 Include requirements in "Implemented Codes" 2016-09-25 07:50:33 -05:00
Scott Lahteine cb48292338 Use fastio for literal pins 2016-09-25 06:33:38 -05:00
Scott Lahteine 07703d2bd6 Use _PIN suffix on some pins 2016-09-25 06:33:38 -05:00
Scott Lahteine 203e519bf4 Sanity check for status LED pins 2016-09-25 06:33:38 -05:00
Scott Lahteine ba43277429 Always define status LED pins 2016-09-25 06:33:37 -05:00
Scott Lahteine ad691022d7 Fix up spacing in A4JP pins 2016-09-25 06:33:37 -05:00
Scott Lahteine fba0b67f7d Rename status led pins 2016-09-25 06:33:37 -05:00
Scott Lahteine 9d86c07702 Clean up some fastio.h spacing 2016-09-25 06:33:37 -05:00
Scott Lahteine ab84ed22ca No such thing as G6 and G7 pins 2016-09-25 05:28:22 -05:00
Scott Lahteine c2f13be750 Mightyboard Revision E 2016-09-25 05:28:04 -05:00
Scott Lahteine 041d127cd3 Match bltouch test in do_homing_move with new code 2016-09-24 23:58:08 -05:00
Scott Lahteine 16461900c2 Fix for HEATERS_PARALLEL 2016-09-24 05:34:40 -05:00
Scott Lahteine 1583d37edd Comment on M851 case 2016-09-24 05:34:36 -05:00
Scott Lahteine 076f3a8284 unsigned char => uint8_t 2016-09-24 05:23:40 -05:00
Scott Lahteine 8935bed594 MIDDLE_DEAD_ZONE => MIDDLE_DEAD_ZONE_R 2016-09-24 05:18:36 -05:00
Scott Lahteine 6cf0952bf9 Merge pull request #4887 from thinkyhead/rc_autumn_fixups 
Improve MINIMUM_STEPPER_PULSE
 2016-09-24 03:23:42 -05:00
Scott Lahteine 8061f1fac9 Merge pull request #4888 from thinkyhead/fix_warnings_etc 
Suppress warnings, fix nonlinear_z_offset
 2016-09-24 03:22:49 -05:00
esenapaj 7bdc58a818 Suppress warnings, fix nonlinear_z_offset 2016-09-24 03:06:08 -05:00
Scott Lahteine eabff30e75 Improve MINIMUM_STEPPER_PULSE 2016-09-24 02:23:43 -05:00
esenapaj 3ed8f8331c Update Japanese translation 
・Add new translation
 2016-09-24 09:24:38 +09:00
Scott Lahteine da1644313d Merge pull request #4883 from esenapaj/Follow-up-the-PR-#4860 
Follow-up the PR #4860 (Fix BLTOUCH string and SERVO_DELAY)
 2016-09-23 16:39:37 -05:00
Scott Lahteine 903b8bb60c No need for auto_bed_leveling_was_enabled 2016-09-23 16:38:22 -05:00
esenapaj ee60225c07 Follow-up the PR #4860 (Fix BLTOUCH string and SERVO_DELAY) 2016-09-24 06:18:27 +09:00
Scott Lahteine 0951bffcc0 Sanity check homing bumps 2016-09-23 15:39:02 -05:00
Scott Lahteine a9a21db39f No homing bump if bump distance is 0 (or less) 2016-09-23 15:39:02 -05:00
Scott Lahteine 2b4da57ea7 Patch Z safe homing for probe Z homing 2016-09-23 15:39:02 -05:00
Scott Lahteine c6dd539c84 Print error for M42 bad pin 2016-09-23 15:39:02 -05:00
Scott Lahteine 8b399610fb Skip raw moves to current position 2016-09-23 15:39:02 -05:00
Scott Lahteine 22ece0081e Pass array pointer to unapply_leveling 2016-09-23 15:39:01 -05:00
Scott Lahteine cbc158eb62 Add a proper flag for ABL enabled 2016-09-23 15:39:01 -05:00
Scott Lahteine 666e944336 Init xProbe/yProbe for compiler 2016-09-23 15:39:01 -05:00
Scott Lahteine 2c52e6ecf4 Clean up G28 MBL code 2016-09-23 15:39:01 -05:00
Scott Lahteine 0bf1054bb2 Patch do_homing_move for SCARA 2016-09-23 15:39:00 -05:00
Scott Lahteine 6ad0da661c Report position in G92 2016-09-23 15:39:00 -05:00
Scott Lahteine 199a7b5dd5 Tweak SCARA debugging 2016-09-23 15:39:00 -05:00
Scott Lahteine 865ad25781 Fix prepare_kinematic_move_to precision 2016-09-23 15:39:00 -05:00
Scott Lahteine 85e607153b Improve kinematic optimization options 2016-09-23 03:03:15 -05:00
Scott Lahteine 2846531f0b const argument in do_homing_move 2016-09-23 03:03:15 -05:00
Scott Lahteine cc639d7d9c Less indentation in Stepper::isr 2016-09-23 03:03:14 -05:00
Scott Lahteine 7dec8071b2 Always synchronize in Stepper::set_position 2016-09-23 03:03:14 -05:00
Scott Lahteine c6142aa2a1 Minor cleanups in Marlin_main.cpp 2016-09-23 03:03:14 -05:00
Scott Lahteine 0427f3cc3b Use memcpy/memset in planner 2016-09-23 03:03:14 -05:00
Scott Lahteine 6b9bf8e8fe Add Planner::sync_from_steppers 
Use to sync the planner after an interrupted move (when not overriding
the logical position).
 2016-09-23 03:03:14 -05:00
Scott Lahteine be11a8a938 Fix debug in Planner::buffer_line 2016-09-23 03:03:13 -05:00
Scott Lahteine b211df818e Make movement functions more available 2016-09-23 03:03:13 -05:00
Scott Lahteine 6335acbf5c Patch bug in linear unapply_leveling 2016-09-23 03:03:13 -05:00
Scott Lahteine e8d5073a90 Use probe clearance for bump when homing Z with probe 2016-09-22 15:41:28 -05:00
Scott Lahteine dbe41245f1 Merge pull request #4821 from thinkyhead/rc_revert_to_raises 
Z Raise/Clearance rather than Height
 2016-09-22 15:30:07 -05:00
Scott Lahteine 747a2257dd Only deploy/stow BLTOUCH on downward move 2016-09-22 15:26:19 -05:00
Scott Lahteine e242946ac3 Patch G29 for linear leveling, reachable with probe 2016-09-22 15:26:19 -05:00
Scott Lahteine b800eb0fed Add probe option to position_is_reachable 2016-09-22 15:26:19 -05:00
Scott Lahteine fafafcf9d1 Use unapply_leveling in set_current_from_steppers_for_axis 2016-09-22 15:26:18 -05:00
Scott Lahteine e69d1e2879 Homing/probing feedrate, comments 2016-09-22 15:26:18 -05:00
Scott Lahteine 7d72ed688c Revert motor_current_setting to constexpr 
We should use `constexpr` wherever it makes sense, for its added benefits. See http://stackoverflow.com/questions/13346879/const-vs-constexpr-on-variables
 2016-09-22 15:26:18 -05:00
Scott Lahteine 145d9005d1 Fix BLTOUCH string and SERVO_DELAY 2016-09-21 01:45:23 -05:00
Scott Lahteine 2b7cc27c37 Merge pull request #4840 from thinkyhead/rc_G2_G3_arc_r_method 
Add support for G2/G3 with R parameter
 2016-09-21 01:30:37 -05:00
Scott Lahteine e0e10e0e45 Merge pull request #4859 from thinkyhead/rc_kinematic_and_scara 
Kinematic and SCARA patches
 2016-09-21 01:21:49 -05:00
Scott Lahteine 31f03c838a Only deploy/stow BLTouch for Z axis 2016-09-21 00:54:54 -05:00
Scott Lahteine 3913e04ac7 Add Delta kinematic optimization options 2016-09-20 18:48:06 -05:00
Scott Lahteine 8e31640229 Optimize prepare_kinematic_move_to 2016-09-20 18:48:06 -05:00
Scott Lahteine fd9b8ae4d4 Use position_is_reachable in G29, M48 2016-09-20 18:48:06 -05:00
Scott Lahteine 7194e4434f SCARA support in position_is_reachable 2016-09-20 18:48:06 -05:00
Scott Lahteine 1c5f9821c4 SCARA support in homeaxis 2016-09-20 18:48:05 -05:00
Scott Lahteine 92b4459f6c Simpler G92 for SCARA 2016-09-20 18:48:05 -05:00
Scott Lahteine 46cc2e3f6a Fix get_cartesian_from_steppers 2016-09-20 18:31:36 -05:00
Scott Lahteine 435c3ed404 Patch SCARA_move_to_cal for coordinate space 2016-09-20 18:31:36 -05:00
Scott Lahteine 5efb12e889 Simpler report_current_position for SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine 83fc5e1540 No line_to_* functions with IS_KINEMATIC 2016-09-20 18:31:36 -05:00
Scott Lahteine 59d39d7655 G0 direct move for SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine ad9d6870ed SCARA support in do_blocking_move_to 2016-09-20 18:31:36 -05:00
Scott Lahteine 8542ebcecd prepare_move_to_destination_raw => prepare_uninterpolated_move_to_destination 2016-09-20 18:31:36 -05:00
Scott Lahteine f900f97611 Update sw endstops in set_axis_is_at_home 2016-09-20 18:31:36 -05:00
Scott Lahteine 0d43cef1de M206 for MORGAN_SCARA 2016-09-20 18:31:36 -05:00
Scott Lahteine e94cb7a380 MORGAN_SCARA kinematics 2016-09-20 18:31:36 -05:00
Scott Lahteine 890bade2fa Additions, mods to SCARA config 2016-09-20 18:31:36 -05:00
Scott Lahteine 01f1028510 Try on "CLEARANCE" for size 2016-09-20 18:29:49 -05:00
Scott Lahteine 0e7d638a7a Revert to Probe Raise rather than Probe Height 2016-09-20 18:29:49 -05:00
Scott Lahteine 51e42a2d77 Adjust BLTouch probe behavior 
Addressing #4855
- Have the pin deploy only immediately before probing
- Have the pin retract immediately after every probe
 2016-09-20 16:20:36 -05:00
Scott Lahteine 13523cbf29 Fix and extend BLTouch support 2016-09-20 16:20:36 -05:00
Scott Lahteine 5cbed13f41 'constexpr' => 'const' for PWM_MOTOR_CURRENT 2016-09-20 15:57:48 -05:00
Scott Lahteine 7ae351c92f Merge pull request #4842 from thinkyhead/rc_DISABLE_Z_MIN_PROBE_ENDSTOP_whassup 
Drop DISABLE_Z_MIN_PROBE_ENDSTOP, clean up probe config
 2016-09-20 12:16:51 -05:00
Scott Lahteine ba94c89e21 Merge pull request #4852 from esenapaj/Fix-for-advance-extrusion-algorithms 
Fix for advance extrusion algorithms
 2016-09-20 11:33:14 -05:00
esenapaj 954563d603 Adjust spacing 2016-09-20 19:35:44 +09:00
esenapaj 7e9576dc5b Extend the e_steps[] from int to long for allowing more than 32,767 E steps 
Probably needed for long straight lines when using high microstepping
 2016-09-20 19:35:44 +09:00
esenapaj b04ed8f9c3 Fix inverted stepper signal of ADVANCED and LIN_ADVANCED 2016-09-20 19:35:44 +09:00
esenapaj 8692748ecd Fix broken direction signal of ADVANCED and LIN_ADVANCED 
Remove a setting proccess of E direction in advance_isr()
 2016-09-20 19:35:44 +09:00
Scott Lahteine e9ce42353e Patch G29 for 3-point leveling 2016-09-20 04:46:41 -05:00
Scott Lahteine c2744d8a8b Add support for G2/G3 with R parameter 2016-09-19 00:35:09 -05:00
Scott Lahteine e05af606a8 Clean up probe config options 2016-09-19 00:26:16 -05:00
Scott Lahteine 153e240cdd Probe conditionals to Conditionals_LCD.h 2016-09-19 00:25:53 -05:00
Scott Lahteine ff38a3c3b1 Use SD Detect Pin 53 for 3DRAG, K8200, and K8400 
See #4316
 2016-09-18 23:46:09 -05:00
Scott Lahteine f38a33a5d8 Add handling of BLTouch error state 2016-09-18 22:00:32 -05:00
Scott Lahteine c4dcfa254e Allow override of Z_ENDSTOP_SERVO_NR with BLTOUCH 2016-09-18 22:00:32 -05:00
Scott Lahteine 7d9ebda478 Remove redundant servo probe sanity check 2016-09-18 21:46:18 -05:00
Scott Lahteine f0beae7641 Fix stupid, stupid, stupid oversight in G29 update 
Mea culpa!
 2016-09-18 16:24:47 -05:00
Scott Lahteine 77639672d7 Move NONLINEAR bed leveling to planner 
This is in advance of moving non-linear bed leveling to the planner
class.
 2016-09-18 13:50:38 -05:00
Scott Lahteine 9429c7db89 Use ABC indices in delta[] 2016-09-18 13:50:38 -05:00
Scott Lahteine 5f2f991192 Use 'logical' rather than 'target' or 'cartesian' 2016-09-18 13:50:38 -05:00
Scott Lahteine 40d3e854f6 Remove redundant extern delta[] 2016-09-18 13:39:47 -05:00
Scott Lahteine 2ebfbc4c8d Merge pull request #4836 from thinkyhead/rc_some_comments 
Some comments, const args, debug output tweaks
 2016-09-18 13:38:07 -05:00
Scott Lahteine e5505e3b33 Allow non-square leveling grid 2016-09-18 13:11:20 -05:00
Scott Lahteine 2fc9ad6657 Use const ref args in probe_pt 2016-09-18 12:58:43 -05:00
Scott Lahteine 2c2688d7ad Adjust comments, spacing 2016-09-18 12:58:42 -05:00
Scott Lahteine b9d19b0008 Tweak extrapolate_one_point 2016-09-18 12:58:42 -05:00
Scott Lahteine 3c0b591935 Fix nozzle position description 2016-09-18 12:58:42 -05:00
Scott Lahteine 18d8dd4c0f set_current_from_steppers_for_axis const arg 2016-09-18 12:58:42 -05:00
Scott Lahteine edfaf1c582 Stepper::report_positions patch 2016-09-18 12:58:42 -05:00
Scott Lahteine d1f4c3d73b Patch sync_plan_position comment 2016-09-18 12:58:41 -05:00
Scott Lahteine 0c25af30d4 Document homeaxis 2016-09-18 12:58:41 -05:00
Scott Lahteine e7882e45e3 Document set_axis_is_at_home 2016-09-18 12:58:40 -05:00
Scott Lahteine fef959c31a Merge pull request #4834 from thinkyhead/rc_code_bool 
Standardize code_value_bool
 2016-09-18 12:44:20 -05:00
Scott Lahteine 07ac9a1152 Merge pull request #4822 from blubbfish/patch-3 
Tweak some german language strings
 2016-09-18 11:38:22 -05:00
Scott Lahteine 661fe09ce7 Standardize code_value_bool 2016-09-18 11:32:32 -05:00
Scott Lahteine 20e5140e75 Merge pull request #4833 from thinkyhead/rc_no_scara_axis_scaling 
Remove SCARA axis_scaling
 2016-09-18 11:31:50 -05:00
Scott Lahteine a501f430eb Enable M0/M1 with Emergency Parser 2016-09-18 11:14:10 -05:00
Philip Schell cd8b22b527 Tweak some german language strings 
Change some string to get a better wording in german
 2016-09-16 22:29:39 +02:00
Scott Lahteine 83a41c7ceb Remove SCARA axis_scaling 2016-09-16 15:21:18 -05:00
Scott Lahteine d41eeb62af Merge pull request #4781 from thinkyhead/rc_final_z_correction 
Use simplified Z correction in G29 when possible
 2016-09-16 15:14:19 -05:00
Scott Lahteine 502150046c Merge pull request #4805 from thinkyhead/rc_config_adjustment 
Additional documentation of Configuration.h
 2016-09-16 15:13:20 -05:00
Scott Lahteine a1812b55f6 Space out array values 2016-09-16 14:41:05 -05:00
Scott Lahteine d4599fd8ed Comment patches to Configuration.h 2016-09-16 14:41:05 -05:00
Scott Lahteine 723e983073 Default EXTRUDE_MAXLENGTH to 200mm 2016-09-16 14:41:04 -05:00
Scott Lahteine b08bd84f8e Merge pull request #4806 from blubbfish/patch-2 
Update language_de.h
 2016-09-16 14:39:20 -05:00
darrelhunt 7b8bfa4358 Update pins_TEENSYLU.h 2016-09-16 11:26:37 -07:00
darrelhunt 829c8592f2 Update pins_TEENSY2.h 2016-09-16 11:26:09 -07:00
darrelhunt e0aee20327 Update pins_SAV_MKI.h 2016-09-16 11:25:42 -07:00
darrelhunt 88d3fc0bcf Update pins_PRINTRBOARD.h 2016-09-16 11:25:14 -07:00
darrelhunt 4277221abb Update pins_BRAINWAVE_PRO.h 2016-09-16 11:24:32 -07:00
darrelhunt b8ecbe9116 Update pins_BRAINWAVE.h 2016-09-16 11:23:52 -07:00
darrelhunt 60f757077e Update pins_5DPRINT.h 2016-09-16 11:22:52 -07:00
Silvio Didonna ff2b2d5939 Added missing translations 2016-09-16 01:17:58 +02:00
Philip Schell 2b11c3274c Update language_de.h 2016-09-15 15:16:11 +02:00
Philip Schell 54e6d12382 Update language_de.h 
@MarlinFirmware/language-team updated german languagefile to the latest english version
 2016-09-14 14:17:21 +02:00
Scott Lahteine 57564ae576 Use last probe point to correct Z when possible 2016-09-14 02:03:43 -05:00
Scott Lahteine e40646de42 Merge pull request #4803 from thinkyhead/rc_lcd_button_fix 
Clear LCD button state, apply timer to all
 2016-09-13 18:03:39 -05:00
Scott Lahteine 29f224594c Fix some regressive typos in G29 2016-09-13 17:31:02 -05:00
Scott Lahteine 5ecc7d9f25 Clear LCD button state, apply timer to all 
Addressing #3007
 2016-09-13 16:10:27 -05:00
Scott Lahteine 9b0931ef74 Apply fixed EXTRUDER_RUNOUT_PREVENT 2016-09-13 03:33:04 -05:00
Scott Lahteine b1a60e8954 Reformat, rearrange, tweak, and document 
- Add comments to several functions
- Add an option to use Fast SQRT for Delta IK
- Group related functions together
- Outdent some leveling-related functions
 2016-09-13 03:33:04 -05:00
Scott Lahteine 61284cbd8c Various code style adjustments 2016-09-13 03:33:04 -05:00
Scott Lahteine 788a16fc46 Clean up serial out code 2016-09-13 03:33:03 -05:00
Scott Lahteine 0e38bea79d Shrink 3-point leveling code 2016-09-13 03:33:03 -05:00
Scott Lahteine 4f75ce6957 Unify reset_bed_level for linear/non-linear 2016-09-13 03:33:03 -05:00
Scott Lahteine 41d8149bce Sanity check for more than 1 controller 2016-09-13 03:33:02 -05:00
Scott Lahteine 40785ce8ac Use count method for kinematic sanity check 2016-09-13 03:33:02 -05:00
Scott Lahteine 3236762e07 Clean up sanity check for LCD_PROGRESS_BAR 2016-09-13 03:33:02 -05:00
Scott Lahteine a9ed23225f bed_level => bed_level_grid 2016-09-13 03:33:02 -05:00
Scott Lahteine 82be65065c Fix up untilted_stepper_position and set_current_from_steppers_for_axis 2016-09-13 03:33:01 -05:00
Scott Lahteine d65f5d816f Patch to fix kinematics 2016-09-13 03:33:01 -05:00
Scott Lahteine e529c6407e Rename set_cartesian_from_steppers, cartesian_position 2016-09-13 03:33:01 -05:00
Scott Lahteine c109399bf6 Fix planner leveling and rename arguments 
Use lx, ly, lz for “logical” positions
 2016-09-13 03:33:01 -05:00
Scott Lahteine d4f21af6b3 sync_plan_position_delta => sync_plan_position_kinematic 2016-09-13 03:33:01 -05:00
Scott Lahteine acd1b6e9c0 Rename delta_grid spacing for general nonlinear 2016-09-13 03:33:00 -05:00
Scott Lahteine c5fa70809b Implement M0/M1 for EMERGENCY_PARSER 2016-09-13 03:33:00 -05:00
Scott Lahteine 786d1afb72 Add position_is_reachable, use in home_z_safely 2016-09-13 03:33:00 -05:00
Scott Lahteine b4034915f8 Move z safe homing to its own function 2016-09-13 03:33:00 -05:00
Scott Lahteine c84b14c77a Move delta homing to its own function 2016-09-13 03:32:59 -05:00
Scott Lahteine f9a192c7e3 Move setup() and loop() to the end 2016-09-13 03:32:59 -05:00
Scott Lahteine 8ff338c2b9 Patch stepper.h for SCARA 2016-09-13 03:32:59 -05:00
Scott Lahteine 74d7f5e57b Patch SCARA example config 2016-09-13 03:32:59 -05:00
Scott Lahteine 6ab54c60b1 Add conditionals for kinematics, leveling 2016-09-13 03:32:59 -05:00
Scott Lahteine 21514568fd Add enum for ALL_AXES 2016-09-13 03:32:58 -05:00
Scott Lahteine 413b61e64a Add HYPOT2 and float comparison macros 2016-09-13 03:32:58 -05:00
Scott Lahteine a6f6ed352b Fix comment on FILAMENT_RUNOUT_SENSOR 2016-09-13 02:14:34 -05:00
Scott Lahteine 48e14d049a Merge pull request #4710 from thinkyhead/rc_fix_leveling_maths 
Bed leveling that accounts for home XYZ
 2016-09-10 15:47:39 -05:00
Scott Lahteine 416821a71c Merge pull request #4765 from thinkyhead/rc_endstop_direction 
Sanitycheck endstop plugs based on homing direction
 2016-09-10 14:49:50 -05:00
Scott Lahteine 9248cfb0ad Bed leveling that accounts for home XYZ 2016-09-10 13:47:21 -05:00
Scott Lahteine 6ac9d895ca Tweak Filament Width variables 2016-09-10 13:29:25 -05:00
Scott Lahteine 68ba45572e Don't say "heating complete" unless done 2016-09-10 13:29:25 -05:00
Scott Lahteine 2bfc6fe1b0 Move XYZ constants closer to the top 2016-09-10 13:25:44 -05:00
Scott Lahteine 12b94e419f Sanitycheck endstop plugs based on homing direction 2016-09-08 13:56:32 -05:00
Scott Lahteine 29c4f67a29 Additional path - followup to #4743 2016-09-07 15:08:12 -05:00
Robert Bartl 494d5770b8 makefile fix for arduino 1.6.9 unzipped 2016-09-03 19:45:27 -05:00
Scott Lahteine 6f71bd7372 Merge pull request #4754 from thinkyhead/rc_mixing_regression 
Unify counter_m and counter_M
 2016-09-02 12:27:43 -05:00
Scott Lahteine 9bf78ef465 Fix capitalization of counter_m 2016-09-02 11:31:45 -05:00
Scott Lahteine 42b5616327 Try bool for direction instead of long 2016-09-02 11:28:48 -05:00
Scott Lahteine cbe9ab902c Merge pull request #4747 from thinkyhead/rc_sd_show_percent 
Option to show SD percent on Graphical LCD
 2016-09-02 07:44:42 -05:00
Scott Lahteine f20b2b21eb Optimize LCD string/char printing 2016-09-02 06:41:24 -05:00
Scott Lahteine 3b2f7ba225 Merge pull request #4748 from thinkyhead/rc_sd_print_timer 
Patch duration_t toDigital method
 2016-09-02 04:41:11 -05:00
Kai 445d8215e4 Option to show SD percent on Graphical LCD 2016-09-02 02:17:36 -05:00
Scott Lahteine d07a913f21 Tweak to stepper advance e_steps update 2016-09-02 02:06:17 -05:00
Scott Lahteine aaef7c6b89 Fix a misspelling of minimum 2016-09-02 01:42:38 -05:00
Scott Lahteine ad659b5f91 Merge pull request #4725 from thinkyhead/rc_log_machine_info 
Log machine info in G28 and G29
 2016-09-01 23:58:59 -05:00
Scott Lahteine c6859a1e54 Handle hours >= 100 2016-09-01 23:54:48 -05:00
Kai 9f706a9635 Patch duration_t toDigital method 2016-09-01 23:34:15 -05:00
Scott Lahteine c3caa42630 Merge pull request #4738 from thinkyhead/rc_ensure_floats 
Optimize stepper ISRs, plus cleanup, shorthand
 2016-09-01 14:36:22 -05:00
Scott Lahteine 426f662586 Apply MINIMUM_STEPPER_PULSE in stepper advance_isr 2016-08-30 14:31:48 -05:00
Scott Lahteine 8c7ee4599e Optimize stepper advance_isr 2016-08-30 14:31:48 -05:00
Scott Lahteine 9725bcd099 Minor "optimizations" in stepper ISR 2016-08-30 14:21:43 -05:00
Scott Lahteine 4ec3d1ea58 Add some commentary to stepper ISR 2016-08-30 14:21:15 -05:00
Scott Lahteine d9bcc7bb45 Set a bool when a stepper block is done 2016-08-30 14:20:48 -05:00
Scott Lahteine 08f717e5f7 Use bit-size typedefs for some stepper vars 2016-08-30 14:19:49 -05:00
Scott Lahteine d554c1dda8 Clean up planner kernel pass methods 2016-08-30 14:16:13 -05:00
Scott Lahteine b2e5ec85d7 Add [XYZ]_CENTER conditionals 2016-08-30 14:15:41 -05:00
Scott Lahteine 7e20448a2d Add HOMING_Z_WITH_PROBE conditional 2016-08-30 13:29:26 -05:00
Scott Lahteine 0e4107da34 Minor cleanup of homeaxis, etc. 2016-08-30 13:29:26 -05:00
Scott Lahteine f1201e11c7 Improve the Jerk description 2016-08-29 12:39:21 -05:00
Scott Lahteine 3f038bef00 Heading for movement settings 2016-08-29 02:01:34 -05:00
Scott Lahteine fd2269f489 Log machine info in G28 and G29 2016-08-28 20:48:28 -05:00
Scott Lahteine 6eaf4f4909 Fix spacing of debug output in homeaxis 2016-08-28 19:43:33 -05:00
Scott Lahteine 1e6d1c39ea Improve verbiage of dropsegments sanity error 2016-08-28 19:40:32 -05:00
Scott Lahteine 0729a8f08d Use the probe travel height for pre-probe move 
Instead of using the home_bump for Z to move close to the bed before doing a slow probe, use the probe travel height.
 2016-08-28 19:13:08 -05:00
Scott Lahteine dd94d0b9d5 Fix bed probing bug without PROBE_DOUBLE_TOUCH 
If `PROBE_DOUBLE_TOUCH` wasn't enabled, the probe move could be way too short! See #4701 for example.
 2016-08-28 19:00:25 -05:00
Scott Lahteine 35a0c46f16 Tweak debug output for probe in G29 2016-08-28 18:44:44 -05:00
Scott Lahteine a82a89bc58 Merge pull request #4722 from thinkyhead/rc_minimum_stepper_pulse 
MINIMUM_STEPPER_PULSE option
 2016-08-28 10:03:32 -05:00
Scott Lahteine a2572d2854 Fix Danish encoding and an error message 2016-08-28 09:51:06 -05:00
Scott Lahteine 759234af60 MINIMUM_STEPPER_PULSE option 2016-08-27 23:58:40 -05:00
Scott Lahteine 2cb63f0bf7 Merge pull request #4719 from thinkyhead/rc_delta_homing_patch 
Marlin patches for homing, esp. Delta
 2016-08-27 20:46:50 -05:00
Scott Lahteine 8241cf9901 Merge pull request #4720 from thinkyhead/rc_allow_stepper_omission 
Patch stepper.cpp to allow omitting steppers
 2016-08-27 20:36:22 -05:00
Scott Lahteine 7e893f4309 Merge pull request #4721 from thinkyhead/rc_temperature_isr_comments 
Rc temperature isr comments
 2016-08-27 20:36:03 -05:00
Scott Lahteine 73d86098b7 Marlin patches for homing, esp. Delta 2016-08-27 20:32:05 -05:00
Scott Lahteine 338bc768b1 Merge pull request #4717 from thinkyhead/rc_log_the_probe 
Debug logging of nozzle type and offsets
 2016-08-27 20:24:19 -05:00
Scott Lahteine fae92e3f3c Merge pull request #4718 from thinkyhead/rc_twibus_patch_20160827 
TWIBus patch for proper use of Wire.requestFrom
 2016-08-27 20:22:53 -05:00
Scott Lahteine a485a19052 Added optional planner logging 2016-08-27 20:12:22 -05:00
Scott Lahteine e9bfca5870 Additional comments for Temperature::isr 2016-08-27 20:12:22 -05:00
Scott Lahteine a255945f29 Add DEBUG_ALL enum 2016-08-27 20:12:22 -05:00
Scott Lahteine a28e15399f Patch stepper.cpp to allow omitting steppers 2016-08-27 20:11:17 -05:00
Scott Lahteine 2b226bc5c2 TWIBus patch for proper use of Wire.requestFrom 2016-08-27 20:09:28 -05:00
Scott Lahteine d641344d3a Remove redundant probe offset in homing 2016-08-27 19:58:56 -05:00
Scott Lahteine fb19a3cdec Merge pull request #4649 from thinkyhead/rc_boelle_danish_update 
Danish update (18 Aug 2016)
 2016-08-27 19:06:05 -05:00
Scott Lahteine 00638131e5 Debug logging of nozzle type and offsets 2016-08-27 15:21:01 -05:00
Scott Lahteine 8e9ac72191 Merge pull request #4709 from thinkyhead/rc_log_the_reason 
Log whether homing with probe or endstop
 2016-08-26 17:05:55 -05:00
Scott Lahteine 991a34aff2 Log whether homing with probe or endstop 2016-08-26 15:50:10 -05:00
Scott Lahteine 3b93b79f5c Merge pull request #4703 from bgort/RCBugFix 
Add note suggesting RAMBo users use the RAMBo board type or platformio environment
 2016-08-26 14:53:56 -05:00
Scott Lahteine 00cdb15cec Move invariant LCD strings to language.h 2016-08-26 02:48:57 -05:00
Bo Herrmannsen d2ae5b00d9 Danish up to date (18 Aug 2016) 2016-08-26 02:48:57 -05:00
Scott Lahteine e78274a7f4 Consistent order/formatting of pins files 2016-08-25 20:59:45 -05:00
Scott Lahteine 11e9530111 Properly handle probe pin for BQ printers 2016-08-25 20:59:44 -05:00
Scott Lahteine 1968983f35 Move PROBE_SELECTED to an earlier point 2016-08-25 20:59:44 -05:00
Brian 2fae32f35f Add note suggesting RAMBo users use the RAMBo board type or platformio environment; 
Add note that Viki 2.0 wiring diagram v1.2 has a mistake in it;
 2016-08-25 15:05:29 -04:00
esenapaj 1749a7fae3 Suppress warning 2016-08-24 00:18:06 +09:00
Scott Lahteine d07d85ac9f Ensure probe points at the delta edge are kept 2016-08-23 05:09:56 -05:00
AnHardt 7e36b76af2 Repair MarlinSerial with TX-buffer 
These '{' are important to avoid the redefinition of `unsigned char _sreg = SREG;`
at the same level.
Used in
```
#define CRITICAL_SECTION_START  unsigned char _sreg = SREG; cli();
```
 2016-08-22 23:40:09 +02:00
Gege2B 1e65f1a1d8 Update french language 2016-08-22 12:46:58 -05:00
Scott Lahteine ab59280075 MIN_SEGMENTS_FOR_MOVE => MIN_STEPS_PER_SEGMENT 
Follow-up to #4666
 2016-08-21 08:56:03 -05:00
Scott Lahteine 27b80b1dd1 Merge pull request #4667 from thinkyhead/rc_M211_sw_endstop_switch 
M211: Enable/Disable Software Endstops
 2016-08-21 06:44:00 -05:00
Scott Lahteine 14a03727e1 Tweak serialprintPGM 2016-08-21 00:10:09 -05:00
Scott Lahteine 2f223b8c79 Use ABC and XYZ for "3" 2016-08-21 00:10:08 -05:00
Scott Lahteine 4cd1ad8f28 Adjustments to M209, G28, M605 2016-08-21 00:10:08 -05:00
Scott Lahteine e354cf5884 Apply sw_endstops_enabled to manual move 2016-08-21 00:10:08 -05:00
Scott Lahteine 280534c06f Add M211: Enable/Disable Software Endstops 2016-08-21 00:10:08 -05:00
Scott Lahteine 01d4703429 PREVENT_DANGEROUS_EXTRUDE => PREVENT_COLD_EXTRUSION 
Also improve the documentation of this and related options, and set
EXTRUDE_MINTEMP to 170 everywhere.
 2016-08-20 23:35:27 -05:00
Scott Lahteine a1f6cf1e5d Merge pull request #4665 from thinkyhead/rc_lcd_not_ultipanel 
Clean up ultralcd code, dependencies on ULTIPANEL
 2016-08-20 22:43:17 -05:00
Scott Lahteine 1a255afa36 Merge pull request #4666 from thinkyhead/rc_dropsegments_adj 
dropsegments => MIN_SEGMENTS_FOR_MOVE
 2016-08-20 22:42:16 -05:00
Scott Lahteine 374f8d2014 dropsegments => MIN_SEGMENTS_FOR_MOVE 2016-08-20 18:52:15 -05:00
Scott Lahteine 76c3f326ff Clean up DOGM code, comments 2016-08-20 18:33:12 -05:00
Scott Lahteine 71319adbb8 Wrap ULTIPANEL-dependent code 2016-08-20 18:33:11 -05:00
Scott Lahteine 305913545e Move number-to-string function to utility.* 2016-08-20 18:33:11 -05:00
Scott Lahteine 394c80c87b Merge pull request #4655 from thinkyhead/rc_serial_static 
Optimize, reduce size of MarlinSerial
 2016-08-20 15:51:57 -05:00
MagoKimbra 28d1e5a946 Fix_Zig_Zag 2016-08-20 11:28:08 +02:00
Scott Lahteine 14395a1a96 Optimize, reduce size of MarlinSerial 2016-08-19 16:53:20 -05:00
Scott Lahteine 4d4c00d69c Merge pull request #4651 from thinkyhead/rc_homing_vs_leveling_z 
Improvements to homing / leveling
 2016-08-19 15:45:49 -05:00
Brian Gortney 8fae3e1f9f Add Rambo support/env to platformio.ini; properly maps extended pins 2016-08-19 07:11:23 -04:00
Scott Lahteine 12d72363cb Do Delta radius check without sqrt 2016-08-19 05:05:48 -05:00
Scott Lahteine 044f800be9 Use SERIAL_PROTOCOLLNPGM in G28 2016-08-19 04:45:33 -05:00
Scott Lahteine d309a9647d Include probe offset for moving "close to the bed" 2016-08-19 04:45:33 -05:00
Scott Lahteine 35a08eeaeb Use Z_HOME_DIR over axis_home_dir where we can 2016-08-19 04:45:32 -05:00
Scott Lahteine 99b22d5785 Default AUTO_BED_LEVELING_GRID_POINTS to 3 2016-08-19 04:45:32 -05:00
Scott Lahteine 9b1f3f7d12 Sanity-check DELTA + AUTO_BED_LEVELING_GRID_POINTS 2016-08-19 04:45:32 -05:00
Scott Lahteine 733453569b Merge pull request #4650 from thinkyhead/rc_percent_is_percent 
extruder_multiplier => flow_percentage
 2016-08-19 04:38:18 -05:00
Scott Lahteine 55355a4fb8 Make probed points more symmetrical 2016-08-19 04:32:03 -05:00
Scott Lahteine 1f776f6034 Tweak some code comments 2016-08-19 04:32:02 -05:00
Scott Lahteine 748228cf40 Use named indices for delta_grid_spacing 2016-08-19 04:32:02 -05:00
Scott Lahteine ead333e7da line_to_axis_pos => do_homing_move 2016-08-19 04:32:02 -05:00
Scott Lahteine 7a4ccd7967 Add do_probe_move with Z fixes 2016-08-19 04:32:02 -05:00
Scott Lahteine a1bad589c9 Augment debug/homing logging 2016-08-19 04:32:02 -05:00
Scott Lahteine 41b5c48129 Update software endstops if EEPROM is loaded 2016-08-19 04:32:01 -05:00
Scott Lahteine 628dcbc764 extruder_multiplier => flow_percentage 2016-08-18 22:13:47 -05:00
Jason Westervelt d222ee4de2 Update language_ru.h 
Updated missing translations.  Caught up on change to MSG_HOME.
 2016-08-17 13:55:44 -07:00
Scott Lahteine d63b8e2b2b Additional details for I2C_SLAVE_ADDRESS 2016-08-15 19:27:53 -07:00
Scott Lahteine 7427290d3a Merge pull request #4634 from thinkyhead/rc_lang_disp_char 
Set language display charset in language.h
 2016-08-15 19:25:56 -07:00
Scott Lahteine aa30550b21 Keep SIMULATE_ROMFONT only language.h 2016-08-15 19:11:31 -07:00
Scott Lahteine cec61c350d Set language display charset in language.h 2016-08-15 19:01:12 -07:00
Scott Lahteine 165d7abb1b Merge pull request #4625 from thinkyhead/rc_i2c_request_capture_flush 
Add request, capture, flush to TWIBus
 2016-08-15 18:15:43 -07:00
RicardoGA 507784b846 Fix Messages length 2016-08-15 10:30:51 -05:00
Scott Lahteine bd928a69ec Add request, capture, flush to TWIBus 2016-08-15 00:04:20 -07:00
RicardoGA 7b7f319ed5 Update Spanish Lenguage 
Adds missing messages
 2016-08-14 23:30:43 -05:00
Scott Lahteine 132322e4d9 Fix #4614: currentScreen only defined with ULTIPANEL 2016-08-14 00:29:46 -07:00
Scott Lahteine dcd26b0403 Merge pull request #4621 from thinkyhead/rc_fan_set_output 
Init PWM-able AUTO_FAN pins with SET_OUTPUT
 2016-08-13 21:22:27 -07:00
Scott Lahteine 79ba983782 Allow reply() to use const string with no warning 2016-08-13 21:05:44 -07:00
Scott Lahteine 3a0a94b21a Always init configured fan pins 2016-08-13 20:38:40 -07:00
Scott Lahteine c63003ed3e Use matching auto-fan flags 2016-08-13 20:38:40 -07:00
Scott Lahteine 3475fd7b0f Init PWM-able auto fan pins with SET_OUTPUT 2016-08-13 20:38:40 -07:00
Scott Lahteine abf9696db1 Loop fan-pins based on array size 2016-08-13 20:05:32 -07:00
Scott Lahteine e88575c8ec Init next_auto_fan_check_ms to zero 2016-08-13 20:05:32 -07:00
Scott Lahteine 7272ec5608 Update HAS_FAN flags for 4 auto fans 2016-08-13 20:05:32 -07:00
Scott Lahteine 7b21811a9a Flags for matching auto-fans 2016-08-13 20:05:32 -07:00
Scott Lahteine 97e0aed304 Further refinements of TWIBus 2016-08-13 18:32:41 -07:00
Scott Lahteine 38fa1b1939 Merge pull request #4196 from cimbalo/Platformio_support 
Add working PlatformIO support
 2016-08-12 17:32:09 -07:00
Scott Lahteine d7edc039af Merge pull request #4605 from thinkyhead/rc_3drag_fan_is_8 
Fixup 3DRAG pins based on updated RAMPS pins
 2016-08-12 17:30:27 -07:00
Silvio 923388e0c7 Fix acceleration and feedrate following bq/Marlin 2016-08-12 15:42:20 +02:00
Scott Lahteine 405afec393 Include decimeters in filamentUsed display 2016-08-12 05:16:43 -07:00
Scott Lahteine fef0e8ba86 Merge pull request #4610 from thinkyhead/rc_sd_pause_and_stop 
Fix stopSDPrint so it works when paused
 2016-08-12 04:09:22 -07:00
Scott Lahteine 192ac2dfd7 Squish some CardReader code 2016-08-12 03:32:42 -07:00
Scott Lahteine 61932b859e Fix bug in CardReader::stopSDPrint 
If the SD print is paused, it cannot be stopped
 2016-08-12 03:21:10 -07:00
Scott Lahteine 9e5d5a3b7c Merge pull request #4597 from tnw513/italian_fix 
Added hyphenated strings for full graphic display
 2016-08-12 02:37:53 -07:00
Silvio Didonna f999292eea added hyphenated letters for full graphic display and fixed some strings 2016-08-12 08:57:22 +02:00
Scott Lahteine 67f119d18b Add an i2c request handler 2016-08-11 18:09:18 -07:00
Scott Lahteine 2d3db5b5bd Fixup pins_3DRAG based on updated RAMPS pins 2016-08-11 15:49:47 -07:00
Scott Lahteine d29a64d4b3 Merge pull request #4603 from thinkyhead/rc_less_MSG_MOVE 
Strip never-translated strings from language files
 2016-08-11 14:21:58 -07:00
Scott Lahteine d6a7ca6553 Merge pull request #4584 from thinkyhead/rc_delta_cal_more 
Use configured feedrates, center in DELTA_CALIBRATION_MENU
 2016-08-11 14:04:05 -07:00
Scott Lahteine d3b432adca Strip never-translated strings from language files 2016-08-11 13:41:07 -07:00
Scott Lahteine 1a558ef486 Tweak MarlinSerial precursor 2016-08-11 12:47:06 -07:00
Scott Lahteine 802818f7ab Cleanup SdFatUtil.h 2016-08-11 12:47:06 -07:00
Scott Lahteine 52560e257f Merge pull request #4595 from thinkyhead/rc_i2c_slave 
Add support for i2c slave address
 2016-08-11 12:39:26 -07:00
Scott Lahteine 432e9a1f50 Use configured feedrates, center for DELTA_CALIBRATION_MENU 2016-08-11 12:05:55 -07:00
Scott Lahteine cd496dd9bd do_blocking_move_to can't be 'inline', takes const ref args 2016-08-11 12:05:55 -07:00
Scott Lahteine dd75fca4d9 Make M155 / M156 a bit more flexible 2016-08-11 00:52:01 -07:00
Scott Lahteine a99ecf71d8 Add support for i2c slave address 2016-08-10 23:30:35 -07:00
Scott Lahteine b63d70b186 Fix serial output for MBL, M303 2016-08-10 18:49:52 -07:00
Scott Lahteine a36a168af2 Use the truly configured middle on Delta 2016-08-10 00:03:22 -07:00
Scott Lahteine 58c8e6cef2 Fixes #4576: Convert filamentUsed to long for display 2016-08-09 23:57:28 -07:00
Scott Lahteine 01f1f779a5 Followup to #4574, specify L for long 2016-08-09 23:43:37 -07:00
Kaibob2 1c7bd17e60 Update language_de.h with MSG_MOVE_E1 - E4 
MSG_MOVE_E1 was missing
MSG_MOVE_E2 was missing
MSG_MOVE_E3 was missing
MSG_MOVE_E4 was missing

I assigned "0" to "MSG_MOVE_E1", "1" to "MSG_MOVE_E2" and so on, as this is what i assume to be the standard naming for the first (E0) and second (E1) extruder. This would have to be changed inthe other languages too :(
 2016-08-09 20:49:26 +02:00
Scott Lahteine 880cdb553b Include days in Graphical LCD print timer 2016-08-08 23:21:36 -07:00
Scott Lahteine f4ac8c15e3 Merge pull request #4573 from thinkyhead/rc_mintemp_bed_later 
Throw MINTEMP BED error only if heating
 2016-08-08 23:02:42 -07:00
Scott Lahteine b7b5b50a84 Throw bed min temp error only if heating 2016-08-08 22:49:22 -07:00
Scott Lahteine d3ba878f70 Drop intermediate float in HEATER_0_USES_MAX6675 test 2016-08-08 22:49:22 -07:00
Scott Lahteine 3e8f9ecd1c Extend min/max_temp_error for the bed 2016-08-08 22:49:21 -07:00
Scott Lahteine 1f15f0df5f Merge pull request #4572 from thinkyhead/rc_digital_clock_100h 
Show up to 99:59 in digital time
 2016-08-08 22:28:29 -07:00
Scott Lahteine 8100a4dace Fix a compile error in EMERGENCY_PARSER sanity check 2016-08-08 21:49:57 -07:00
Scott Lahteine 45f67164b6 Simplify the delay in kill() 2016-08-08 21:49:34 -07:00
Scott Lahteine 30b1c731b5 Show up to 99:59 in digital time 2016-08-08 21:26:34 -07:00
Scott Lahteine 3be4511230 Patch command order in delta calibration menu 2016-08-08 21:15:25 -07:00