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

6521 commits

Author SHA1 Message Date
Scott Lahteine 3c061a9f9a UBL tabs, whitespace, spelling, etc. 2017-05-19 14:16:50 -05:00
Scott Lahteine 75badae2f8 Disable PROBE_MANUALLY for UBL 
Plus some other UBL tweaks.
 2017-05-19 07:13:18 -05:00
Scott Lahteine 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
Brian 01f452c37c Tweak Azteeg X3 PRO _pins.h so Viki2 will work for those without a case light. 
- add comment explaining that the Panucatt Viki2 wiring diagram uses pin 44
 2017-05-18 13:00:13 -04:00
Brian e09b4ce4a5 Add checking 2017-05-17 19:46:16 -04:00
Brian 13599a73c7 Add G7 gcode command to move between UBL mesh points 
- can be augmented in the future to enable for other leveling systems

Quite simple, but did not want to modify `G1` as the additional checking would slow it down.

Tested & working.
 2017-05-17 19:05:36 -04:00
Brian 43c24f0027 Fix recent regressions, &c. 
- fix broken `M421` due to less-than-careful optimization
- add HOME_AFTER_DEACTIVATE define to advanced config so not everyone has to rehome after steppers are deactivated
- misc. cleanups (remove unused label, unused variables)
 2017-05-17 17:21:46 -04:00
Scott Lahteine 3843a5151a Patch LCD code for 5th extruder, EEPROM reset 2017-05-17 15:33:51 -05:00
Scott Lahteine 6c064bb7d6 Some probe_pt error-handling 2017-05-17 15:33:51 -05:00
Brian 3370329751 Fix broken EEPROM save/load 2017-05-17 12:41:27 -04:00
Scott Lahteine f0fe26c411 Ensure Arduino.h and configs are included for serial.cpp 2017-05-17 05:07:35 -05:00
Scott Lahteine 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 Lahteine e806e6419a Merge pull request #6768 from thinkyhead/rc_spindle_m3_m5 
Spindle / Laser support
 2017-05-17 04:39:32 -05:00
Scott Lahteine d6f49c6626 Merge pull request #6752 from jdelahayes/bugfix-1.1.x 
Update french language
 2017-05-17 04:32:28 -05:00
Scott Lahteine 55a87da036 SPINDLE/LASER implementation 2017-05-17 04:26:15 -05:00
Scott Lahteine ffe0e2d19a SPINDLE/LASER pins changes 2017-05-17 04:23:06 -05:00
Scott Lahteine 99c4900a98 SPINDLE/LASER config changes 2017-05-17 04:23:06 -05:00
Scott Lahteine a3abfeac47 Mark strings needing translation 2017-05-17 03:49:33 -05:00
Scott Lahteine 7f4e4b1212 UBL name/state methods 2017-05-17 03:49:32 -05:00
Brian 7852369987 Implement CRC16, develop mesh allocation table 
- Add crc16 utility function
 - Implement CRC16 for config store, remove old checksum, increment layout version
 - Move UBL mesh store/load to MarlinSettings; increment UBL_VERSION
 - Begin to lay out MAT structure, prototype functions, etc.
 - Rename ubl.state.eeprom_storage_slot to .storage_slot
 - Misc. optimization
 - Cleanup/standardize/improve some messages

This is a work in progress!
 2017-05-17 03:49:19 -05:00
