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

1115 commits

Author SHA1 Message Date
Scott Lahteine a28970784c XYZ unhomed 2016-05-17 17:02:53 -07:00
Scott Lahteine a9926b71a4 Require homing of Z before G29 2016-05-17 16:57:12 -07:00
AnHardt 41e9569dbc Minor DELTA segmentation speedup 
Minor DELTA segmentation speedup by pulling calculations out of the loop.
 2016-05-18 01:49:30 +02:00
Scott Lahteine 3016dfe484 Merge pull request #3744 from thinkyhead/rc_bezier_curves 
Add BEZIER_CURVE_SUPPORT — G5 command
 2016-05-17 13:57:38 -07:00
Scott Lahteine d0ac4541d3 Merge pull request #3775 from jbrazio/bugfix/followup-3770 
G29: Report final position back to host when using MBL
 2016-05-17 13:55:26 -07:00
João Brázio b6a3aef297
G29: Report final position back to host when using MBL 2016-05-17 01:27:59 +01:00
esenapaj 95f30529a6 Add stowing process for MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
esenapaj e2b87f6c85 Separate Z_PROBE_ALLEN_KEY from MECHANICAL_PROBE 2016-05-16 18:12:10 +09:00
Scott Lahteine 754b0152f5 Fix MBL zigzag calls 2016-05-15 12:35:01 -07:00
Scott Lahteine 13175ce7da Fix error checking in M421 2016-05-14 17:12:44 -07:00
João Brázio 8a18c52002 Adds an option to disable print job timer auto start 2016-05-14 15:22:44 -07:00
João Brázio a79267217b M78 now allows stats reset using the S78 argument 2016-05-14 15:22:44 -07:00
Scott Lahteine a713043acd Merge pull request #3749 from esenapaj/patch-3 
Enclose all #error strings by double-quotes
 2016-05-14 15:01:56 -07:00
Scott Lahteine 3cfea3ff12 Merge pull request #3752 from AnHardt/fix-FIX_MOUNTED_PROBE 
G29 missing FIX_MOUNTED_PROBE condition
 2016-05-14 15:00:42 -07:00
Scott Lahteine ddac17a195 Add BEZIER_CURVE_SUPPORT (G5 XYZEFIJPQ) 2016-05-14 14:52:08 -07:00
AnHardt 8a4376d51f Idle during long arcs 
Idle during long arcs
to prevent from watchdog resets during high segmented fast arcs.
 2016-05-14 00:29:13 +02:00
esenapaj 888443ca1e Enclose all #error strings with apostrophes 2016-05-13 21:10:23 +09:00
AnHardt b74af78736 Make arc support (G2/G3) configurable 
Saves about 2669 bytes when deactivated. (About 1% for a AT2560, about __4%__ for a AT644!)
 2016-05-13 13:27:45 +02:00
AnHardt aef2559bd8 fix-FIX_MOUNTED_PROBE 
Add a forgotten condition
 2016-05-13 12:07:17 +02:00
Scott Lahteine aaeadf0cbd If no "B" parameter given, get 1 byte 2016-05-11 15:30:08 -07:00
Scott Lahteine a6d594665b Print an error on bad i2c request 
Reference: https://github.com/MarlinFirmware/Marlin/pull/3713#issuecomment-218333678
 2016-05-11 15:30:02 -07:00
Scott Lahteine 56dd31ea3c Use code_value_long for potentially large values 
Addressing #3711
 2016-05-10 09:15:31 -07:00
Scott Lahteine 96b71e62c0 Fix dipping on DELTA robots during G29 
- Addressing #3689, et. al.
 2016-05-08 18:28:46 -07:00
Scott Lahteine 15fc93d742 Cleanup and consolidate probe conditionals for clarity 2016-05-08 12:59:43 -07:00
Scott Lahteine 084f6b5b44 Temperature singleton class 2016-05-04 19:42:12 -07:00
esenapaj 605808fe37 Additional follow-up the PR #3631(Encapsulate S... 
Additional follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

