bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
8,687 Commits 1 Branch 4 Tags
4e3ee845b9ebb8c742481e93bdba906f1f68ccb1
Commit Graph

8687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
4abd53f65a Adjust indentation in ubl.h 2017-04-06 05:36:16 -05:00
Scott Lahteine
f5c5c1f771 Rename all UBL files with a ubl_ prefix 2017-04-06 05:33:27 -05:00
Scott Lahteine
11430b6d33 Merge pull request #6256 from thinkyhead/rc_unify_grid_size 
Use same config name for all mesh dimensions
 2017-04-06 05:30:28 -05:00
benlye
f1d50ac1dc Fixing bilinear Z offset and G29 Z 
The fix in #6251 for bilinear Z offset was flawed and broke the Z parameter of G29 for bilinear levelling.  This is reverted and a different fix is used for the double-addition of the Z-probe offset to the bilinear correction grid.
 2017-04-06 07:41:46 +01:00
Scott Lahteine
eb1e6aa29b Use same config name for all mesh dimensions 2017-04-06 00:42:52 -05:00
Scott Lahteine
034e912c85 Merge pull request #6248 from thinkyhead/rc_marlin_scad_mesh 
Add hidden option to output Bilinear grids in JSON
 2017-04-06 00:36:45 -05:00
Scott Lahteine
c961dd084d Add hidden option to output Bilinear grids in JSON 2017-04-05 23:43:17 -05:00
Scott Lahteine
bc09e862a9 Re-enable .cpp as LF in .gitattributes 2017-04-05 22:30:30 -05:00
Scott Lahteine
df7b4252fd Reduce M420 code for UBL slightly 2017-04-05 22:30:29 -05:00
Scott Lahteine
8866158d03 Add LEVELING_DATA as a capability 2017-04-05 22:30:28 -05:00
benlye
0a2b4f3486 Fix bilinear levelling z offset 
Since run_probe was altered to return the probe Z position rather than the nozzle Z position bilinear levelling has been broken because the Z-offset has been applied twice - once in the run_probe function, and then again in the G29 code for bilinear levelling.
 2017-04-05 22:01:40 -05:00
Scott Lahteine
44a849bdce Fix broken M206/M428/G92 offsets 2017-04-05 22:01:37 -05:00
Roxy-3D
52978e5ba5 Fix spelling mistake when UBL's mesh is Inactive 2017-04-02 20:07:09 -05:00
Roxy-3D
0423e93c42 Fix M421 AUTO_BED_LEVELING_BILINEAR and AUTO_BED_LEVELING_UBL 
M421 was not connected up for AUTO_BED_LEVELING_BILINEAR.
M421 needed to migrate mesh data to new UBL EEPROM layout.
 2017-04-02 16:46:37 -05:00
Scott Lahteine
3412950abc Merge pull request #6209 from thinkyhead/rc_psu_zero 
Power Supply 0 as "General"
 2017-04-02 16:44:42 -05:00
Roxy-3D
3e9e94801f Fix problem described in issue # 6175 
As it turns out...   an unsigned int can not go to less than 0,  so the
loop never terminates.
 2017-04-02 13:00:27 -05:00
Scott Lahteine
a37a605fee Merge pull request #6217 from thinkyhead/rc_fix_invisibles_to_most 
Patch .gitattributes till UBL line endings are fixed
 2017-04-02 12:52:26 -05:00
Scott Lahteine
01a293b6e3 Patch .gitattributes till UBL line endings are fixed 2017-04-02 12:50:02 -05:00
Scott Lahteine
289e3d6844 Merge pull request #6215 from thinkyhead/rc_bed_false_alarm 
Fix thermal runaway when nonexistent bed temp is set
 2017-04-02 11:59:58 -05:00
Scott Lahteine
1c69a155cf Merge pull request #6214 from thinkyhead/rc_bltouch_delay_opt 
Configurable delay for BLTouch servo emulation
 2017-04-02 11:59:34 -05:00
