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

9246 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
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
Brian
82ca6248e2 Move G7 to G42 
See: #6777
 2017-05-22 23:21:35 -05:00
Scott Lahteine
26ffa558a3 Use redraw flag for both types of LCD 2017-05-22 18:34:54 -05:00
Scott Lahteine
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 Lahteine
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 Lahteine
34cfbc90cd Use new attribute macros in more places 2017-05-22 17:38:58 -05:00
Scott Lahteine
85b967657e Embed G26/G29 in ubl class, with enhancements 2017-05-22 17:38:58 -05:00
Scott Lahteine
c99bd69889 Apply const float & more 2017-05-22 17:38:36 -05:00
Scott Lahteine
ad5638f78c Cleanup some fastio code 2017-05-22 17:38:36 -05:00
Scott Lahteine
e271521c39 Single user_canceled function in G26 2017-05-22 17:38:36 -05:00
Scott Lahteine
c2ea22da49 Clean up whitespace 2017-05-22 17:38:36 -05:00
Scott Lahteine
ceb62fc7e1 Fixes #6828: M428 bug 2017-05-22 17:34:03 -05:00
oldmcg
48f7652143 UBL G29 -P3.1 smart fill (#6823) 
* UBL G29 -P3.1 mesh fill with distance-weighted least squares fit.

* Back to original -O0 on G29 for now.
 2017-05-22 12:33:50 -05:00
Scott Lahteine
850203fb3a Merge pull request #6816 from thinkyhead/bf_lcd_live_editing 
Constrain LCD status message rendering
 2017-05-22 11:15:35 -05:00
Roxy-3D
3129260c44 Misc. Clean Up (#6822) 
* Misc. Clean Up

Mostly UBL related clean up.
- But fixed a bug in the thermistortables.
- Made G26 more responsive to user aborts.
- Added sanity checks for older name for UBL_MESH_VALIDATION.
- Made G29 P4 able to edit invalidated mesh points
- Restore a reasonable Fade Height for UBL when creating new state information
- Get UBL's Topology Map to look a little bit better
- Make sure the user doesn't see a blank screen when doing Mesh Editing.

* Huh???   GitHub Desktop screwed up!

* get the planner object in scope

* Fix out of scope z_fade_height

* Travis timed out...

I need a change so I can force a new commit and sync.
 2017-05-21 22:09:51 -05:00
cbusillo
3b4116e73b missing enable for M605 for duplication mode 
I believe gcode_M605 will not be called when using DUAL_NOZZLE_DUPLICATION_MODE without this change.
 2017-05-21 13:54:20 -04:00
Scott Lahteine
5e8892d6b5 Show Restore Failsafe item with EEPROM off 2017-05-21 12:52:44 -05:00
Scott Lahteine
76af9ac7c5 tweaks 2017-05-21 12:51:58 -05:00
Scott Lahteine
ba5910ab6c Constrain LCD status message rendering 2017-05-21 12:35:16 -05:00
Scott Lahteine
a83f6db679 Merge pull request #6815 from MagoKimbra/fix_ultralcd_lcd_contrast 
Fix set_lcd_contrast
 2017-05-21 12:10:02 -05:00
MagoKimbra
2c309a8f7c Fix set_lcd_contrast 2017-05-21 19:01:44 +02:00
Scott Lahteine
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
Roxy-3D
364f8fb613 Update Configuration.h files to better names (#6814) 
Changed UBL_G26_MESH_EDITING to UBL_G26_MESH_VALIDATION
Added UBL_MESH_EDIT_MOVES_Z to prepare for that change (coming next)
 2017-05-21 11:10:22 -05:00
Scott Lahteine
d7fda2fe49 Formatting, const in G33 2017-05-21 10:40:05 -05:00
Scott Lahteine
1519b0e7c1 Split up fastio.h, document pin mappings 2017-05-21 10:33:27 -05:00
Scott Lahteine
49599caade General cleanup to utf_mapper.h 2017-05-21 10:33:27 -05:00
Scott Lahteine
02f15f6775 UBL-related cleanup, spacing, standards 
Reference: #6804
 2017-05-21 10:33:26 -05:00
Scott Lahteine
52e20aeab3 Pins-related cleanup, formatting 2017-05-21 07:18:03 -05:00
Scott Lahteine
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 Lahteine
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 Lahteine
11fc9564c9 Add live editing option to LCD menu 2017-05-21 05:29:46 -05:00
Scott Lahteine
8a0a5cfccc Temp-related cosmetic changes 2017-05-21 04:49:25 -05:00
Scott Lahteine
b29dbbd5e4 Use uint16_t for temps 2017-05-21 04:48:53 -05:00
Scott Lahteine
ebcd1aaf88 Access hotend/bed temperatures as float 2017-05-21 04:46:31 -05:00
Scott Lahteine
0e1f0efc4b Merge pull request #6809 from thinkyhead/bf_G33_evolves 
G33 updates
 2017-05-20 20:12:36 -05:00
Scott Lahteine
6ce2b1ff4a G33 evolutionary changes 2017-05-20 19:23:39 -05:00
Scott Lahteine
b3a38fd300 Clean up bugfix readme 2017-05-20 19:20:53 -05:00
Scott Lahteine
3c061a9f9a UBL tabs, whitespace, spelling, etc. 2017-05-19 14:16:50 -05:00
Scott Lahteine
dc2d215355 Merge pull request #6791 from thinkyhead/bf_ubl_pringle 
Disable PROBE_MANUALLY for UBL
 2017-05-19 07:50:58 -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
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