・Change from abort_on_endstop_hit to stepper.abort_on_endstop_hit in endstop.cpp, Marlin_main.cpp, and ultralcd.cpp
・Add include path to cardreader.h and temperature.h in endstop.cpp(for CardReader class and disable_all_heaters())
It fix compilation error when ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED and SDSUPPORT are enabled.

・Change from digipot_current() to stepper.digipot_current() in Marlin_main.cpp
・Change from digitalPotWrite() to stepper.digitalPotWrite() in Marlin_main.cpp
It fix compilation errors when HAS_DIGIPOTSS is enabled.

・Change from microstep_mode() to stepper.microstep_mode() in Marlin_main.cpp
・Change attribute of microstep_mode() from private to public in stepper.h
・Change from microstep_readings() to stepper.microstep_readings() in Marlin_main.cpp
・Change from microstep_ms() to stepper.microstep_ms() in Marlin_main.
It fix compilation errors when HAS_MICROSTEPS is enabled.
 2016-05-03 18:28:37 +09:00
esenapaj a82cfcff2d Follow-up the PR #3631(Encapsulate Stepper, ... 
Follow-up the PR #3631(Encapsulate Stepper, Planner, Endstops in singleton classes)

plan_bed_level_matrix -> planner.bed_level_matrix in multi extruders section of Marlin_main.cpp
It probably fix the Issue #3658(plan_bed_level_matrix not declarate).

movesplanned() -> planner.movesplanned() in ADVANCED_OK section of Marlin_main.cpp
It fix compilation error when ADVANCED_OK is enabled
 2016-05-02 22:04:26 +09:00
Scott Lahteine 462a8a951e A little extra gcode_T spacing 2016-04-30 17:26:50 -07:00
Scott Lahteine 96f51f400f Planner singleton class 2016-04-30 17:26:50 -07:00
Scott Lahteine 5076d12344 Localize M119 in Endstops class 2016-04-30 17:26:50 -07:00
Scott Lahteine 5e4e535ce8 Stepper and Endstops as singleton objects 2016-04-30 17:26:50 -07:00
Scott Lahteine 6d3e4e1f8f Prevent stuck M109/M190 when target is changed 2016-04-30 17:03:54 -07:00
Scott Lahteine c3ef9993b9 Merge pull request #3625 from jbrazio/feature/print-counter 
Print job statistics
 2016-04-29 15:31:14 -07:00
João Brázio 1491d682fb
Miscellaneous tweaks on PrintCounter 2016-04-29 23:13:59 +01:00
João Brázio d6cfcc9c8b
Added new G-Code: M78 2016-04-29 23:13:58 +01:00
Scott Lahteine f4706bb90e Keepalive not needed while waiting for temperatures 2016-04-28 21:11:15 -07:00
Blue-Marlin e58e281473 Fix feedrate after toolchange 
The fix is simple. Most changes are because of changed indendation,
bacause of leaving early for wrong tool number
 2016-04-27 00:57:45 +02:00
Scott Lahteine ec82e1e05d Merge pull request #3616 from thinkyhead/rc_fixup_some_movement 
General cleanup around high level move functions
 2016-04-25 20:23:38 -07:00
Scott Lahteine abeab792cb General cleanup around high level move functions 
- Use new `DEBUG_POS` macro for `DELTA` debug
- Neaten up `prepare_move` a smidgen
- Remove an old commented `prepare_move()` line
 2016-04-25 20:02:24 -07:00
Scott Lahteine 68d0347e67 Call report_current_position after M206 / M428 2016-04-25 18:43:28 -07:00
Scott Lahteine dcb4cdaa9e Call report_current_position instead of gcode_M114 directly 2016-04-25 18:43:27 -07:00
João Brázio a901555da4 Moved G29 debug output before matrix.set_to_identity() 2016-04-22 20:57:22 -07:00
Scott Lahteine 1caa2628da Use sync_plan_position_e function elsewhere 2016-04-20 13:02:19 -07:00
Scott Lahteine c7df961144 Fix G92 so it only sets the plan position once 2016-04-20 13:01:58 -07:00
Scott Lahteine 3db5a75f30 Merge pull request #3568 from thinkyhead/rc_various_fixes 
General code cleanup, improved naming, etc.
 2016-04-19 20:53:38 -07:00