Scott Lahteine
948728e63b Fix line-endings in UBL_G29 2017-04-02 11:48:26 -05:00
Scott Lahteine
699310d1d2 Fix: Thermal runaway if nonexistent bed's temp is set 2017-04-02 11:48:10 -05:00
Scott Lahteine
c56eec29f0 Configurable delay for BLTouch servo emulation 2017-04-02 11:14:53 -05:00
Scott Lahteine
deaad78df9 Merge pull request #5678 from Bob-the-Kuhn/G38-optional-double-tap 
G38 bug fix, made double touch optional & reverted to Z_MIN_PROBE
 2017-04-02 10:32:04 -05:00
Scott Lahteine
b3e9977f97 Merge pull request #6212 from thinkyhead/rc_gitattributes 
Fix LCD preheat menus
 2017-04-02 09:54:13 -05:00
Scott Lahteine
5bce731962 Fix LCD preheat menus 2017-04-02 09:32:22 -05:00
Scott Lahteine
9faa8c4704 Merge pull request #6210 from thinkyhead/rc_gitattributes 
Add .gitattributes to normalize line endings
 2017-04-02 08:56:51 -05:00
Scott Lahteine
4c72167af3 Prevent a warning on echo_command 2017-04-02 08:36:58 -05:00
Scott Lahteine
9b5fd9522e Fix formatting, order for a UBL change 2017-04-02 07:15:40 -05:00
Scott Lahteine
f0ef8a1cbd Add .gitattributes to normalize line endings 2017-04-02 06:47:52 -05:00
Tannoo
54173c80ad Power Supply 0 as "General" 2017-04-02 06:21:34 -05:00
Scott Lahteine
883c6762c4 Merge pull request #6208 from thinkyhead/rc_parity_with_32bit 
Patch MarlinSerial to match up with 32-bit version
 2017-04-02 05:13:03 -05:00
Scott Lahteine
a2775d0c70 can wstring be removed? 2017-04-02 04:43:33 -05:00
Scott Lahteine
de4e19f17e Patch MarlinSerial to match up with 32-bit version 2017-04-02 04:39:18 -05:00
Scott Lahteine
34b23ff312 Merge pull request #6202 from thinkyhead/rc_fix_broken_ubl 
Patching up UBL, vetting recent commits
 2017-04-02 03:51:38 -05:00
Scott Lahteine
2cbc7b4b73 Relocate serial macros and functions 2017-04-02 01:05:25 -05:00
Scott Lahteine
eaa66f3c46 Indent MarlinSerial code 2017-04-02 01:05:25 -05:00
Scott Lahteine
7a7a80e6c5 status_printf => lcd_status_printf_P 2017-04-02 01:05:25 -05:00
Scott Lahteine
0e6ec34228 Use PSTR versions of lcd_status... to save SRAM 2017-04-02 00:45:39 -05:00
Scott Lahteine
34e2420b9b Apply const args, clean up find_closest_circle_to_print 2017-04-01 23:15:41 -05:00
Scott Lahteine
e19fbd27ce Minor spelling patch 2017-04-01 23:08:00 -05:00
Scott Lahteine
790a3e9a8c Remove extraneous check of UBL_G26_MESH_EDITING 2017-04-01 23:03:40 -05:00
Scott Lahteine
7310110ec0 Fix logic of UBL::fade_scaling_factor_for_z 2017-04-01 22:52:48 -05:00
Scott Lahteine
a7aa70e79a Merge pull request #6201 from thinkyhead/rc_fix_broken_ubl 
Fix broken auto#.g, some other regressions
 2017-04-01 22:14:04 -05:00
Scott Lahteine
1a775cecac Revert behavior of enqueue_and_echo_commands_P 2017-04-01 21:53:46 -05:00
Scott Lahteine
79d42d87c1 Syntax cleanup 2017-04-01 21:53:46 -05:00
Scott Lahteine
b47fd31c37 Revert some changes to UBL 2017-04-01 21:53:45 -05:00
Bob-the-Kuhn
185337e787 add delays to allow stop & kill messages to get out 2017-04-01 00:23:14 -05:00
Scott Lahteine
63abb65146 Update description of PINS_DEBUGGING 2017-03-31 18:57:48 -05:00
Scott Lahteine
f75aa4d5be Merge pull request #6050 from thinkyhead/rc_probe_manually 
Add PROBE_MANUALLY — ABL without a probe
 2017-03-31 12:27:33 -05:00