Scott Lahteine 00d358d92d Fix a PROBE_MANUALLY bug in ultralcd.cpp 2017-05-17 03:49:19 -05:00
fixoid c2321b1cdd Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER 2017-05-16 19:25:17 -05:00
Scott Lahteine 238fb53617 Patch home_all_axes to ignore G28 XYZ parameters 2017-05-16 16:18:38 -05:00
Scott Lahteine 6b6630e11b Clean up trailing whitespace and tabs 2017-05-16 16:06:18 -05:00
Roxy-3D d30e478f97 Fix incorrectly optimized find_closest_mesh_point_of_type() function (#6761) 2017-05-16 15:24:24 -05:00
oldmcg 5a9e52a3e0 Use COPY_XYZE macro to copy exactly 4 elements (#6758) 
Fix undefined DELTA_PROBEABLE_RADIUS for UBL_DELTA
 2017-05-16 11:47:51 -05:00
Roxy-3D 8606644343 M48 Fix for Delta Configuration Files & UBL G29 only homes when necessary (#6757) 
* Fix M48 for Delta's  There was a scope issue: DELTA_PROBEABLE_RADIUS wasn't getting defined.

* Check if the specified G29 command requires homing
 2017-05-16 11:23:50 -05:00
Tannoo 0cd398c25d UBL Menu Updates (#6751) 
Things should be pretty stable for a while.   
But it wouldn't surprise me if the Delta people have a need for a few special commands.
 2017-05-16 08:45:31 -05:00
Johann Delahayes a5737cba7c Update french language 2017-05-16 12:27:42 +02:00
Scott Lahteine 0fef9a2983 Remove "ubl." prefix from calls within ubl method 2017-05-16 01:19:45 -05:00
Scott Lahteine 14a4257c7b UBL tabs, whitespace, spelling, etc. 2017-05-16 01:19:45 -05:00
Scott Lahteine 56e2e331ed UBL G29: replace 'O' with 'T' 
Since we already used 'T' for `G29` Topology Report in the past, and since 'T' is available…
 2017-05-16 01:18:41 -05:00
Scott Lahteine 091f94a6bf Fix up M421 and some comments 2017-05-16 01:14:03 -05:00
Scott Lahteine 4ec4ecff1a Reduce find_closest_mesh_point_of_type a little 2017-05-16 01:14:03 -05:00
Scott Lahteine f1a1c6873e Patch lcd_implementation_status_screen compiler warning 2017-05-16 00:59:50 -05:00
moebyusDev 2266c0780d fixed spanish lang 
It was missing MSG_FILAMENT_CHANGE_HEAT_2 and MSG_FILAMENT_CHANGE_HEATING_2
 2017-05-16 00:35:36 -05:00
oldmcg b213a45efb UBL_DELTA post merge cleanup (#6705) 
* UBL_DELTA post merge cleanup:
   fix fade_height, lost during some previous merge
   fix float cx,cy which are not const
   move repeated z_cxcy calc line inside loop
   style fixes and comment fixes/alignment

* Update ubl_motion.cpp

remove unnecessary parentheses

* Update Conditionals_post.h

Change name of define to more accurate meaning:
UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN
which is not and should not be the default for cartesians with UBL.
 2017-05-16 00:30:29 -05:00
Roxy-3D 6f86c46fa6 Fix typo that caused scope issues for DELTA (#6750) 2017-05-15 23:13:45 -05:00
Roxy-3D 1fbcbc05f6 UBL no longer flout's the sacred GCode standard (#6745) 
Also clean up ubl_motion.cpp debug info and fix declaration of cx & cy
 2017-05-15 16:25:01 -05:00
Scott Lahteine c262ea92e0 Merge pull request #6733 from abusca/Euskera 
Updated Basque translation
 2017-05-15 02:30:11 -05:00
Scott Lahteine 267f77b18b More constraint on axis_unhomed_error 2017-05-14 16:03:02 -05:00
Aaron Busca 645096b87a Updated Basque translation 
Updated Basque translation with new strings.
 2017-05-14 18:29:50 +02:00
Roxy-3D 40d95a4e23 Update the gMax files to display better with Proportional Fonts (#6727) 
Update the gMax files to display better with Proportional Fonts
 2017-05-13 16:33:04 -05:00
Roxy-3D c06af63f87 G26's default behaviour ought to be the entire mesh (#6726) 
Adding the capability to specify ahead of time how much of the validation pattern to print made it so by default G26 only did one circle and no connecting lines.

It is more natural for the unsophisticated user to just do the entire mesh (bed).   We default the repetition count to GRID_MAX_POINTS+1 to insure we get every last one of them!
 2017-05-13 15:53:44 -05:00
Roxy-3D 15040821e0 Setup FolgerTech-i3-2020 files better for the user (#6724) 
UltiPanel was enabled, but technically, it is a REPRAP_DISCOUNT_SMART_CONTROLLER
Either configuration works on the machine.  But we want it 'Right'.

Setup the Proportional Font spacing so columns line up nicer on PronterFace and Repetier Host.
 2017-05-13 15:14:03 -05:00
Scott Lahteine 67c9b1e332 Update M665 comment, fix M665 code_value code. 2017-05-13 05:11:29 -05:00
Scott Lahteine 37399e3cb5 Fix prepare_move_to_destination_cartesian for UBL 2017-05-13 04:13:19 -05:00
Scott Lahteine a7fb55ea6d Use GRID_MAX_POINTS. Some formatting 2017-05-12 06:57:19 -05:00
Scott Lahteine e51b5774db Merge pull request #6699 from mtowara/patch-1 
Bugfix PRINTER_EVENT_LEDS
 2017-05-12 05:58:25 -05:00
Scott Lahteine 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 Lahteine 0e582bcfb7 Fix #6691 - redundant line in M665 2017-05-12 05:17:38 -05:00
Markus Towara 68ae7c8d7a Bugfix PRINTER_EVENT_LEDS 
Extra closing curly bracket terminates while loop early if PRINTER_EVENT_LEDS defined
 2017-05-12 12:13:23 +02:00
Scott Lahteine ba29da56e0 Add disclaimer for verboten parameters 2017-05-12 02:34:53 -05:00
Scott Lahteine 0696dda470 Cleanups to UBL_DELTA 2017-05-12 02:34:53 -05:00
Scott Lahteine cbfca29522 M421 tweaks, just to use const 2017-05-12 01:32:34 -05:00
Scott Lahteine 233f824dd6 Define GRID_MAX_POINTS 2017-05-12 01:32:34 -05:00
Scott Lahteine b17e2d3dcd Apply const in Marlin_main.cpp 2017-05-12 01:32:33 -05:00
Scott Lahteine 92fbea2906 Add some GCodes to the header of Marlin_main.cpp 2017-05-12 01:32:33 -05:00
Scott Lahteine 94e90ca26c Tweak M80/M81 descriptions 2017-05-12 01:32:33 -05:00
Scott Lahteine ee50dfaaf3 Adjust G26 arguments 2017-05-12 01:32:33 -05:00
Scott Lahteine b0ba5cae73 Fix a spelling boo 2017-05-12 01:32:33 -05:00
oldmcg 91841d75c9 UBL_DELTA (#6695) 
UBL on Delta's....     Should be close!    Should not affect any Cartesian printer.
 2017-05-11 22:33:47 -05:00
bgort 445003dbb8 Merge pull request #6694 from bgort/g29p2b 
UBL:  Minor improvement to G29 P2
 2017-05-11 20:44:43 -04:00
Brian 5a5dba6fc8 UBL: Minor improvement to G29 P2 
- allow H code value to override probing height
- minor cleanups
 2017-05-11 18:54:34 -04:00
Brian ae676490c9 M421: Add 'adjust closest point' capability 
- Split M421 into separate versions for bilinear and ubl
- Fix minor issue in G26
 2017-05-11 12:10:38 -04:00
Scott Lahteine 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
Roxy-3D b63e82f309 M421 Mesh Point Offset and misc. UBL clean up (#6685) 
* M421 Mesh Point Offset and misc. UBL clean up

Allow M421 to accept an offset as well as absolute value for a specified
mesh point.
And misc. UBL clean up to reduce redundent code.

* Better error checking for M421

* Fix M421 Y index bug

I just noticed....  We've had a Y index bug for who knows how long?
 2017-05-10 18:54:10 -05:00
Pablo Ventura 539e0c2f31 "M80 S" to report the state of the PSU pin 2017-05-10 17:58:58 -05:00
bgort df42428281 Merge pull request #6665 from bgort/font 
Add proportional font adjustment ratio
 2017-05-10 17:30:51 -04:00
Brian 2604742191 Add proportional font adjustment ratio 
- update example configs
 2017-05-10 17:19:03 -04:00
bgort b3407a371b Merge pull request #6676 from bgort/g26zhop 
G26: Add 0.5mm Z-bump between circles to minimize pattern scraping
 2017-05-10 17:12:05 -04:00
bgort c33d99c5b2 Merge pull request #6680 from bgort/g26repeat 
G26:  Add 'Repeat' Option
 2017-05-10 17:11:34 -04:00
Bob-the-Kuhn 7325035aac Merge pull request #6637 from Tannoo/UBL_Menu_System_1.1 
UBL Menu System 1.1
 2017-05-10 15:54:48 -05:00
Brian f7a201b0d0 G26: Add 'Repeat' Option 
- Allows for specifying number of points to print/validate, using 'R' code like with G29 P4 Rx
- Moved the code for Random to 'M' so we could be consistent with G29 P4
- G26 instructions indenting/cleanup
 2017-05-10 16:52:08 -04:00
Brian 9c5957fc77 G26: Add 0.5mm Z-bump between circles to minimize pattern scraping 2017-05-10 16:11:59 -04:00
Brian 4da14b14f4 UBL Cleanup/Bugfix 
- Fix bug in ubl_line_to_destination
- Improve/fix output of some ubl.h functions
 2017-05-10 13:56:17 -04:00
Tannoo 66db6c3acc UBL Menu System 1.1 
/**
     * UBL System submenu
     *
     *  Prepare
     * - Unified Bed Leveling
     *   - Activate UBL
     *   - Deactivate UBL
     *   - Mesh Storage
     *       Memory Slot:
     *       Load Bed Mesh
     *       Save Bed Mesh
     *   - Output Map
     *       Map Type:
     *       Output Bed Mesh Host / Output Bed Mesh CSV
     *   - UBL Tools
     *     - Build Mesh
     *         Build PLA Mesh
     *         Build ABS Mesh
     *       - Build Custom Mesh
     *           Hotend Temp:
     *           Bed Temp:
     *           Build Custom Mesh
     *         Info Screen
     *       - Build Cold Mesh
     *       - Fill-in Mesh
     *           Fill-in Mesh
     *           Smart Fill-in
     *           Manual Fill-in
     *           Info Screen
     *         Continue Bed Mesh
     *         Invalidate All
     *         Invalidate Closest
     *     - Validate Mesh
     *         PLA Mesh Validation
     *         ABS Mesh Validation
     *       - Custom Mesh Validation
     *           Hotend Temp:
     *           Bed Temp:
     *           Validate Mesh
     *         Info Screen
     *     - Edit Mesh
     *         Fine Tune All
     *         Fine Tune Closest
     *       - Adjust Mesh Height
     *           Height Amount:
     *           Adjust Mesh Height
     *         Info Screen
     *     - Mesh Leveling
     *         3-Point Mesh Leveling
     *       - Grid Mesh Leveling
     *           Side points:
     *           Level Mesh
     *         Info Screen
     *   - Output UBL Info
     */
 2017-05-10 12:14:43 -05:00
Brian 3b0127cf8e Fix compiler complaint related to M100 2017-05-09 21:45:44 -04:00
Scott Lahteine 11104f177b Apply const in BABYSTEPPING 2017-05-09 12:37:23 -05:00
Scott Lahteine 081bf1f879 Patch #else / #endif comments 2017-05-09 12:37:23 -05:00
Scott Lahteine a9487c9443 Reduce redundancy in BLTOUCH conditionals 2017-05-09 11:52:24 -05:00
Scott Lahteine 8d961b51cc Eliminate M100 compiler warnings? 2017-05-09 11:32:15 -05:00
bgort efb9ce24d9 Merge pull request #6645 from tcm0116/bltouch_config 
Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch
 2017-05-09 09:49:16 -04:00
bgort e2f07917ab Merge pull request #6644 from tcm0116/bltouch_menu 
Move BLTouch LCD menu from Main to Main/Control
 2017-05-09 09:49:02 -04:00
Florian Heilmann fe96376a73 Fix FWRetract with positive z-moves during retracted state 2017-05-09 13:54:57 +02:00
Scott 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 Lahteine 911a87e006 Disable SCARA feedrate scaling by default 2017-05-08 14:41:03 -05:00
Scott Lahteine 71396f77d3 Cleanups following recent commits 2017-05-08 14:23:01 -05:00
Scott Lahteine dca48f0e63 Move platformio.ini back to Marlin folder - it works there 2017-05-08 14:23:01 -05:00
Scott Lahteine a6dafb058e Small reduction in error code size 2017-05-08 13:58:09 -05:00
Scott Lahteine a1e04942a2 Cleanup to software PWM variables 2017-05-08 13:51:45 -05:00
Thomas Moore a20d0794e6 Automatically define Z_MIN_PROBE_ENDSTOP_INVERTING for BLTouch 2017-05-08 16:28:44 +00:00
Thomas Moore 3279337f47 Move BLTouch LCD menu from Main to Main/Control 2017-05-08 15:21:01 +00:00
Brian 6cb0fa4128 Cleanup previous implementation of new quiet probing 
Saves a few lines of code.
 2017-05-08 08:13:46 -04:00
bgort 4b7f8ad9c6 Merge pull request #6610 from bgort/pio-improvements2 
PlatformIO-related changes
 2017-05-08 07:52:42 -04:00
Scott Lahteine 56ca47ab9d Patch configuration temp units 2017-05-07 21:32:01 -05:00
Scott Lahteine 421dd62800 Adjust spacing of "spaces" 2017-05-07 21:28:54 -05:00
Scott Lahteine 26dba44cd3 Patch redundant lcd settings 2017-05-07 21:28:54 -05:00
Scott Lahteine 34b5041576 Spacing adjustment, ubl_G29 2017-05-07 21:28:54 -05:00
Scott Lahteine 1c4ed8b106 Note 5 extruders in config comments 2017-05-07 21:28:54 -05:00