Scott Lahteine ac69fad96d lowercase "stop" function 2016-04-19 19:43:54 -07:00
Scott Lahteine 39ee9c526b setTargetedHotend => get_target_extruder_from_command 2016-04-19 19:43:54 -07:00
Scott Lahteine cafa8b8ce3 Rename filament runout items 2016-04-19 19:43:39 -07:00
Scott Lahteine 27b2e2e786 Document some variables 2016-04-19 19:43:39 -07:00
Scott Lahteine a4062a47ac Rename baricuda variables 2016-04-19 19:43:38 -07:00
Scott Lahteine 78747b1328 min_pos/max_pos => sw_endstop_min/sw_endstop_max 2016-04-19 19:43:38 -07:00
Scott Lahteine ba84d8d091 Allow setting PIDTEMP and PIDTEMPBED together or apart 2016-04-19 18:09:29 -07:00
Scott Lahteine a26d70e932 Apply indentation to gcode_M303, PID_autotune 2016-04-18 19:04:45 -07:00
Scott Lahteine ba66336503 Output error for disabled M303 2016-04-18 19:03:45 -07:00
Scott Lahteine 5905ec5ba8 Merge pull request #3541 from thinkyhead/rc_mbl_one_last_lift 
Add a final lift, if configured, in Manual Bed Leveling
 2016-04-17 17:20:02 -07:00
Jeff K 90c49f5a14 Fixed invalid addressing (overflow) of position_shift / software endstops 
Signed-off-by: Jeff K
 2016-04-17 19:28:50 -04:00
Scott Lahteine c242bee449 Add a final lift, if configured, in Manual Bed Leveling 2016-04-17 00:12:46 -07:00
Scott Lahteine 837df6108c Fix borked set_bed_level_equation_lsq 2016-04-16 20:35:42 -07:00
Scott Lahteine 4b75b11a53 Wrap defines in parentheses in configs, M48 2016-04-16 18:21:09 -07:00
Scott Lahteine 234987ee2f Fix MBL lift 2016-04-16 14:17:06 -07:00
Scott Lahteine e0830bf8f1 Don't use LCD alert unless error or alert level is reset later 2016-04-15 18:48:49 -07:00
Scott Lahteine a8e4d7c135 Merge pull request #3477 from alephobjects/BedTempHysteresis 
Implementation of M190 bed temp hysteresis
 2016-04-15 16:20:58 -07:00
esenapaj 5ecd75eeb3 Fix for PR #3502(General cleanup of arc code) 2016-04-16 07:22:07 +09:00
gralco 8ec8d59df8 Use #if TEMP_RESIDENCY_TIME > 0 rather than #ifdef TEMP_RESIDENCY_TIME 2016-04-15 11:20:32 -06:00
Scott Lahteine 6e52b0b723 Merge pull request #3504 from thinkyhead/rc_fix_debugging 
Fix debugging of vector_3
 2016-04-14 19:08:30 -07:00
Scott Lahteine 88367a37f7 Merge pull request #3227 from thinkyhead/rc_home_offsets_and_limits 
Relating current_position, min_pos, max_pos, and home_offset
 2016-04-14 18:50:43 -07:00
Scott Lahteine b20bf1826d Fix debugging of vector_3 2016-04-14 18:45:26 -07:00
Scott Lahteine b243844690 Merge pull request #3502 from thinkyhead/rc_fix_arcs_bugs 
General cleanup of arc code
 2016-04-14 18:19:44 -07:00
Scott Lahteine 2129db581e Simplify MBL movement, zigzag 2016-04-14 16:58:42 -07:00
Scott Lahteine 0493fccc0b mbl.active is a bool now 2016-04-14 16:58:42 -07:00
Scott Lahteine 8e5099fa0c Update software endstop positions with M206, M428, G92, etc. 2016-04-14 16:47:22 -07:00
Scott Lahteine 5cfb2533d6 Initial cleaning up of arc code 2016-04-14 16:43:49 -07:00
Scott Lahteine 9ce4264fda Merge pull request #3490 from thinkyhead/rc_mbl_adjustments 
Document some movement functions, rename a local
 2016-04-13 20:55:20 -07:00
