SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
8255 commits 1 branch 0 tags 119 MiB
Commit graph

8255 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
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
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
bgort
47245675fc Merge pull request #6777 from bgort/g7 
Add `G7` gcode command to move between UBL mesh points
 2017-05-18 06:44: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
bgort
e16743da45 Merge pull request #6775 from bgort/m421fix 
Fix recent regressions, &c.
 2017-05-17 17:42:35 -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
bgort
aad1acc418 Merge pull request #6772 from bgort/meshstor 
Fix broken EEPROM save/load
 2017-05-17 12:42:14 -04: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
Scott Lahteine
13a06711ad Add a Travis test for UBL + DELTA 2017-05-17 03:49:19 -05:00
Scott Lahteine
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
fixoid
c2321b1cdd Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER 2017-05-16 19:25:17 -05:00
Scott Lahteine
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 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
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 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