Commit Graph
100 Commits
Author SHA1 Message Date
Scott LahteineandGitHub 7f0945d2b1 Merge pull request #6978 from thinkyhead/fix_z_endstop_adj
Fix z_endstop_adj initializer
2017-06-07 16:07:21 -05:00
Scott LahteineandGitHub 46752588b9 Merge pull request #6948 from Bob-the-Kuhn/redundant_temperature
fix redefinition errors for redundant_temperature
2017-06-04 12:16:09 -05:00
Scott LahteineandGitHub 5938dae200 Merge pull request #6950 from MagoKimbra/fix_g29_3_point
Fix G29 with 3 point
2017-06-04 12:15:44 -05:00
Scott LahteineandGitHub c5e0f08e35 Merge pull request #6951 from fixoid/patch-4
Initializing extruder/nozzle servo when turning on the printer
2017-06-04 12:13:05 -05:00
Scott LahteineandGitHub 1e2ccca063 Merge pull request #6952 from thinkyhead/bf_final_fixups_123
General cleanup before release
2017-06-04 11:51:07 -05:00
Scott LahteineandGitHub d336e413aa Merge pull request #6942 from thinkyhead/bf_cleanups_friday
General cleanup after recent commits
2017-06-03 00:48:57 -05:00
Scott LahteineandGitHub e2c3695e11 Merge pull request #6932 from thinkyhead/bf_zrib_2.0
Support for ZRIB v2.0 Control Board
2017-06-02 16:54:34 -05:00
Scott LahteineandGitHub 147d9d76fc Merge pull request #6928 from Bob-the-Kuhn/Fix-case-light-logic-on-Azteeg-X3-boards
Fix case light logic on Azteeg_X3 boards.
2017-06-01 20:14:15 -05:00
Scott LahteineandGitHub 9118e135f9 Merge pull request #6931 from thinkyhead/bf_malyan_m150
Malyan m150 configurations
2017-06-01 19:52:38 -05:00
Scott LahteineandGitHub e800743268 Merge pull request #6921 from tcm0116/pause_flash
Fix issues with advanced pause
2017-06-01 18:04:25 -05:00
Scott LahteineandGitHub ac33a378c0 Merge pull request #6922 from thinkyhead/bf_probe_options
Prevent illegal leveling combinations
2017-06-01 11:12:02 -05:00
Scott LahteineandGitHub 155aa62fb0 Merge pull request #6912 from thinkyhead/bf_better_pulse_delay
Account for dual XYZ in pulse delay cycles estimate
2017-05-31 22:21:47 -05:00
Scott LahteineandGitHub a5fa586642 Preferred patch to gcode.h 2017-05-31 21:18:16 -05:00
Scott LahteineandGitHub 6354b40231 Merge pull request #6903 from thinkyhead/bf_fix_delta_m24_m125
Patch M24 / M125 for delta
2017-05-31 00:03:20 -05:00
Scott LahteineandGitHub be17033762 Fix case light menu toggle 2017-05-30 14:03:45 -05:00
Scott LahteineandGitHub 89b93058e3 Merge pull request #6887 from christianh17/PR-sanitycheck
enable DEACTIVATE_SERVOS_AFTER_MOVE with switching nozzle
2017-05-30 13:43:39 -05:00
Scott LahteineandGitHub 05b66234ae Merge pull request #6895 from thinkyhead/bf_user_commands
Custom user commands menu
2017-05-30 13:40:50 -05:00
Scott LahteineandGitHub 84a0a77c59 Merge pull request #6852 from tcm0116/mixing_extruder_lin_advance
Generate error if MIXING_EXTRUDER and LIN_ADVANCE are both enabled
2017-05-30 13:37:51 -05:00
Scott LahteineandGitHub d33ae33103 Merge pull request #6897 from thinkyhead/bf_fix_lcd_scrolling
Fix LCD scrolling character counting
2017-05-30 03:45:59 -05:00
Scott LahteineandGitHub bad432add7 Merge pull request #6894 from thinkyhead/bf_lcd_draw_order
Fix LCD to draw after value changes
2017-05-30 00:02:00 -05:00
Scott LahteineandGitHub 5d6366d4e6 Merge pull request #6893 from thinkyhead/bf_lcd_leveling_fixes
Patch PROBE_MANUALLY + LCD_BED_LEVELING
2017-05-29 18:15:22 -05:00
Scott LahteineandGitHub 25114414cd Merge pull request #6860 from thinkyhead/bf_case_light_toggle
Case light as a toggle menu item
2017-05-28 18:30:55 -05:00
Scott LahteineandGitHub d013bddfa8 Merge pull request #6876 from thinkyhead/bf_extend_leveling_menu
Extend the ABL/MBL Bed Leveling menu
2017-05-28 14:19:02 -05:00
Scott LahteineandGitHub 58556991da Merge pull request #6877 from thinkyhead/bf_scrolling_status
Scrolling status message (option)
2017-05-28 14:12:36 -05:00
Scott LahteineandGitHub 55c700d537 Tweak to gcode.h 2017-05-26 22:11:31 -05:00
Scott LahteineandGitHub 73ed0c63b4 Merge pull request #6858 from thinkyhead/bf_leveling_patch
Fixes for PROBE_MANUALLY and LCD_BED_LEVELING
2017-05-26 12:13:43 -05:00
Scott LahteineandGitHub b15e531464 Fix screen change on character display 2017-05-25 15:29:14 -05:00
Scott LahteineandGitHub 735405b2a4 Merge pull request #6848 from thinkyhead/bf_scara_M665
Add M665 for SCARA
2017-05-24 20:51:51 -05:00
Scott LahteineandGitHub ffa901f373 Merge pull request #6839 from thinkyhead/bf_day_ending_in_y
UBL ultralcd.cpp patches
2017-05-24 17:55:44 -05:00
Scott LahteineandGitHub 0392329cb9 Merge pull request #6634 from thinkyhead/bf_fresh_gcode_parser
New GCode Parser
2017-05-24 16:16:50 -05:00
Scott LahteineandGitHub 2dfb7c212c Merge pull request #6836 from thinkyhead/bf_fix_ubl_motion
One more mesh_index_to_npos update
2017-05-23 13:21:36 -05:00
Scott LahteineandGitHub 4ce228f2a0 Merge pull request #6833 from thinkyhead/bf_move_g7
G42: Fix and extend
2017-05-23 11:49:50 -05:00
Scott LahteineandGitHub d252d1b6a2 Merge pull request #6831 from thinkyhead/bf_move_g7
Move G7 to G42
2017-05-23 03:02:57 -05:00
Scott LahteineandGitHub 6d574883a0 Merge pull request #6830 from thinkyhead/bf_redraw_flags
Use redraw flag for both types of LCD
2017-05-23 03:02:13 -05:00
Scott LahteineandGitHub 3ff7515527 Merge pull request #6817 from cbusillo/patch-1
missing enable for M605 for duplication mode
2017-05-22 18:07:11 -05:00
Scott LahteineandGitHub 62d8e35adc Merge pull request #6827 from thinkyhead/bf_day_ending_in_y
Make UBL a complete singleton
2017-05-22 17:51:03 -05:00
Scott LahteineandGitHub 850203fb3a Merge pull request #6816 from thinkyhead/bf_lcd_live_editing
Constrain LCD status message rendering
2017-05-22 11:15:35 -05:00
Scott LahteineandGitHub a83f6db679 Merge pull request #6815 from MagoKimbra/fix_ultralcd_lcd_contrast
Fix set_lcd_contrast
2017-05-21 12:10:02 -05:00
Scott LahteineandGitHub 22dbb2117c Merge pull request #6812 from thinkyhead/bf_day_ending_in_y
Cleanup code, organize & document fastio pin mappings
2017-05-21 11:39:04 -05:00
Scott LahteineandGitHub ea906e4da7 Merge pull request #6810 from thinkyhead/bf_lcd_live_editing
Add "live editing" option to LCD menus
2017-05-21 06:11:52 -05:00
Scott LahteineandGitHub c2ca85aeb2 Merge pull request #6811 from thinkyhead/bf_temp_float_stuff
Restore current temp accessors to float
2017-05-21 06:10:31 -05:00
Scott LahteineandGitHub 0e1f0efc4b Merge pull request #6809 from thinkyhead/bf_G33_evolves
G33 updates
2017-05-20 20:12:36 -05:00
Scott LahteineandGitHub dc2d215355 Merge pull request #6791 from thinkyhead/bf_ubl_pringle
Disable PROBE_MANUALLY for UBL
2017-05-19 07:50:58 -05:00
Scott LahteineandGitHub 94a4af1d7f Merge pull request #6773 from thinkyhead/bf_lcd_patch_e5
Patch LCD code for 5th extruder
2017-05-18 15:26:55 -05:00
Scott LahteineandGitHub 5970fe72d1 Merge pull request #6782 from bgort/azteegtweak
Tweak Azteeg X3 PRO _pins.h so Viki2 will work for those without a case light
2017-05-18 15:26:16 -05:00
Scott LahteineandGitHub f0fe26c411 Ensure Arduino.h and configs are included for serial.cpp 2017-05-17 05:07:35 -05:00
Scott LahteineandGitHub ffb5353294 Merge pull request #6738 from thinkyhead/bf_config_crc_rebase
Implement CRC16, develop mesh allocation table
2017-05-17 04:44:00 -05:00
Scott LahteineandGitHub e806e6419a Merge pull request #6768 from thinkyhead/rc_spindle_m3_m5
Spindle / Laser support
2017-05-17 04:39:32 -05:00
Scott LahteineandGitHub d6f49c6626 Merge pull request #6752 from jdelahayes/bugfix-1.1.x
Update french language
2017-05-17 04:32:28 -05:00
Scott LahteineandGitHub 4dc49f8424 Merge pull request #6762 from thinkyhead/bf_noz_vs_ext_servo
Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER
2017-05-16 19:53:07 -05:00
Scott LahteineandGitHub 455a24f6ff Merge pull request #6764 from thinkyhead/bf_cleanups_tuesday
Prevent home_all_axes picking up XYZ parameters from command
2017-05-16 19:13:15 -05:00
Scott LahteineandGitHub c262ea92e0 Merge pull request #6733 from abusca/Euskera
Updated Basque translation
2017-05-15 02:30:11 -05:00
Scott LahteineandGitHub b17bcd56da Merge pull request #6736 from thinkyhead/bf_axis_unhomed
More constraint on axis_unhomed_error
2017-05-14 17:20:04 -05:00
Scott LahteineandGitHub 2da4398fb5 Merge pull request #6716 from thinkyhead/bf_ubl_prepare_move
Fix prepare_move... for UBL
2017-05-13 06:22:03 -05:00
Scott LahteineandGitHub e51b5774db Merge pull request #6699 from mtowara/patch-1
Bugfix PRINTER_EVENT_LEDS
2017-05-12 05:58:25 -05:00
Scott LahteineandGitHub 056350d9bf Merge pull request #6656 from FHeilmann/fix_fwretract_pos_z_move
Fix FWRetract with positive z-moves during retracted state
2017-05-12 05:56:08 -05:00
Scott LahteineandGitHub 0d48fd4b6b Merge pull request #6697 from thinkyhead/bf_wednesday_cleanup
Wednesday-Thursday cleaning up after
2017-05-12 05:33:21 -05:00
Scott LahteineandGitHub 2819228d4f Merge pull request #6681 from thinkyhead/bf_better_mfpub
Better mfpub
2017-05-10 23:05:47 -05:00
Scott LahteineandGitHub 9a688d1456 Merge pull request #6682 from thinkyhead/bf_M80_s_arg
"M80 S" to report the state of the PSU pin
2017-05-10 20:29:01 -05:00
Scott LahteineandGitHub 59ab971f81 Merge pull request #6658 from thinkyhead/bf_cleanup_tuesday
Patch spacing, const, .gitignore
2017-05-09 16:22:48 -05:00
Scott LahteineandGitHub e1e043d0d0 Merge pull request #6657 from thinkyhead/bf_cleanup_tuesday
Fix M100 compiler warnings, general patches
2017-05-09 12:05:01 -05:00
Scott LahteineandGitHub fe1fce5f56 DevIoT patch 2 2017-05-09 11:28:39 -05:00
Scott LahteineandScott Lahteine 47cae2929f Patch platformio.ini to fix build error in DevIoT
For compatibility with DevIoT, until that can be solved.
2017-05-08 20:27:14 -05:00
Scott LahteineandGitHub 5402eaf9bd Merge pull request #6647 from thinkyhead/bf_pwm_cleanup
Rename software PWM variables for clarity
2017-05-08 18:53:23 -05:00
Scott LahteineandGitHub 232e8682d1 Merge pull request #6633 from thinkyhead/bf_temp_units
Minor patches and cleanup
2017-05-07 21:56:52 -05:00
Scott LahteineandGitHub 6e4a5cc8c6 Patch missing const in temp_abs 2017-05-07 21:13:44 -05:00
Scott LahteineandGitHub 6ed52fb765 Adjust spacing in LSF 2017-05-07 19:11:52 -05:00
Scott LahteineandGitHub 8908b15471 Merge pull request #6614 from thinkyhead/bf_temp_units
Support temperature units in M503
2017-05-06 20:41:04 -05:00
Scott LahteineandScott Lahteine bef9791ea3 Fix mfrb and mfpub 2017-05-05 14:32:16 -05:00
Scott LahteineandGitHub 66bedc1a24 Merge pull request #6600 from thinkyhead/bugfix_first_fixes
Update git helper scripts, config comments
2017-05-05 13:48:16 -05:00
Scott LahteineandGitHub 0cc4b08b93 Merge pull request #6587 from zlowred/bugfix-1.1.x
Fixed USE_CONTROLLER_FAN #define usage
2017-05-05 01:02:09 -05:00
Scott LahteineandGitHub 28e597f945 Merge pull request #6570 from FHeilmann/patch-2
Fix broken fwretract recovery extruder feedrate
2017-05-04 07:15:19 -05:00
Scott LahteineandGitHub 58210c3a19 Merge pull request #6568 from thinkyhead/rc_bilinear_extension
Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling
2017-05-04 00:46:05 -05:00
Scott LahteineandGitHub 6834e36871 Merge pull request #6567 from thinkyhead/rc_sdcard_stop
Shutdown heaters, autotemp on SD Cancel
2017-05-03 23:54:29 -05:00
Scott LahteineandGitHub 11b6a3cbb6 Fix regression in least_squares_fit.cpp 2017-05-03 19:21:44 -05:00
Scott LahteineandGitHub e1b85ff67b Merge pull request #6559 from thinkyhead/rc_more_optimal
Compact smart_fill_mesh slightly
2017-05-03 19:07:36 -05:00
Scott LahteineandGitHub 67ecf06cc4 Patch issue in gcode_M900
Noted in #6550
2017-05-03 15:26:00 -05:00
Scott LahteineandGitHub 628391304f Merge pull request #6552 from thinkyhead/rc_more_ubl_cleanup
Further cleanup of UBL
2017-05-02 22:46:04 -05:00
Scott LahteineandGitHub 902fe76db9 Merge pull request #6556 from thinkyhead/rc_use_controller_fan
Implement USE_CONTROLLER_FAN as a feature
2017-05-02 22:43:26 -05:00
Scott LahteineandGitHub f4239e62b1 Merge pull request #6557 from thinkyhead/rc_hotend_status_item
Keep refreshing LCD if hotend status is on-screen
2017-05-02 22:04:21 -05:00
Scott LahteineandGitHub fc857c5b78 Merge pull request #6549 from thinkyhead/rc_bltouch_refix
Fix BLTOUCH_HEATERS_OFF bug
2017-05-02 21:53:09 -05:00
Scott LahteineandGitHub 76eca9732d Fix mis-named language string define in Dutch 2017-05-02 16:08:09 -05:00
Scott LahteineandGitHub 806f670092 Merge pull request #6511 from Bob-the-Kuhn/UBL--G26-minor-improvements
UBL: G26 minor improvements
2017-05-02 16:06:22 -05:00
Scott LahteineandGitHub 0803c9d997 Merge pull request #6533 from thinkyhead/rc_autocal_patches
General cleanup of G33
2017-05-02 16:01:02 -05:00
Scott LahteineandGitHub 46a5cab6fb Merge pull request #6548 from thinkyhead/rc_fix_dual_z_endstops
Fix Dual-Z endstop conditional test
2017-05-02 16:00:49 -05:00
Scott LahteineandGitHub ac69eca586 Merge pull request #6538 from bgort/ubl_gridlbls
Fix, cleanup, prettify `G29 O` output
2017-05-02 14:09:18 -05:00
Scott LahteineandGitHub 99b11db1a1 Merge pull request #6537 from thinkyhead/rc_cleanup_sunday
Various leveling-related patches
2017-05-02 00:59:59 -05:00
Scott LahteineandGitHub 8f895d5e01 Merge pull request #6530 from thinkyhead/rc_cleanups_2
Fixes for DUAL_NOZZLE_DUPLICATION_MODE
2017-05-01 12:34:11 -05:00
Scott LahteineandGitHub f69acde966 Merge pull request #6528 from MarlinFirmware/revert-6416-negative-mesh-fix
Revert "Fix for Meshpositions if printer has negative endstop positions"
2017-05-01 11:51:13 -05:00
Scott LahteineandGitHub 8bd63aafb9 Merge pull request #6527 from thinkyhead/rc_cleanups_2
Patch DELTA_HEIGHT, BLTOUCH init
2017-05-01 11:28:43 -05:00
Scott LahteineandGitHub 4803a4322e Revert "Fix for Meshpositions if printer has negative endstop positions" 2017-05-01 11:25:07 -05:00
Scott LahteineandGitHub 984c210dec Merge pull request #6519 from thinkyhead/rc_cleanups_2
Various fixes for compiler warnings
2017-05-01 02:46:34 -05:00
Scott LahteineandGitHub fc9919b749 Merge pull request #6515 from thinkyhead/rc_cleanup_sunday
Some minor cleanups to code formatting
2017-04-30 22:58:16 -05:00
Scott LahteineandGitHub ff95a9850a Merge pull request #6516 from thinkyhead/rc_meaningful_branch_name
Need to define this for Rigidboard V2
2017-04-30 22:17:41 -05:00
Scott LahteineandGitHub 39c6c5621b Merge pull request #6416 from SkyNet3D/negative-mesh-fix
Fix for Meshpositions if printer has negative endstop positions
2017-04-30 17:38:41 -05:00
Scott LahteineandGitHub 671a44b8aa Merge pull request #6410 from teemuatlut/LVD-Delta
Delta auto-calibration updates
2017-04-30 16:39:51 -05:00
Scott LahteineandGitHub 5d5c9a040a Merge pull request #6509 from thinkyhead/rc_config_patches
Configuration cleanup
2017-04-30 16:10:27 -05:00
Scott LahteineandGitHub d480b6f75a Enable E1 stepper for DUAL_NOZZLE_DUPLICATION_MODE 2017-04-30 16:01:01 -05:00
Scott LahteineandGitHub 0750933bc6 Merge pull request #6490 from Bob-the-Kuhn/Missing-X-stop
Endstop not enabled if pin is zero
2017-04-30 15:09:36 -05:00
Scott LahteineandGitHub f169c04604 Merge pull request #6491 from thinkyhead/rc_cleanup_wednesday
Various cleanups for recent merges
2017-04-30 14:56:48 -05:00