esenapaj 2eb1b102f8 Support for "mechanical probe" with Allen Key as a special case 2016-04-13 20:34:12 -07:00
Scott Lahteine cfcd3d7b3e Rename z_offset local to zoffset 2016-04-13 20:09:20 -07:00
Scott Lahteine 5fd20ecac3 Comments on some movement functions 2016-04-13 20:09:20 -07:00
Scott Lahteine a781a6f955 Apply esenapaj 3479 and delta/scara position bugfix 2016-04-13 17:41:20 -07:00
Scott Lahteine 525d8256d4 Merge pull request #3481 from thinkyhead/rc_extruder_offset_array 
Fix: gcode_T using non-existent Z offset
 2016-04-12 18:23:08 -07:00
Scott Lahteine 46881c846c Add comments for extruder offset options 2016-04-12 17:16:58 -07:00
Scott Lahteine edf376ce0d Fix: gcode_T using non-existent Z offset 
As noted by @snowzach in #3461
 2016-04-12 17:15:10 -07:00
gralco 178aeb79c8 Implementation of M190 bed temp hysteresis 2016-04-12 08:56:14 -06:00
Scott Lahteine 0439483bc8 Merge pull request #3476 from thinkyhead/rc_debug_leveling_gcode_t 
Add DEBUG_LEVELING output for gcode_T
 2016-04-11 21:03:15 -07:00
Scott Lahteine 63d8893f5d Add DEBUG_LEVELING output for gcode_T 2016-04-11 20:45:10 -07:00
Scott Lahteine f840c7de4d Initialize stepper counts for Delta/SCARA 2016-04-11 19:02:35 -07:00
Scott Lahteine 56acaf3594 Merge pull request #3469 from thinkyhead/rc_aleph_cooldownfix 
Fix for M109 and M190 cooldown
 2016-04-11 18:01:01 -07:00
gralco c218db136a Fix for M109 and M190 cooldown 
Also removes the re-definition of now inside M190's while loop
 2016-04-11 17:12:23 -07:00
Scott Lahteine c5a2ce4366 Merge pull request #3446 from thinkyhead/rc_fixup_M206_and_mesh 
Fix home_offset handling and account for it in G29
 2016-04-11 16:49:01 -07:00
Scott Lahteine b1bb1c7989 Merge pull request #3466 from thinkyhead/rc_look_for_leveling_bug 
Add CORE support to st_set_position and plan_set_position
 2016-04-11 16:45:00 -07:00
Scott Lahteine fdee2be49c More logging of matrix behavior 2016-04-11 00:06:33 -07:00
Scott Lahteine 7f265db3ef Move sync_plan_position after DEBUG_LEVELING 2016-04-10 23:40:11 -07:00
Scott Lahteine 02550af7c3 Merge pull request #3453 from thinkyhead/rc_jbrazio_m190 
ELAPSED / PENDING for rollover-safe time checking
 2016-04-10 20:25:02 -07:00
Scott Lahteine 803845ec18 Add a case for M113 to process_next_command 2016-04-10 18:53:03 -07:00
Scott Lahteine 386140f361 Test time difference in safe way 2016-04-10 18:09:31 -07:00
Scott Lahteine 1b7356b3a1 Account for home_offset in G29 handler 2016-04-10 15:35:02 -07:00
Scott Lahteine f3562dd895 Have M206 alter current_position, M428 use new function 2016-04-10 15:35:01 -07:00
Scott Lahteine 6d465321b5 Adjust timeout code in host_keepalive 2016-04-09 16:58:17 -07:00
Scott Lahteine 50c3140040 Merge pull request #3414 from thinkyhead/rc_host_timeout_mods 
Host Keepalive configurable timeout with 2s default
 2016-04-08 21:45:45 -07:00
Scott Lahteine 1acf901b63 Adjustments to residency_start_ms handling 2016-04-08 21:20:23 -07:00
gralco 907aed57db Fix bug which can cause an infinite M109 loop 
Since residency_start_ms is -1 when entering the heatup while loop whilst the hotend temp is close to the target them already then it may not escape.

Hence "Start the TEMP_RESIDENCY_TIME timer when we reach target temp for the first time."
 2016-04-08 21:20:23 -07:00
jbrazio dd3a06a95a Implemented M155 and M156, a generic TWI/I2C interface for Marlin 2016-04-08 20:14:37 -07:00
Scott Lahteine 843aa90b5a Merge pull request #3434 from thinkyhead/rc_more_debug_leveling 
Additional debug leveling output
 2016-04-08 18:57:18 -07:00
Scott Lahteine a644ab1de4 Minor patch ups to G29 
This may fix a subtle bug caused by doing `G29` more than once without
`G28` between.
 2016-04-08 17:53:15 -07:00
Scott Lahteine cba2698871 Additional DEBUG_LEVELING output 2016-04-08 17:53:15 -07:00
Scott Lahteine 5e18d650c4 Merge pull request #3427 from thinkyhead/rc_better_SERIAL_ECHOPAIR 
No casting needed for SERIAL_ECHOPAIR
 2016-04-07 19:29:18 -07:00
Scott Lahteine e0b0d1eb6b Add M113 to get/set Host Keepalive 2016-04-07 19:25:56 -07:00
Scott Lahteine 85883da90c Implement basic HOST_KEEPALIVE_INTERVAL 2016-04-07 19:25:56 -07:00
Scott Lahteine 098fb8f8c9 Merge pull request #3413 from thinkyhead/rc_probe_G30_position 
Report the probe position in G30
 2016-04-07 19:25:33 -07:00
Scott Lahteine c9c7c66b95 Merge pull request #3421 from jbrazio/bugfix/m109-EXTRUDE_MINTEMP-expansion 
M109: Protect against EXTRUDE_MINTEMP expansion
 2016-04-07 19:18:34 -07:00
Scott Lahteine d7cbb2eec9 Merge pull request #3403 from jbrazio/feature/stopwatch 
Print job timer rework
 2016-04-07 19:18:03 -07:00
Scott Lahteine dc19b69697 No casting needed for SERIAL_ECHOPAIR 2016-04-07 16:33:21 -07:00
João Brázio 471d30cc1c
M109: Protected against EXTRUDE_MINTEMP expansion 2016-04-07 12:50:57 +01:00
João Brázio 7c7e30f4cc
Adherence to the new OOP coding standards 2016-04-07 12:41:09 +01:00
Scott Lahteine 865dcf3fb4 Fix FILAMENT_WIDTH_SENSOR measurement 
Only measure and store filament width when E is going forward.
 2016-04-06 19:48:04 -07:00
Scott Lahteine 2f6c5fe2da Report the probe position in G30 2016-04-06 16:55:21 -07:00
João Brázio e48d0263bf Bugfix: M32 was still using the old print timer 2016-04-06 04:41:36 +01:00
João Brázio e8b80d8c20 Implemented M75, M76, M77 to control the print timer 2016-04-06 04:38:42 +01:00
João Brázio eb61051556 Rework the print job timer to use the stopwatch class 2016-04-06 04:34:03 +01:00
Scott Lahteine 98f2e9fc83 Reduce string storage required for DEBUG_LEVELING 2016-04-05 19:04:42 -07:00
Scott Lahteine 1af5d7b35f Add more leveling-debug output 2016-04-05 18:31:10 -07:00
Scott Lahteine 56e8e2b0eb Final tweaks to M111 output 2016-04-04 15:36:07 -07:00
João Brázio d819a4aff9 Fixes #3346, followup #3343: variables must defined with the static keyword to work with PROGMEM when defined inside functions 2016-04-04 15:02:18 +01:00
Scott Lahteine de39056f68 Merge pull request #3343 from thinkyhead/rc_fix_m111_output 
Fix M111 output using pgm_read_word, as required
 2016-04-03 17:44:38 -07:00
Scott Lahteine fd0ac371b0 Fix M111 output using pgm_read_word as required 
As noted by @taratata2016 in https://github.com/MarlinFirmware/Marlin/issues/3300#issuecomment-204687275
 2016-04-03 17:33:06 -07:00
Scott Lahteine d771174797 Merge pull request #3337 from esenapaj/patch-2 
suppress warnings
 2016-04-03 17:01:22 -07:00
Scott Lahteine d24f14a799 Add HAS_TEMP_HOTEND define 2016-04-03 16:18:49 -07:00
esenapaj f9e1a0ee6c suppress warnings 2016-04-04 06:48:53 +09:00
Scott Lahteine 80b8fd1cad Add MSG_HOME_OFFSETS_APPLIED 2016-04-02 18:14:49 -07:00
Scott Lahteine bc86ee0271 Simplify homeaxis with some macros 2016-03-30 18:44:05 -07:00
Scott Lahteine 82ef101ed5 Deploy & Stow in G29 for Delta + Z Servo Endstop 2016-03-30 16:41:16 -07:00
Scott Lahteine de333c4fea Merge pull request #3279 from thinkyhead/rc_filament_width_sensor 
FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR
 2016-03-30 12:16:27 -07:00
Scott Lahteine 8def2c31db Merge pull request #3284 from thinkyhead/rc_stop_watchheat_lcdset0 
Fix temperature checking conditions (backwards!)
 2016-03-30 12:10:39 -07:00
Scott Lahteine 8bf5f7c676 Merge pull request #3282 from jbrazio/bugfix/m104-timer-wont-start 
M104 not starting the print timer
 2016-03-30 11:54:16 -07:00
Scott Lahteine 31450ad498 Fix temperature checking conditions (backwards!) 2016-03-30 11:52:03 -07:00
João Brázio 187c183c20 M104 was not starting the print timer 2016-03-30 11:33:24 +01:00
Scott Lahteine 507aef055f Patch broken M404 2016-03-29 20:54:31 -07:00
Scott Lahteine 1a79b13b7a FILAMENT_SENSOR -> FILAMENT_WIDTH_SENSOR 2016-03-29 20:54:31 -07:00
Scott Lahteine 5f32184254 Merge pull request #3278 from thinkyhead/rc_cleanup_m111_redo 
Echo all debug levels in M111, default to DEBUG_NONE
 2016-03-29 20:34:31 -07:00
Scott Lahteine 05765fb570 Add DEBUGGING macro 2016-03-29 19:50:01 -07:00
Scott Lahteine 4402760739 Echo all debug levels in M111, default to DEBUG_NONE 
Redo of #3268 by @jbrazio
 2016-03-29 19:18:45 -07:00
Scott Lahteine f0b96f5cae Merge pull request #3276 from thinkyhead/rc_sdprint_and_lcd_sleuth 
Refinements, fixes, reduced stack usage in CardReader
 2016-03-29 18:30:18 -07:00
Scott Lahteine 12c0bf9521 Merge pull request #3277 from jbrazio/bugfix/m190-temp-never-reached 
M190 bed temp is never reached
 2016-03-29 18:28:51 -07:00
João Brázio c6577aea60 M190 bed temp was never reached 2016-03-30 01:03:20 +01:00
Scott Lahteine 27d70599d4 Change openFile default to "not-push" instead of "do-replace" 2016-03-29 03:16:35 -07:00
Scott Lahteine 3252df7998 Minor cleanup to filament sensor code 2016-03-28 20:04:34 -07:00
Scott Lahteine 0b8ef5eba6 Split get_command into units, rename to get_available_commands 2016-03-28 06:00:04 -07:00
Scott Lahteine 545f7997ea Continue on empty lines instead of returning 2016-03-28 05:37:36 -07:00
Scott Lahteine 3dcf6d42ff Don't store escaped serial characters if comment_mode 2016-03-28 05:37:36 -07:00
Scott Lahteine 5f8e52aefb Minor cleanup to command dispatcher 2016-03-28 05:37:36 -07:00
Scott Lahteine f1ed310322 Add NUMERIC compare macros to simplify code 2016-03-28 03:52:49 -07:00
jbrazio 443e6d26fe Formatted multi-line comments 2016-03-27 04:36:36 +01:00